- update macro usage

[packages/xfconf.git] / xfconf.spec

diff --git a/xfconf.spec b/xfconf.spec
index 1197d8b779fe81b07d31c261776dd3412a94c91d..ec43f8f5bfaf64b2c3dad1d770007c316a7e694f 100644 (file)
--- a/xfconf.spec
+++ b/xfconf.spec
@@ -1,34 +1,31 @@
 #
 %include       /usr/lib/rpm/macros.perl
 #
+%define                xfce_version    4.10.0
 Summary:       Simple configuration storage and query system
 Summary(pl.UTF-8):     Prosty system przechowywania i odpytywania konfiguracji
 Name:          xfconf
-Version:       4.6.2
+Version:       4.10.0
 Release:       3
 License:       GPL v2
 Group:         Libraries
-Source0:       http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5: 5ff93c15077c6dbbcd38c437bc1ab2ef
-URL:           http://www.xfce.org/projects/xfconf/
-BuildRequires: autoconf >= 2.50
-BuildRequires: automake >= 1:1.8
+Source0:       http://archive.xfce.org/xfce/4.10/src/%{name}-%{version}.tar.bz2
+# Source0-md5: 4ed48150a03fb5f42b455494307b7f28
+URL:           http://www.xfce.org/projects/xfconf
 BuildRequires: dbus-devel >= 1.0.0
 BuildRequires: dbus-glib-devel >= 0.72
 BuildRequires: docbook-dtd412-xml
 BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.12.0
+BuildRequires: glib2-devel >= 1:2.18.0
 BuildRequires: gtk-doc >= 1.0
-BuildRequires: intltool
-BuildRequires: libtool
-BuildRequires: libxfce4util-devel >= %{version}
+BuildRequires: libxfce4util-devel >= %{xfce_version}
 BuildRequires: perl-ExtUtils-Depends >= 0.3
 BuildRequires: perl-ExtUtils-PkgConfig >= 1.0
-BuildRequires: perl-Glib >= 1.020
+BuildRequires: perl-Glib-devel >= 1.224-2
 BuildRequires: pkgconfig
 BuildRequires: rpm-perlprov
 BuildRequires: rpmbuild(macros) >= 1.98
-BuildRequires: xfce4-dev-tools >= 4.6.0
+BuildRequires: xfce4-dev-tools >= 4.10.0
 Obsoletes:     libxfce4mcs
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -46,7 +43,7 @@ Group:                Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      dbus-devel >= 1.0.0
 Requires:      dbus-glib-devel >= 0.72
-Requires:      glib2-devel >= 1:2.12.0
+Requires:      glib2-devel >= 1:2.18.0
 Obsoletes:     libxfce4mcs-devel
 Obsoletes:     xfce-mcs-manager-devel
 
@@ -56,19 +53,6 @@ Header files for Xfconf library.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki Xfconf.
 
-%package static
-Summary:       Static Xfconf library
-Summary(pl.UTF-8):     Statyczna biblioteka Xfconf
-Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}-%{release}
-Obsoletes:     libxfce4mcs-static
-
-%description static
-Static Xfconf library.
-
-%description static -l pl.UTF-8
-Statyczna biblioteka Xfconf.
-
 %package apidocs
 Summary:       Xfconf API documentation
 Summary(pl.UTF-8):     Dokumentacja API Xfconf
@@ -98,15 +82,11 @@ Interfejs perlowy do Xfce4 Xfconf.
 %setup -q
 
 %build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
 %configure \
        --enable-gtk-doc \
        --with-html-dir=%{_gtkdocdir} \
-       --with-perl-options="INSTALLDIRS=vendor"
+       --with-perl-options="INSTALLDIRS=vendor" \
+       --disable-silent-rules
 %{__make}
 
 %install
@@ -120,6 +100,7 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml
 %{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Xfce4/Xfconf/.packlist
 
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %find_lang %{name}
 
@@ -135,7 +116,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/xfconf-query
 %attr(755,root,root) %{_libdir}/libxfconf-0.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libxfconf-0.so.2
-%attr(755,root,root) %{_libdir}/xfconfd
+%dir %{_libdir}/xfce4/xfconf
+%attr(755,root,root) %{_libdir}/xfce4/xfconf/xfconfd
 %dir %{_sysconfdir}/xdg/xfce4/xfconf
 %dir %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml
 %{_datadir}/dbus-1/services/org.xfce.Xfconf.service
@@ -143,14 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libxfconf-0.so
-%{_libdir}/libxfconf-0.la
 %{_includedir}/xfce4/xfconf-0
 %{_pkgconfigdir}/libxfconf-0.pc
 
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libxfconf-0.a
-
 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/xfconf