From ea91e1ae9b92dcb02c57e2396e2d1ee187b1611e Mon Sep 17 00:00:00 2001 From: Ville Skyttä Date: Jan 21 2014 22:57:55 +0000 Subject: Adapt to unversioned docdirs; don't ship all docs in main package. - Fix bogus dates in %changelog and tabs vs spaces warning. --- diff --git a/dbus.spec b/dbus.spec index 7ec6de5..c031832 100644 --- a/dbus.spec +++ b/dbus.spec @@ -1,4 +1,5 @@ %global _hardened_build 1 +%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} %define gettext_package dbus @@ -7,13 +8,13 @@ %define dbus_user_uid 81 -%define dbus_common_config_opts --enable-libaudit --enable-selinux=yes --with-init-scripts=redhat --with-system-pid-file=%{_localstatedir}/run/messagebus.pid --with-dbus-user=dbus --libdir=/%{_lib} --bindir=/bin --sysconfdir=/etc --exec-prefix=/ --libexecdir=/%{_lib}/dbus-1 --with-systemdsystemunitdir=/lib/systemd/system/ --enable-doxygen-docs --enable-xml-docs --disable-silent-rules +%define dbus_common_config_opts --enable-libaudit --enable-selinux=yes --with-init-scripts=redhat --with-system-pid-file=%{_localstatedir}/run/messagebus.pid --with-dbus-user=dbus --libdir=/%{_lib} --bindir=/bin --sysconfdir=/etc --exec-prefix=/ --libexecdir=/%{_lib}/dbus-1 --with-systemdsystemunitdir=/lib/systemd/system/ --docdir=%{_pkgdocdir} --enable-doxygen-docs --enable-xml-docs --disable-silent-rules Summary: D-BUS message bus Name: dbus Epoch: 1 Version: 1.6.18 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.freedesktop.org/software/dbus/ #VCS: git:git://git.freedesktop.org/git/dbus/dbus Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz @@ -96,10 +97,6 @@ in this separate package so server systems need not install X. %prep %setup -q -n %{name}-%{version} -# For some reason upstream ships these files as executable -# Make sure they are not -/bin/chmod 0644 COPYING ChangeLog NEWS - %patch0 -p1 -b .bindir %patch1 -p1 %patch2 -p1 @@ -144,6 +141,9 @@ rm -rf %{buildroot}%{_initrddir} mkdir -p %{buildroot}/var/lib/dbus +install -pm 644 -t %{buildroot}%{_pkgdocdir} \ + COPYING doc/introspect.dtd doc/introspect.xsl doc/system-activation.txt + %check if test -f autogen.sh; then env NOCONFIGURE=1 ./autogen.sh; else autoreconf -v -f -i; fi %configure %{dbus_common_config_opts} --enable-asserts --enable-verbose-mode --enable-tests @@ -167,7 +167,7 @@ rm -rf %{buildroot} # Add the "dbus" user and group /usr/sbin/groupadd -r -g %{dbus_user_uid} dbus 2>/dev/null || : /usr/sbin/useradd -c 'System message bus' -u %{dbus_user_uid} -g %{dbus_user_uid} \ - -s /sbin/nologin -r -d '/' dbus 2> /dev/null || : + -s /sbin/nologin -r -d '/' dbus 2> /dev/null || : %post libs -p /sbin/ldconfig @@ -187,7 +187,8 @@ fi %files %defattr(-,root,root) -%doc COPYING +%dir %{_pkgdocdir} +%{_pkgdocdir}/COPYING %dir %{_sysconfdir}/dbus-1 %config %{_sysconfdir}/dbus-1/*.conf @@ -233,8 +234,8 @@ fi %files doc %defattr(-,root,root) -%doc doc/introspect.dtd doc/introspect.xsl doc/system-activation.txt -%doc %{_datadir}/doc/dbus +%{_pkgdocdir}/* +%exclude %{_pkgdocdir}/COPYING %files devel %defattr(-,root,root) @@ -246,7 +247,11 @@ fi %{_includedir}/* %changelog -* Fri Dec 20 2013 Colin Walters +* Tue Jan 21 2014 Ville Skyttä - 1:1.6.18-3 +- Adapt to unversioned docdirs; don't ship all docs in main package. +- Fix bogus dates in %%changelog and tabs vs spaces warning. + +* Fri Dec 20 2013 Colin Walters - 1:1.6.18-2 - Test rebuild to see if we are affected by cast-align warnings now. * Mon Nov 11 2013 Colin Walters - 1:1.6.18-1 @@ -305,7 +310,7 @@ fi * Sun Apr 22 2012 Lennart Poettering - 1:1.4.20-2 - Make D-Bus work in containers -* Tue Apr 13 2012 Colin Walters +* Fri Apr 13 2012 Colin Walters - Update to 1.4.20; closes #806082 - Ensure /var/lib/dbus exists; this seems to have been dropped from upstream build rules. @@ -339,7 +344,7 @@ fi * Thu Jul 29 2010 Lennart Poettering - 1:1.3.2-0.1.885483%{?dist} - Conversion from systemd-install to systemctl -* Wed Jul 9 2010 Lennart Poettering - 1:1.3.2-0.0.885483 +* Fri Jul 9 2010 Lennart Poettering - 1:1.3.2-0.0.885483 - git Snapshot with systemd activation * Wed Jun 23 2010 Lennart Poettering - 1:1.3.1-1 @@ -638,7 +643,7 @@ only system will. - Update to 0.92 - remove old patches -* Thu Jul 22 2006 John (J5) Palmieri - 0.90-8 +* Sat Jul 22 2006 John (J5) Palmieri - 0.90-8 - add patch to fix timeout removal assertion * Thu Jul 20 2006 John (J5) Palmieri - 0.90-7 @@ -738,7 +743,7 @@ only system will. * Thu Dec 01 2005 John (J5) Palmieri - 0.60-1 - upgrade to 0.60 -* Mon Sep 08 2005 John (J5) Palmieri - 0.50-1 +* Thu Sep 08 2005 John (J5) Palmieri - 0.50-1 - upgrade to 0.50 * Mon Aug 29 2005 John (J5) Palmieri - 0.36.2-1 @@ -771,7 +776,7 @@ and those that go into %%{python_sitelib}/dbus (they differ on 64bit) - remove dbus-0.32-deadlock-fix.patch - remove dbus-0.33-types.patch -* Wed Jun 18 2005 John (J5) Palmieri - 0.33-4 +* Wed Jun 8 2005 John (J5) Palmieri - 0.33-4 - Add new libaudit patch from Steve Grub and enable in configure (Bug #159218) @@ -786,10 +791,10 @@ uint16's in the python bindings - update to upstream 0.33 - renable selinux audit patch -* Mon Apr 12 2005 John (J5) Palmieri - 0.32-6 +* Tue Apr 12 2005 John (J5) Palmieri - 0.32-6 - Added patch to fix deadlocks when using recursive g_mains -* Mon Apr 12 2005 John (J5) Palmieri - 0.32-5 +* Tue Apr 12 2005 John (J5) Palmieri - 0.32-5 - replace selinux_init patch with selinux_chroot_workaround patch to work around bad selinux interactions when using chroots on the beehive build machines @@ -899,7 +904,7 @@ uint16's in the python bindings * Thu Aug 05 2004 John (J5) Palmieri - Added BuildRequires for libselinux-devel and Requires for libselinux -* Tue Aug 02 2004 Colin Walters +* Mon Aug 02 2004 Colin Walters - Add SE-DBus patch * Fri Jul 30 2004 John (J5) Palmieri