- unconditional noarch subpackages

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

diff --git a/dbus-glib.spec b/dbus-glib.spec
index 3ee393c479744feb80c89f4abae4cb63f89ebac4..8b3ceb4b15824e80557728a2b1f5f9271fdb288f 100644 (file)
--- a/dbus-glib.spec
+++ b/dbus-glib.spec
@@ -2,33 +2,31 @@
 # Conditional build:
 %bcond_without apidocs         # disable gtk-doc
 %bcond_without static_libs     # don't build static library
-#
-%define                dbus_version    1.1
+
+%define                dbus_version    1.8
 %define                expat_version   1:1.95.5
-%define                glib_version    1:2.10.1
-#
+%define                glib2_version   1:2.40
 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.84
-Release:       1
+Version:       0.110
+Release:       3
 License:       AFL v2.1 or GPL v2
 Group:         Libraries
-Source0:       http://dbus.freedesktop.org/releases/dbus-glib/%{name}-%{version}.tar.gz
-# Source0-md5: 69fbe31fb3ee778715dff44cdd5178bf
+Source0:       https://dbus.freedesktop.org/releases/dbus-glib/%{name}-%{version}.tar.gz
+# Source0-md5: d7cebf1d69445cbd28b4983392145192
 Patch0:                %{name}-configure.patch
-Patch1:                %{name}-as-needed.patch
-URL:           http://www.freedesktop.org/Software/DBusBindings
+URL:           https://www.freedesktop.org/wiki/Software/DBusBindings
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake >= 1:1.9
 BuildRequires: dbus-devel >= %{dbus_version}
 %{?with_apidocs:BuildRequires: docbook-dtd412-xml}
 BuildRequires: expat-devel >= %{expat_version}
-BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= %{glib_version}
-%{?with_apidocs:BuildRequires: gtk-doc-automake >= 1.8}
-%{?with_apidocs:BuildRequires: gtk-doc}
-BuildRequires: libtool
+BuildRequires: gettext-tools
+BuildRequires: glib2-devel >= %{glib2_version}
+%{?with_apidocs:BuildRequires: gtk-doc >= 1.14}
+%{?with_apidocs:BuildRequires: gtk-doc-automake >= 1.14}
+BuildRequires: libtool >= 2:2
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.527
 Requires:      dbus-libs >= %{dbus_version}
@@ -73,6 +71,7 @@ Summary:      D-BUS-GLib API documentation
 Summary(pl.UTF-8):     Dokumentacja API D-BUS-GLib
 Group:         Documentation
 Requires:      gtk-doc-common
+BuildArch:     noarch
 
 %description apidocs
 D-BUS-GLib API documentation.
@@ -95,24 +94,19 @@ Ten pakiet dostarcza bashowe uzupełnianie poleceń dla dbus-send.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-
-%if %{without apidocs}
-echo 'EXTRA_DIST=' > gtk-doc.make
-echo 'AC_DEFUN([GTK_DOC_CHECK],[])' >> acinclude.m4
-%endif
 
 %build
-%{?with_apidocs:%{__gtkdocize}}
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
+#{__gtkdocize}
+#{__libtoolize}
+#{__aclocal}
+#{__autoconf}
+#{__autoheader}
+#{__automake}
 %configure \
-       %{__enable_disable apidocs gtk-doc} \
-       --with-html-dir=%{_gtkdocdir} \
-       %{__disable static_libs static}
+       %{__disable apidocs gtk-doc} \
+       %{__disable static_libs static} \
+       --disable-silent-rules \
+       --with-html-dir=%{_gtkdocdir}
 
 %{__make}
 
@@ -123,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
@@ -142,10 +138,10 @@ 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*/dbus/dbus-glib*.h
-%{_includedir}/dbus*/dbus/dbus-gtype-specialized.h
+%{_includedir}/dbus-1.0/dbus/dbus-glib*.h
+%{_includedir}/dbus-1.0/dbus/dbus-gtype-specialized.h
+%{_includedir}/dbus-1.0/dbus/dbus-gvalue-parse-variant.h
 %{_pkgconfigdir}/dbus-glib-1.pc
 
 %if %{with static_libs}
@@ -163,4 +159,4 @@ rm -rf $RPM_BUILD_ROOT
 %files -n bash-completion-dbus
 %defattr(644,root,root,755)
 /etc/bash_completion.d/dbus
-%attr(755,root,root) %{_libdir}/dbus-bash-completion-helper
+%attr(755,root,root) %{_libexecdir}/dbus-bash-completion-helper