packages: qof/qof.spec, qof/ac.patch (NEW), qof/undefined_behavior.patch (N...

[wiget]

Author: wiget                        Date: Mon Feb  7 19:25:19 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- update to 0.8.1 (soname change)
- drop libtool file

---- Files affected:
packages/qof:
   qof.spec (1.7 -> 1.8) , ac.patch (NONE -> 1.1)  (NEW), undefined_behavior.patch (NONE -> 1.1)  (NEW), qof-link.patch (1.4 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/qof/qof.spec
diff -u packages/qof/qof.spec:1.7 packages/qof/qof.spec:1.8
--- packages/qof/qof.spec:1.7	Sat May 31 00:17:27 2008
+++ packages/qof/qof.spec	Mon Feb  7 20:25:14 2011
@@ -2,16 +2,18 @@
 Summary:	Query Object Framework
 Summary(pl.UTF-8):	Obiektowy szkielet zapytań
 Name:		qof
-Version:	0.7.5
+Version:	0.8.1
 Release:	1
 License:	GPL v2+
 Group:		Libraries
-Source0:	http://dl.sourceforge.net/qof/%{name}-%{version}.tar.gz
-# Source0-md5:	91adad70f0a1da22f5e8c5cfd2b16f22
-Patch0:		%{name}-link.patch
-URL:		http://qof.sourceforge.net/
-BuildRequires:	autoconf >= 2.53
+Source0:	https://alioth.debian.org/frs/download.php/3059/%{name}-%{version}.tar.gz
+# Source0-md5:	f504815983949752b7133f108760b99c
+Patch0:		ac.patch
+Patch1:		undefined_behavior.patch
+URL:		https://alioth.debian.org/projects/qof/
+BuildRequires:	autoconf >= 2.61
 BuildRequires:	automake
+BuildRequires:	gettext-devel >= 0.18.1
 BuildRequires:	glib2-devel >= 1:2.10.0
 BuildRequires:	libgda3-devel >= 3.0.1
 BuildRequires:	libtool
@@ -68,8 +70,10 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
+%{__gettextize}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -88,7 +92,9 @@
 	DESTDIR=$RPM_BUILD_ROOT
 
 # dlopened
-rm -f $RPM_BUILD_ROOT%{_libdir}/libqof-backend-*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/qof2/libqof-backend-*.{la,a}
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libqof.la
 
 %find_lang %{name}
 
@@ -102,25 +108,17 @@
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
 %attr(755,root,root) %{_libdir}/libqof.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libqof.so.1
-%attr(755,root,root) %{_libdir}/libqof-backend-gda.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libqof-backend-gda.so.0
-%attr(755,root,root) %{_libdir}/libqof-backend-gda.so
-%attr(755,root,root) %{_libdir}/libqof-backend-qsf.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libqof-backend-qsf.so.0
-%attr(755,root,root) %{_libdir}/libqof-backend-qsf.so
-%attr(755,root,root) %{_libdir}/libqof-backend-sqlite.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libqof-backend-sqlite.so.0
-%attr(755,root,root) %{_libdir}/libqof-backend-sqlite.so
+%attr(755,root,root) %ghost %{_libdir}/libqof.so.2
+%attr(755,root,root) %{_libdir}/qof2/libqof-backend-gda.so
+%attr(755,root,root) %{_libdir}/qof2/libqof-backend-qsf.so
+%attr(755,root,root) %{_libdir}/qof2/libqof-backend-sqlite.so
 %{_datadir}/xml/qof
 
 %files devel
 %defattr(644,root,root,755)
 %doc doc/*.txt
 %attr(755,root,root) %{_libdir}/libqof.so
-%{_libdir}/libqof.la
 %{_includedir}/qof
-%{_pkgconfigdir}/qof-1.pc
 %{_pkgconfigdir}/qof.pc
 
 %files static
@@ -133,6 +131,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2011/02/07 19:25:14  wiget
+- update to 0.8.1 (soname change)
+- drop libtool file
+
 Revision 1.7  2008/05/30 22:17:27  qboosh
 - updated to 0.7.5
 - updated link patch

================================================================
Index: packages/qof/ac.patch
diff -u /dev/null packages/qof/ac.patch:1.1
--- /dev/null	Mon Feb  7 20:25:19 2011
+++ packages/qof/ac.patch	Mon Feb  7 20:25:14 2011
@@ -0,0 +1,11 @@
+--- qof-0.8.1/configure.ac.wiget	2011-02-07 19:53:00.926872041 +0100
++++ qof-0.8.1/configure.ac	2011-02-07 19:59:51.518454558 +0100
+@@ -9,7 +9,7 @@ AC_DEFUN([MAJOR], [0])
+ AC_DEFUN([MINOR], [8])
+ AC_DEFUN([MICRO], [1])
+ AC_DEFUN([MY_VERSION], [MAJOR.MINOR.MICRO])
+-AC_INIT([qof], [MY_VERSION],
++AC_INIT([qof], MY_VERSION,
+   [http://lists.sourceforge.net/lists/listinfo/qof-devel])
+ AC_PREREQ(2.61)
+ AC_GNU_SOURCE

================================================================
Index: packages/qof/undefined_behavior.patch
diff -u /dev/null packages/qof/undefined_behavior.patch:1.1
--- /dev/null	Mon Feb  7 20:25:19 2011
+++ packages/qof/undefined_behavior.patch	Mon Feb  7 20:25:14 2011
@@ -0,0 +1,16 @@
+--- qof-0.8.1/qof/qofdate.c.wiget	2008-06-09 13:34:52.000000000 +0200
++++ qof-0.8.1/qof/qofdate.c	2011-02-07 20:05:26.363251218 +0100
+@@ -494,8 +494,11 @@ date_normalise (QofDate * date)
+ 		{
+ 			/* -1 == Dec, -4 == Sep */
+ 			date->qd_mon += 12 + 1;
+-			date->qd_year = (date->qd_year < 0) ? 
+-				date->qd_year++ : date->qd_year--;
++			if (date->qd_year < 0) {
++				date->qd_year += 1;
++			} else {
++				date->qd_year -= 1;
++			}
+ 		}
+ 	}
+ 	days = days_in_months[qof_date_isleap(date->qd_year)][date->qd_mon];
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qof/qof.spec?r1=1.7&r2=1.8&f=u