Hello community, here is the log from the commit of package dbus-1 checked in at Fri Jul 7 18:45:52 CEST 2006. -------- --- dbus-1/dbus-1-mono.changes 2006-07-03 18:28:00.000000000 +0200 +++ dbus-1/dbus-1-mono.changes 2006-07-07 11:23:15.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Jul 7 11:17:16 CEST 2006 - adrian@suse.de + +- fix build for < 10.1 + * do not use -fstack-protector +- fix build for non-SUSE distros + +------------------------------------------------------------------- dbus-1-qt.changes: same change dbus-1-qt3.changes: same change dbus-1.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dbus-1-mono.spec ++++++ --- /var/tmp/diff_new_pack.HNAcZA/_old 2006-07-07 18:43:59.000000000 +0200 +++ /var/tmp/diff_new_pack.HNAcZA/_new 2006-07-07 18:43:59.000000000 +0200 @@ -23,7 +23,7 @@ License: Other uncritical OpenSource License, Other License(s), see package Group: Development/Libraries/Other Version: 0.62 -Release: 6 +Release: 7 Autoreqprov: on Summary: Mono Bindings for D-BUS Source0: dbus-%{version}.tar.gz @@ -219,7 +219,7 @@ %prep # COMMON-BEGIN2 %setup -n dbus-%{version} -q -%if %suse_version > 930 +%if 0%{?suse_version} > 930 %patch0 %endif %patch1 @@ -239,11 +239,15 @@ %build # COMMON-BEGIN3 # taken from dbus-1.spec till enabled COMMON-END (unknown configure options are ignored) -export CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -fPIC -fstack-protector" -export CXXFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -fstack-protector" +export CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -fPIC" +export CXXFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" +%if 0%{?suse_version} > 1000 +export CFLAGS="$CFLAGS -fstack-protector" +export CXXFLAGS="$CXXFLAGS -fstack-protector" +%endif ./configure \ --prefix="%{_prefix}" \ - --exec-prefix="%{_exec_prefix}" \ + --exec_prefix="%{_exec_prefix}" \ --sysconfdir="%{_sysconfdir}" \ --datadir="%{_datadir}" \ --localstatedir="%{_localstatedir}" \ @@ -369,9 +373,13 @@ %files -n dbus-1-x11 %defattr(-,root,root) %{_bindir}/dbus-launch -%{_mandir}/man1/dbus-launch.1.gz +%{_mandir}/man1/dbus-launch.1.* %changelog -n dbus-1-mono +* Fri Jul 07 2006 - adrian@suse.de +- fix build for < 10.1 + * do not use -fstack-protector +- fix build for non-SUSE distros * Fri Jun 30 2006 - thoenig@suse.de - fix build: add gcc-g++ to BuildRequires for dbus-1-mono.spec * Tue Jun 20 2006 - coolo@suse.de ++++++ dbus-1-qt.spec ++++++ --- /var/tmp/diff_new_pack.HNAcZA/_old 2006-07-07 18:43:59.000000000 +0200 +++ /var/tmp/diff_new_pack.HNAcZA/_new 2006-07-07 18:43:59.000000000 +0200 @@ -11,7 +11,7 @@ # norootforbuild Name: dbus-1-qt -BuildRequires: dbus-1 freetype2-devel libpng-devel qt-devel +BuildRequires: dbus-1 qt-devel # COMMON-BEGIN1 # taken von dbus-1.spec till COMMON-END BuildRequires: glib2-devel libxml2-devel @@ -19,7 +19,7 @@ License: Other License(s), see package, Other uncritical OpenSource License Group: Development/Libraries/KDE Version: 0.62 -Release: 6 +Release: 7 Autoreqprov: on Summary: QT4/KDE bindings for D-BUS Source0: dbus-%{version}.tar.gz @@ -66,11 +66,8 @@ %package -n dbus-1-qt-devel Summary: Developer package for D-BUS/QT bindings Requires: dbus-1 = %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' dbus-1`) -Requires: dbus-1-qt = %{version} Requires: dbus-1-devel -Requires: libstdc++-devel Requires: qt-devel -Requires: zlib-devel Autoreqprov: on Group: Development/Libraries/KDE @@ -128,7 +125,7 @@ %prep # COMMON-BEGIN2 %setup -n dbus-%{version} -q -%if %suse_version > 930 +%if 0%{?suse_version} > 930 %patch0 %endif %patch1 @@ -148,11 +145,15 @@ %build # COMMON-BEGIN3 # taken from dbus-1.spec till enabled COMMON-END (unknown configure options are ignored) -export CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -fPIC -fstack-protector" -export CXXFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -fstack-protector" +export CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -fPIC" +export CXXFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" +%if 0%{?suse_version} > 1000 +export CFLAGS="$CFLAGS -fstack-protector" +export CXXFLAGS="$CXXFLAGS -fstack-protector" +%endif ./configure \ --prefix="%{_prefix}" \ - --exec-prefix="%{_exec_prefix}" \ + --exec_prefix="%{_exec_prefix}" \ --sysconfdir="%{_sysconfdir}" \ --datadir="%{_datadir}" \ --localstatedir="%{_localstatedir}" \ @@ -241,6 +242,10 @@ %{_libdir}/pkgconfig/dbus-qt4-1.pc %changelog -n dbus-1-qt +* Fri Jul 07 2006 - adrian@suse.de +- fix build for < 10.1 + * do not use -fstack-protector +- fix build for non-SUSE distros * Fri Jun 30 2006 - thoenig@suse.de - fix build: add gcc-g++ to BuildRequires for dbus-1-mono.spec * Tue Jun 20 2006 - coolo@suse.de ++++++ dbus-1-qt3.spec ++++++ --- /var/tmp/diff_new_pack.HNAcZA/_old 2006-07-07 18:43:59.000000000 +0200 +++ /var/tmp/diff_new_pack.HNAcZA/_new 2006-07-07 18:43:59.000000000 +0200 @@ -19,7 +19,7 @@ License: Other License(s), see package, Other uncritical OpenSource License Group: Development/Libraries/KDE Version: 0.62 -Release: 6 +Release: 7 Autoreqprov: on Summary: QT3/KDE bindings for D-BUS Source0: dbus-%{version}.tar.gz @@ -67,9 +67,7 @@ %package -n dbus-1-qt3-devel Summary: QT3/KDE bindings for D-BUS Requires: dbus-1 = %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' dbus-1`) -Requires: dbus-1-qt3 = %{version} Requires: dbus-1-devel -Requires: libstdc++-devel Autoreqprov: on Group: Development/Libraries/KDE @@ -121,7 +119,7 @@ %prep # COMMON-BEGIN2 %setup -n dbus-%{version} -q -%if %suse_version > 930 +%if 0%{?suse_version} > 930 %patch0 %endif %patch1 @@ -143,11 +141,15 @@ export QTDIR="/usr/lib/qt3/" # COMMON-BEGIN3 # taken from dbus-1.spec till enabled COMMON-END (unknown configure options are ignored) -export CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -fPIC -fstack-protector" -export CXXFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -fstack-protector" +export CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -fPIC" +export CXXFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" +%if 0%{?suse_version} > 1000 +export CFLAGS="$CFLAGS -fstack-protector" +export CXXFLAGS="$CXXFLAGS -fstack-protector" +%endif ./configure \ --prefix="%{_prefix}" \ - --exec-prefix="%{_exec_prefix}" \ + --exec_prefix="%{_exec_prefix}" \ --sysconfdir="%{_sysconfdir}" \ --datadir="%{_datadir}" \ --localstatedir="%{_localstatedir}" \ @@ -235,6 +237,10 @@ %{_libdir}/libdbus-qt-1.so %changelog -n dbus-1-qt3 +* Fri Jul 07 2006 - adrian@suse.de +- fix build for < 10.1 + * do not use -fstack-protector +- fix build for non-SUSE distros * Fri Jun 30 2006 - thoenig@suse.de - fix build: add gcc-g++ to BuildRequires for dbus-1-mono.spec * Tue Jun 20 2006 - coolo@suse.de ++++++ dbus-1.spec ++++++ --- /var/tmp/diff_new_pack.HNAcZA/_old 2006-07-07 18:43:59.000000000 +0200 +++ /var/tmp/diff_new_pack.HNAcZA/_new 2006-07-07 18:43:59.000000000 +0200 @@ -19,7 +19,7 @@ License: Other License(s), see package Group: System/Daemons Version: 0.62 -Release: 6 +Release: 7 Autoreqprov: on Summary: D-BUS Message Bus System Source0: dbus-%{version}.tar.gz @@ -40,7 +40,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build # COMMON-END1 Prereq: /usr/sbin/groupadd /usr/sbin/useradd /sbin/insserv /etc/init.d/boot.localfs +%if 0%{?suse_version:1} Requires: aaa_base +%endif %package -n dbus-1-devel Summary: Developer package for D-BUS Requires: %{name} = %{version} dbus-1-glib glib2-devel @@ -136,7 +138,7 @@ %prep # COMMON-BEGIN2 %setup -n dbus-%{version} -q -%if %suse_version > 930 +%if 0%{?suse_version} > 930 %patch0 %endif %patch1 @@ -156,11 +158,15 @@ %build # COMMON-BEGIN3 # taken from dbus-1.spec till enabled COMMON-END (unknown configure options are ignored) -export CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -fPIC -fstack-protector" -export CXXFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -fstack-protector" +export CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -fPIC" +export CXXFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" +%if 0%{?suse_version} > 1000 +export CFLAGS="$CFLAGS -fstack-protector" +export CXXFLAGS="$CXXFLAGS -fstack-protector" +%endif ./configure \ --prefix="%{_prefix}" \ - --exec-prefix="%{_exec_prefix}" \ + --exec_prefix="%{_exec_prefix}" \ --sysconfdir="%{_sysconfdir}" \ --datadir="%{_datadir}" \ --localstatedir="%{_localstatedir}" \ @@ -199,6 +205,7 @@ %pre /usr/sbin/groupadd -r messagebus 2> /dev/null || : /usr/sbin/useradd -r -o -s /bin/false -c "User for D-BUS" -d /var/run/dbus -g messagebus messagebus 2> /dev/null || : +%if 0%{?suse_version:1} %preun %{stop_on_removal dbus} @@ -211,6 +218,7 @@ %{restart_on_update dbus} %{insserv_cleanup} %{run_ldconfig} +%endif %post devel -p /sbin/ldconfig @@ -233,9 +241,9 @@ %{_bindir}/dbus-send %{_bindir}/dbus-cleanup-sockets %{_libdir}/*dbus-1.so.* -%{_mandir}/man1/dbus-cleanup-sockets.1.gz -%{_mandir}/man1/dbus-daemon.1.gz -%{_mandir}/man1/dbus-send.1.gz +%{_mandir}/man1/dbus-cleanup-sockets.1.* +%{_mandir}/man1/dbus-daemon.1.* +%{_mandir}/man1/dbus-send.1.* %attr(-,messagebus,messagebus) %{_localstatedir}/run/dbus %files -n dbus-1-devel @@ -258,9 +266,13 @@ %{_libdir}/*glib*.so %{_bindir}/dbus-binding-tool %{_bindir}/dbus-monitor -%{_mandir}/man1/dbus-monitor.1.gz +%{_mandir}/man1/dbus-monitor.1.* %changelog -n dbus-1 +* Fri Jul 07 2006 - adrian@suse.de +- fix build for < 10.1 + * do not use -fstack-protector +- fix build for non-SUSE distros * Tue Jul 04 2006 - adrian@suse.de - fix build for 10.1 - remove requires to -%%release which can't work ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org