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 967c604..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 $$/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/wbxml2.spec b/wbxml2.spec index 1bab378..92bcbb7 100644 --- a/wbxml2.spec +++ b/wbxml2.spec @@ -1,6 +1,6 @@ Name: wbxml2 Version: 0.9.2 -Release: 9%{?dist} +Release: 13%{?dist} Summary: Library and tools to parse, encode and handle WBXML documents Group: System Environment/Libraries @@ -8,16 +8,13 @@ License: LGPLv2+ URL: http://libwbxml.aymerick.com:8080/ Source0: http://dl.sourceforge.net/wbxmllib/%{name}-%{version}.tar.gz -# Do not install doc files Patch0: wbxml2-0.9.2-no-doc.patch -# Fix CFLAGS Patch1: wbxml2-0.9.2-cflags.patch -# libtool, automake and autoconf stuffs, done by autoreconf Patch2: wbxml2-0.9.2-autoreconf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: expat-devel zlib-devel popt +BuildRequires: expat-devel zlib-devel popt %description The WBXML Library (libwbxml) contains a library and its associated tools to @@ -29,6 +26,8 @@ bandwidth in mobile communications. Group: Development/Libraries Summary: Development files of %{name} Requires: %{name} = %{version}-%{release} +Requires: expat-devel zlib-devel popt libxml2-devel + %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. @@ -38,6 +37,7 @@ developing applications that use %{name}. %patch0 -p1 %patch1 -p1 %patch2 -p1 + chmod a+x configure # Recode to UTF-8 several doc files @@ -59,6 +59,8 @@ make %{?_smp_mflags} rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +sed -i -e 's,Version: 0.9.0,Version: 0.9.2,' \ + $RPM_BUILD_ROOT%{_libdir}/pkgconfig/libwbxml2.pc %clean rm -rf $RPM_BUILD_ROOT @@ -84,10 +86,23 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libwbxml2.so %{_libdir}/pkgconfig/libwbxml2.pc - - - %changelog +* Wed Jun 18 2008 Andreas Bierfert +- 0.9.2-13 +- drop synce patches (not needed anymore, fixes #445130) + +* Sat Jan 12 2008 Andreas Bierfert +- 0.9.2-12 +- pkgconfig also needs libxml2-devel + +* Sat Jan 12 2008 Andreas Bierfert +- 0.9.2-11 +- fix devel requires + +* Mon Jan 07 2008 Andreas Bierfert +- 0.9.2-10 +- add synce patches + * Sun Aug 26 2007 Laurent Rineau - 0.9.2-9 - Change the License: tag.