From 2c7274a8737c9c02e4ff1fd1baa47a0e6e781b96d7e6797ffecd23e125aef66e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 30 Sep 2014 08:24:18 +0000 Subject: [PATCH] Accepting request 253159 from home:fstrba - Reformat the spec file using spec-cleaner - Reformat the spec file using spec-cleaner OBS-URL: https://build.opensuse.org/request/show/253159 OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1?expand=0&rev=179 --- dbus-1-x11.changes | 5 +++ dbus-1-x11.spec | 86 +++++++++++++++++++++++----------------------- dbus-1-x11.spec.in | 42 +++++++++++----------- dbus-1.changes | 5 +++ dbus-1.spec | 58 +++++++++++++++---------------- 5 files changed, 103 insertions(+), 93 deletions(-) diff --git a/dbus-1-x11.changes b/dbus-1-x11.changes index 79ad8f6..f4e0264 100644 --- a/dbus-1-x11.changes +++ b/dbus-1-x11.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 30 08:20:50 UTC 2014 - fstrba@suse.com + +- Reformat the spec file using spec-cleaner + ------------------------------------------------------------------- Thu Sep 18 09:14:28 UTC 2014 - fstrba@suse.com diff --git a/dbus-1-x11.spec b/dbus-1-x11.spec index f2a2f06..e6cd344 100644 --- a/dbus-1-x11.spec +++ b/dbus-1-x11.spec @@ -17,37 +17,22 @@ %define with_systemd 1 -%bcond_without docs - -Name: dbus-1-x11 %define _name dbus %define _libname libdbus-1-3 -BuildRequires: pkgconfig(x11) -Url: http://dbus.freedesktop.org/ +%bcond_without docs +%bcond_without selinux +# COMMON1-BEGIN +# COMMON1-BEGIN +%if ! %{with_systemd} +%define _unitdir %{_libexecdir}/systemd/system +%endif +Name: dbus-1-x11 +Version: 1.8.8 +Release: 0 Summary: D-Bus Message Bus System License: GPL-2.0+ or AFL-2.1 Group: System/Daemons -BuildRequires: audit-devel -BuildRequires: doxygen -BuildRequires: update-desktop-files -BuildRequires: xmlto - -# COMMON1-BEGIN -# COMMON1-BEGIN - -%if ! %{with_systemd} -%define _unitdir /usr/lib/systemd/system -%endif - -%if %{with_systemd} -BuildRequires: pkgconfig(libsystemd-daemon) -BuildRequires: pkgconfig(libsystemd-login) -%endif -BuildRequires: libexpat-devel -BuildRequires: libtool -BuildRequires: pkg-config -Version: 1.8.8 -Release: 0 +Url: http://dbus.freedesktop.org/ # Source0: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz Source2: dbus-1.desktop @@ -56,12 +41,23 @@ Source4: baselibs.conf Patch0: dbus-log-deny.patch # PATCH-FIX-OPENSUSE coolo@suse.de -- force a feature configure won't accept without x11 in buildrequires Patch1: dbus-do-autolaunch.patch -%bcond_without selinux +BuildRequires: audit-devel +BuildRequires: doxygen +BuildRequires: libcap-ng-devel +BuildRequires: libexpat-devel +BuildRequires: libtool +BuildRequires: pkg-config +BuildRequires: update-desktop-files +BuildRequires: xmlto +BuildRequires: pkgconfig(x11) +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if %{with_systemd} +BuildRequires: pkgconfig(libsystemd-daemon) +BuildRequires: pkgconfig(libsystemd-login) +%endif %if %{with selinux} BuildRequires: libselinux-devel %endif -BuildRequires: libcap-ng-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build # COMMON1-END # COMMON1-END @@ -86,12 +82,15 @@ bus daemon). %package -n dbus-1 Summary: D-Bus Message Bus System Group: System/Daemons +# FIXME: use proper Requires(pre/post/preun/...) +PreReq: %{_sbindir}/groupadd +PreReq: %{_sbindir}/useradd +PreReq: permissions +Requires(post): %{_libname} = %{version} # bug437293 %ifarch ppc64 Obsoletes: dbus-1-64bit %endif -PreReq: permissions /usr/sbin/groupadd /usr/sbin/useradd -Requires(post): %{_libname} = %{version} %description -n dbus-1 D-Bus is a message bus system, a simple way for applications to talk to @@ -104,7 +103,7 @@ bus daemon). %prep # COMMON2-BEGIN # COMMON2-BEGIN -%setup -n %{_name}-%{version} -q +%setup -q -n %{_name}-%{version} %patch0 -p1 %patch1 -p1 @@ -113,9 +112,9 @@ echo 'HTML_TIMESTAMP=NO' >> Doxyfile.in autoreconf -fi # We use -fpie/-pie for the whole build; this is the recommended way to harden # the build upstream, see discussion in fdo#46570 -export CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -fPIC -fpie" +export CFLAGS="%{optflags} -fno-strict-aliasing -fPIC -fpie" export LDFLAGS="-pie" -export CXXFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" +export CXXFLAGS="%{optflags} -fno-strict-aliasing" export V=1 %configure \ --disable-static \ @@ -140,6 +139,7 @@ export V=1 --with-system-socket=/run/dbus/system_bus_socket \ --with-systemdsystemunitdir=%{_unitdir} make %{?_smp_mflags} + %if %{with docs} doxygen -u && doxygen ./cleanup-man-pages.sh @@ -148,17 +148,17 @@ doxygen -u && doxygen %install # COMMON2-END # COMMON2-END -make DESTDIR=%{buildroot} install +make DESTDIR=%{buildroot} install %{?_smp_mflags} mkdir -p %{buildroot}/%{_bindir} mkdir -p %{buildroot}/%{_mandir}/man1 -mkdir -p %{buildroot}/usr/sbin +mkdir -p %{buildroot}%{_prefix}/sbin mv %{buildroot}/bin/dbus-launch %{buildroot}/%{_bindir} mv %{buildroot}/bin/dbus-run-session %{buildroot}/%{_bindir} ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rcdbus install -d %{buildroot}/run/dbus mkdir -p %{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/ -install -m 0644 %SOURCE2 \ +install -m 0644 %{SOURCE2} \ %{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/dbus-1.desktop mkdir -p %{buildroot}/%{_libdir}/pkgconfig mkdir -p %{buildroot}/lib/dbus-1/system-services @@ -180,15 +180,15 @@ touch %{buildroot}/%{_localstatedir}/lib/dbus/machine-id # Link the /bin/dbus-send binary to /usr/bin/dbus-send. This should be removed once dbus has been fully migrated to /usr # Currently required to make upower work together with systemd -mkdir -p %{buildroot}/usr/bin -ln -sf /bin/dbus-send %{buildroot}/usr/bin/dbus-send +mkdir -p %{buildroot}%{_prefix}/bin +ln -sf /bin/dbus-send %{buildroot}%{_bindir}/dbus-send %verifyscript -n dbus-1 %verify_permissions -e /lib/dbus-1/dbus-daemon-launch-helper %pre -n dbus-1 -/usr/sbin/groupadd -r messagebus 2> /dev/null || : -/usr/sbin/useradd -r -s /bin/false -c "User for D-Bus" -d /run/dbus -g messagebus messagebus 2> /dev/null || : +%{_sbindir}/groupadd -r messagebus 2> /dev/null || : +%{_sbindir}/useradd -r -s /bin/false -c "User for D-Bus" -d /run/dbus -g messagebus messagebus 2> /dev/null || : %post -n dbus-1 if [ -e %{_localstatedir}/lib/dbus/machine-id -a -e %{_sysconfdir}/machine-id ]; then @@ -228,7 +228,7 @@ fi /bin/dbus-daemon /bin/dbus-monitor /bin/dbus-send -/usr/bin/dbus-send +%{_bindir}/dbus-send /bin/dbus-uuidgen %{_mandir}/man1/dbus-cleanup-sockets.1.* %{_mandir}/man1/dbus-daemon.1.* @@ -242,7 +242,7 @@ fi %ghost /run/dbus %ghost %{_localstatedir}/lib/dbus/machine-id %if ! %{with_systemd} -%dir /usr/lib/systemd +%dir %{_libexecdir}/systemd %dir %{_unitdir} %endif %{_unitdir}/dbus.service diff --git a/dbus-1-x11.spec.in b/dbus-1-x11.spec.in index 214dab5..bfb97b7 100644 --- a/dbus-1-x11.spec.in +++ b/dbus-1-x11.spec.in @@ -1,7 +1,7 @@ # -# spec file for package dbus-1-x11 (Version 1.4.1) +# spec file for package dbus-1-x11.spec # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,22 +15,21 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define with_systemd 1 -%bcond_without docs -Name: dbus-1-x11 +%define with_systemd 1 %define _name dbus %define _libname libdbus-1-3 -BuildRequires: pkgconfig(x11) -Url: http://dbus.freedesktop.org/ -License: GPL2+ or AFL 2.1 -Group: System/Daemons +%bcond_without docs +Name: dbus-1-x11 Summary: D-Bus Message Bus System +License: GPL-2.0+ or AFL-2.1 +Group: System/Daemons +Url: http://dbus.freedesktop.org/ BuildRequires: audit-devel BuildRequires: doxygen BuildRequires: update-desktop-files BuildRequires: xmlto - +BuildRequires: pkgconfig(x11) # COMMON1-BEGIN # COMMON1-END @@ -55,12 +54,15 @@ bus daemon). %package -n dbus-1 Summary: D-Bus Message Bus System Group: System/Daemons +# FIXME: use proper Requires(pre/post/preun/...) +PreReq: %{_sbindir}/groupadd +PreReq: %{_sbindir}/useradd +PreReq: permissions +Requires(post): %{_libname} = %{version} # bug437293 %ifarch ppc64 Obsoletes: dbus-1-64bit %endif -PreReq: permissions /usr/sbin/groupadd /usr/sbin/useradd -Requires(post): %{_libname} = %{version} %description -n dbus-1 D-Bus is a message bus system, a simple way for applications to talk to @@ -76,14 +78,14 @@ bus daemon). make DESTDIR=%{buildroot} install mkdir -p %{buildroot}/%{_bindir} mkdir -p %{buildroot}/%{_mandir}/man1 -mkdir -p %{buildroot}/usr/sbin +mkdir -p %{buildroot}%{_prefix}/sbin mv %{buildroot}/bin/dbus-launch %{buildroot}/%{_bindir} mv %{buildroot}/bin/dbus-run-session %{buildroot}/%{_bindir} ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rcdbus install -d %{buildroot}/run/dbus mkdir -p %{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/ -install -m 0644 %SOURCE2 \ +install -m 0644 %{SOURCE2} \ %{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/dbus-1.desktop mkdir -p %{buildroot}/%{_libdir}/pkgconfig mkdir -p %{buildroot}/lib/dbus-1/system-services @@ -105,15 +107,15 @@ touch %{buildroot}/%{_localstatedir}/lib/dbus/machine-id # Link the /bin/dbus-send binary to /usr/bin/dbus-send. This should be removed once dbus has been fully migrated to /usr # Currently required to make upower work together with systemd -mkdir -p %{buildroot}/usr/bin -ln -sf /bin/dbus-send %{buildroot}/usr/bin/dbus-send +mkdir -p %{buildroot}%{_prefix}/bin +ln -sf /bin/dbus-send %{buildroot}%{_bindir}/dbus-send %verifyscript -n dbus-1 %verify_permissions -e /lib/dbus-1/dbus-daemon-launch-helper %pre -n dbus-1 -/usr/sbin/groupadd -r messagebus 2> /dev/null || : -/usr/sbin/useradd -r -s /bin/false -c "User for D-Bus" -d /run/dbus -g messagebus messagebus 2> /dev/null || : +%{_sbindir}/groupadd -r messagebus 2> /dev/null || : +%{_sbindir}/useradd -r -s /bin/false -c "User for D-Bus" -d /run/dbus -g messagebus messagebus 2> /dev/null || : %post -n dbus-1 if [ -e %{_localstatedir}/lib/dbus/machine-id -a -e %{_sysconfdir}/machine-id ]; then @@ -153,7 +155,7 @@ fi /bin/dbus-daemon /bin/dbus-monitor /bin/dbus-send -/usr/bin/dbus-send +%{_bindir}/dbus-send /bin/dbus-uuidgen %{_mandir}/man1/dbus-cleanup-sockets.1.* %{_mandir}/man1/dbus-daemon.1.* @@ -167,7 +169,7 @@ fi %ghost /run/dbus %ghost %{_localstatedir}/lib/dbus/machine-id %if ! %{with_systemd} -%dir /usr/lib/systemd +%dir %{_libexecdir}/systemd %dir %{_unitdir} %endif %{_unitdir}/dbus.service diff --git a/dbus-1.changes b/dbus-1.changes index 79ad8f6..f4e0264 100644 --- a/dbus-1.changes +++ b/dbus-1.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 30 08:20:50 UTC 2014 - fstrba@suse.com + +- Reformat the spec file using spec-cleaner + ------------------------------------------------------------------- Thu Sep 18 09:14:28 UTC 2014 - fstrba@suse.com diff --git a/dbus-1.spec b/dbus-1.spec index 9ec7442..6eee676 100644 --- a/dbus-1.spec +++ b/dbus-1.spec @@ -17,31 +17,21 @@ %define with_systemd 0 -%bcond_with docs - -Name: dbus-1 %define _name dbus %define _libname libdbus-1-3 -Url: http://dbus.freedesktop.org/ +%bcond_with docs +%bcond_without selinux +# COMMON1-BEGIN +%if ! %{with_systemd} +%define _unitdir %{_libexecdir}/systemd/system +%endif +Name: dbus-1 +Version: 1.8.8 +Release: 0 Summary: D-Bus Message Bus System License: GPL-2.0+ or AFL-2.1 Group: System/Daemons - -# COMMON1-BEGIN - -%if ! %{with_systemd} -%define _unitdir /usr/lib/systemd/system -%endif - -%if %{with_systemd} -BuildRequires: pkgconfig(libsystemd-daemon) -BuildRequires: pkgconfig(libsystemd-login) -%endif -BuildRequires: libexpat-devel -BuildRequires: libtool -BuildRequires: pkg-config -Version: 1.8.8 -Release: 0 +Url: http://dbus.freedesktop.org/ # Source0: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz Source2: dbus-1.desktop @@ -50,12 +40,18 @@ Source4: baselibs.conf Patch0: dbus-log-deny.patch # PATCH-FIX-OPENSUSE coolo@suse.de -- force a feature configure won't accept without x11 in buildrequires Patch1: dbus-do-autolaunch.patch -%bcond_without selinux +BuildRequires: libcap-ng-devel +BuildRequires: libexpat-devel +BuildRequires: libtool +BuildRequires: pkg-config +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if %{with_systemd} +BuildRequires: pkgconfig(libsystemd-daemon) +BuildRequires: pkgconfig(libsystemd-login) +%endif %if %{with selinux} BuildRequires: libselinux-devel %endif -BuildRequires: libcap-ng-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build # COMMON1-END %package -n %{_libname} @@ -95,7 +91,7 @@ bus daemon). %prep # COMMON2-BEGIN -%setup -n %{_name}-%{version} -q +%setup -q -n %{_name}-%{version} %patch0 -p1 %patch1 -p1 @@ -104,9 +100,9 @@ echo 'HTML_TIMESTAMP=NO' >> Doxyfile.in autoreconf -fi # We use -fpie/-pie for the whole build; this is the recommended way to harden # the build upstream, see discussion in fdo#46570 -export CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -fPIC -fpie" +export CFLAGS="%{optflags} -fno-strict-aliasing -fPIC -fpie" export LDFLAGS="-pie" -export CXXFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" +export CXXFLAGS="%{optflags} -fno-strict-aliasing" export V=1 %configure \ --disable-static \ @@ -131,6 +127,7 @@ export V=1 --with-system-socket=/run/dbus/system_bus_socket \ --with-systemdsystemunitdir=%{_unitdir} make %{?_smp_mflags} + %if %{with docs} doxygen -u && doxygen ./cleanup-man-pages.sh @@ -143,8 +140,8 @@ make DESTDIR=$tdir install # devel stuff must not be in /lib mkdir -p %{buildroot}%{_libdir} -%{__ln_s} -v /%{_lib}/$(readlink $tdir/%{_lib}/lib%{name}.so) %{buildroot}%{_libdir}/lib%{name}.so -%{__rm} -v $tdir/%{_lib}/lib%{name}.so +ln -s -v /%{_lib}/$(readlink $tdir/%{_lib}/lib%{name}.so) %{buildroot}%{_libdir}/lib%{name}.so +rm -v $tdir/%{_lib}/lib%{name}.so mkdir -p %{buildroot}/%{_libdir}/dbus-1.0/include/ mv -f $tdir/%{_lib}/dbus-1.0/include/* %{buildroot}/%{_libdir}/dbus-1.0/include/ rm -f $tdir/%{_lib}/*.la @@ -165,12 +162,13 @@ done popd rm -rf $tdir -for i in /etc/dbus-1/session.d /etc/dbus-1/system.d \ - /usr/share/dbus-1/interfaces /usr/share/dbus-1/services /usr/share/dbus-1/system-services; do +for i in %{_sysconfdir}/dbus-1/session.d %{_sysconfdir}/dbus-1/system.d \ + %{_datadir}/dbus-1/interfaces %{_datadir}/dbus-1/services %{_datadir}/dbus-1/system-services; do mkdir -p %{buildroot}$i done %post -n %{_libname} -p /sbin/ldconfig + %postun -n %{_libname} -p /sbin/ldconfig %files -n %{_libname}