- unconditional noarch subpackages

[packages/dbus-glib.git] / dbus-glib.spec

diff --git a/dbus-glib.spec b/dbus-glib.spec
index 42ea560d0f9c8f18e3cbe409445735f6b2e8d382..8b3ceb4b15824e80557728a2b1f5f9271fdb288f 100644 (file)
--- a/dbus-glib.spec
+++ b/dbus-glib.spec
@@ -10,7 +10,7 @@ Summary:      GLib-based library for using D-BUS
 Summary(pl.UTF-8):     Biblioteka do używania D-BUS oparta o GLib
 Name:          dbus-glib
 Version:       0.110
-Release:       2
+Release:       3
 License:       AFL v2.1 or GPL v2
 Group:         Libraries
 Source0:       https://dbus.freedesktop.org/releases/dbus-glib/%{name}-%{version}.tar.gz
@@ -71,9 +71,7 @@ Summary:      D-BUS-GLib API documentation
 Summary(pl.UTF-8):     Dokumentacja API D-BUS-GLib
 Group:         Documentation
 Requires:      gtk-doc-common
-%if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
-%endif
 
 %description apidocs
 D-BUS-GLib API documentation.
@@ -119,7 +117,9 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT \
        profiledir=/etc/bash_completion.d
 
-mv -f $RPM_BUILD_ROOT/etc/bash_completion.d/{dbus-bash-completion.sh,dbus}
+%{__mv} $RPM_BUILD_ROOT/etc/bash_completion.d/{dbus-bash-completion.sh,dbus}
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libdbus-glib-1.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -138,7 +138,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/dbus-binding-tool
 %attr(755,root,root) %{_libdir}/libdbus-glib-1.so
-%{_libdir}/libdbus-glib-1.la
 %{_mandir}/man1/dbus-binding-tool.1*
 %{_includedir}/dbus-1.0/dbus/dbus-glib*.h
 %{_includedir}/dbus-1.0/dbus/dbus-gtype-specialized.h