From b74f0809ea6a462339ab8e64913050589bea6d80 Mon Sep 17 00:00:00 2001 From: Warren Togami Date: Tue, 28 Nov 2006 19:25:17 +0000 Subject: [PATCH 1/7] Initialize branch FC-6 for wbxml2 --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..d5b6362 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +FC-6 From 199e7e140db6b14d1bd43a52ee4560f6920c7371 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 29 Nov 2006 10:18:56 +0000 Subject: [PATCH 2/7] wbxml-0.9.2-5: Changed the Summarys and descriptions. --- wbxml2.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/wbxml2.spec b/wbxml2.spec index 284073a..d061220 100644 --- a/wbxml2.spec +++ b/wbxml2.spec @@ -1,7 +1,7 @@ Name: wbxml2 Version: 0.9.2 -Release: 4%{?dist} -Summary: WBXML parser and compiler library +Release: 5%{?dist} +Summary: Library and tools to parse, encode and handle WBXML documents Group: System Environment/Libraries License: LGPL @@ -28,10 +28,11 @@ bandwidth in mobile communications. %package devel Group: Development/Libraries -Summary: Development files of WBXML +Summary: Development files of %{name} Requires: %{name} = %{version}-%{release} %description devel -%{summary}. +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. %prep %setup -q @@ -86,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Nov 27 2006 Laurent Rineau - 0.9.2-5 +- Changed the Summarys and descriptions. + * Mon Nov 27 2006 Laurent Rineau - 0.9.2-4 - Added BR: popt zlib-devel - Improved changelog. From fc6b48bb506cb1c62b8de7f94c44ec62b4f5cd32 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 30 Nov 2006 13:47:27 +0000 Subject: [PATCH 3/7] - Use iconv instead of mock. Bug #217848. --- wbxml2.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/wbxml2.spec b/wbxml2.spec index d061220..bc35b47 100644 --- a/wbxml2.spec +++ b/wbxml2.spec @@ -1,6 +1,6 @@ Name: wbxml2 Version: 0.9.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Library and tools to parse, encode and handle WBXML documents Group: System Environment/Libraries @@ -18,7 +18,6 @@ Patch2: wbxml2-0.9.2-autoreconf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: expat-devel zlib-devel popt -BuildRequires: recode %description The WBXML Library (libwbxml) contains a library and its associated tools to @@ -43,7 +42,7 @@ chmod a+x configure # Recode to UTF-8 several doc files for file in ChangeLog README NEWS References; do - recode l1..utf8 $file + /usr/bin/iconv -f iso8859-1 -t utf-8 $file done # no line terminator, add one @@ -87,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Nov 30 2006 Laurent Rineau - 0.9.2-6 +- Use iconv instead of mock. Bug #217848. + * Mon Nov 27 2006 Laurent Rineau - 0.9.2-5 - Changed the Summarys and descriptions. From f56b01e4373bb8aaab54dea90d3eca51466909a9 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 1 Dec 2006 12:30:49 +0000 Subject: [PATCH 4/7] - Stupidity. Fix the use of iconv. Bug #217848 again. - Add an end-of-line to BUGS as well. Thu Nov 30 2006 Laurent Rineau - 0.9.2-6 - Use iconv instead of recode. Bug #217848. --- wbxml2.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/wbxml2.spec b/wbxml2.spec index bc35b47..4774c01 100644 --- a/wbxml2.spec +++ b/wbxml2.spec @@ -1,6 +1,6 @@ Name: wbxml2 Version: 0.9.2 -Release: 6%{?dist} +Release: 8%{?dist} Summary: Library and tools to parse, encode and handle WBXML documents Group: System Environment/Libraries @@ -42,11 +42,13 @@ chmod a+x configure # Recode to UTF-8 several doc files for file in ChangeLog README NEWS References; do - /usr/bin/iconv -f iso8859-1 -t utf-8 $file + /usr/bin/iconv -f iso8859-1 -t utf-8 $file > ${file}.conv \ + && /bin/mv ${file}.conv $file done # no line terminator, add one echo >> THANKS +echo >> BUGS %build %configure --disable-rpath --disable-static @@ -86,8 +88,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Dec 1 2006 Laurent Rineau - 0.9.2-8 +- Stupidity. Fix the use of iconv. Bug #217848 again. +- Add an end-of-line to BUGS as well. + * Thu Nov 30 2006 Laurent Rineau - 0.9.2-6 -- Use iconv instead of mock. Bug #217848. +- Use iconv instead of recode. Bug #217848. * Mon Nov 27 2006 Laurent Rineau - 0.9.2-5 - Changed the Summarys and descriptions. From e05c3fbdd6ef7e2695529b14803e70abd5946ce7 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Sun, 26 Aug 2007 13:13:09 +0000 Subject: [PATCH 5/7] Change the license tag. No rebuild for FC-6 and F-7. --- wbxml2.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wbxml2.spec b/wbxml2.spec index 4774c01..1bab378 100644 --- a/wbxml2.spec +++ b/wbxml2.spec @@ -1,10 +1,10 @@ Name: wbxml2 Version: 0.9.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Library and tools to parse, encode and handle WBXML documents Group: System Environment/Libraries -License: LGPL +License: LGPLv2+ URL: http://libwbxml.aymerick.com:8080/ Source0: http://dl.sourceforge.net/wbxmllib/%{name}-%{version}.tar.gz @@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Aug 26 2007 Laurent Rineau - 0.9.2-9 +- Change the License: tag. + * Fri Dec 1 2006 Laurent Rineau - 0.9.2-8 - Stupidity. Fix the use of iconv. Bug #217848 again. - Add an end-of-line to BUGS as well. From 81db5642f105368e1995e372ca7e4ab37d8cc73d Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:15:37 +0000 Subject: [PATCH 6/7] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 967c604..5f034e9 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := wbxml2 SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From fcb7af56b188b43c3810ee3dcb28f69b80f5afd3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:13:33 +0000 Subject: [PATCH 7/7] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 5f034e9..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wbxml2 -# $Id$ -NAME := wbxml2 -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index d5b6362..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -FC-6