Hello community, here is the log from the commit of package dbus-1-qt3 for openSUSE:Factory checked in at 2014-01-29 07:13:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dbus-1-qt3 (Old) and /work/SRC/openSUSE:Factory/.dbus-1-qt3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dbus-1-qt3" Changes: -------- --- /work/SRC/openSUSE:Factory/dbus-1-qt3/dbus-1-qt3.changes 2012-01-26 15:58:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dbus-1-qt3.new/dbus-1-qt3.changes 2014-01-29 07:13:26.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Jan 28 08:36:16 UTC 2014 - [email protected] + +- add autotools patches from Alt Linux, drop use of unsermake + dbus-qt3-0.62-alt-new-autotools.patch + dbus-qt3-0.62-fix-autoconf-2.64.patch + +------------------------------------------------------------------- New: ---- dbus-qt3-0.62-alt-new-autotools.patch dbus-qt3-0.62-fix-autoconf-2.64.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dbus-1-qt3.spec ++++++ --- /var/tmp/diff_new_pack.29GFQq/_old 2014-01-29 07:13:27.000000000 +0100 +++ /var/tmp/diff_new_pack.29GFQq/_new 2014-01-29 07:13:27.000000000 +0100 @@ -19,7 +19,7 @@ Name: dbus-1-qt3 -BuildRequires: dbus-1 dbus-1-devel qt3-devel unsermake +BuildRequires: dbus-1 dbus-1-devel qt3-devel automake Url: http://dbus.freedesktop.org/ License: GPL-2.0+ Group: Development/Libraries/KDE @@ -36,15 +36,17 @@ Source1: baselibs.conf Patch0: dbus-qt3-compile-fix-thoenig-01.patch Patch1: dbus-qt3-do-not-close-shared-connection-thoenig-01.patch +Patch2: dbus-qt3-0.62-alt-new-autotools.patch +Patch3: dbus-qt3-0.62-fix-autoconf-2.64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: dbus-1 >= %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' dbus-1`) +Requires: dbus-1 Provides: dbus-1-qt:/usr/%_lib/libdbus-qt-1.so.1 %package -n dbus-1-qt3-devel License: GPL-2.0+ Summary: Developer package for QT3/KDE bindings for D-Bus -Requires: dbus-1 >= %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' dbus-1`) -Requires: dbus-1-devel >= %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' dbus-1-devel`) +Requires: dbus-1 +Requires: dbus-1-devel Requires: dbus-1-qt3 = %{version} AutoReqProv: on Group: Development/Libraries/KDE @@ -97,8 +99,12 @@ %setup -n dbus-qt3-%{version} -q %patch0 -p0 %patch1 -p0 +%patch2 -p1 +%patch3 -p1 %build +#autoreconf -fi +make -f admin/Makefile.common cvs RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -fstack-protector -fno-strict-aliasing -fPIC" export CFLAGS="${RPM_OPT_FLAGS}" export CXXFLAGS="${RPM_OPT_FLAGS}" @@ -121,9 +127,6 @@ %postun %{run_ldconfig} -%clean -%{__rm} -rf %{buildroot} - %files %defattr(-, root, root) %{_libdir}/libdbus-qt-1.so.1* ++++++ dbus-qt3-0.62-alt-new-autotools.patch ++++++ diff -ur dbus-qt3-0.62.orig/admin/cvs.sh dbus-qt3-0.62/admin/cvs.sh --- dbus-qt3-0.62.orig/admin/cvs.sh 2006-08-21 13:26:33 +0300 +++ dbus-qt3-0.62/admin/cvs.sh 2008-01-03 14:44:25 +0200 @@ -68,7 +68,7 @@ echo "*** KDE requires automake $required_automake_version" exit 1 ;; - automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*) + automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.*) echo "*** $AUTOMAKE_STRING found." UNSERMAKE=no ;; ++++++ dbus-qt3-0.62-fix-autoconf-2.64.patch ++++++ --- dbus-qt3-0.62/admin/configure.in.min.orig 2006-08-21 10:26:33.000000000 +0000 +++ dbus-qt3-0.62/admin/configure.in.min 2010-05-22 19:35:36.000000000 +0000 @@ -43,6 +43,11 @@ KDE_SET_PREFIX dnl generate the config header AM_CONFIG_HEADER(config.h) dnl at the distribution this done +AC_PROG_CC +AC_PROG_CXX +AC_EXEEXT +AC_OBJEXT + dnl Checks for programs. AC_CHECK_COMPILERS AC_ENABLE_SHARED(yes) --- dbus-qt3-0.62/configure.in.in.orig 2006-08-21 10:26:35.000000000 +0000 +++ dbus-qt3-0.62/configure.in.in 2010-05-22 19:33:04.000000000 +0000 @@ -57,6 +57,11 @@ dnl without this order in this file, aut dnl AM_CONFIG_HEADER(config.h) +AC_PROG_CC +AC_PROG_CXX +AC_EXEEXT +AC_OBJEXT + dnl checks for programs. dnl first check for c/c++ compilers AC_CHECK_COMPILERS --- dbus-qt3-0.62/configure.in.orig 2006-08-21 10:26:39.000000000 +0000 +++ dbus-qt3-0.62/configure.in 2010-05-22 19:33:04.000000000 +0000 @@ -61,6 +61,11 @@ dnl without this order in this file, aut dnl AM_CONFIG_HEADER(config.h) +AC_PROG_CC +AC_PROG_CXX +AC_EXEEXT +AC_OBJEXT + dnl checks for programs. dnl first check for c/c++ compilers AC_CHECK_COMPILERS -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
