[packages/gnome-vfs2] - cleanup, added static_libs bcond - modules are used when config files are present, so moved module
qboosh
qboosh at pld-linux.org
Sat Jan 11 14:11:50 CET 2014
commit a737f3eaa2670477ee97e2645a8b71d500ec0d2a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Jan 11 14:12:40 2014 +0100
- cleanup, added static_libs bcond
- modules are used when config files are present, so moved modules to base where configs are
gnome-vfs2.spec | 56 +++++++++++++++++++++++++++++++++-----------------------
1 file changed, 33 insertions(+), 23 deletions(-)
---
diff --git a/gnome-vfs2.spec b/gnome-vfs2.spec
index f279d87..f571237 100644
--- a/gnome-vfs2.spec
+++ b/gnome-vfs2.spec
@@ -1,6 +1,7 @@
#
# Conditional build:
%bcond_with hal # build with HAL support (HAL is deprecated)
+%bcond_without static_libs # static library
#
Summary: GNOME - virtual file system
Summary(pl.UTF-8): GNOME - wirtualny system plików
@@ -21,10 +22,10 @@ Patch5: %{name}-glib.patch
Patch6: am.patch
URL: http://www.gnome.org/
BuildRequires: GConf2-devel >= 2.22.0
-BuildRequires: ORBit2-devel >= 1:2.14.9
BuildRequires: acl-devel >= 2.2.34
+BuildRequires: attr-devel
BuildRequires: autoconf
-BuildRequires: automake
+BuildRequires: automake >= 1:1.8
BuildRequires: avahi-glib-devel >= 0.6.17
BuildRequires: bzip2-devel
BuildRequires: dbus-glib-devel >= 0.73
@@ -43,7 +44,7 @@ BuildRequires: libsmbclient-devel >= 3.0
BuildRequires: libtool >= 2:1.5.14
BuildRequires: libxml2-devel >= 1:2.6.30
BuildRequires: openssl-devel >= 0.9.8b
-BuildRequires: perl-base
+BuildRequires: perl-base >= 5.002
BuildRequires: pkgconfig
BuildRequires: rpm-build >= 4.1-10
BuildRequires: rpmbuild(macros) >= 1.197
@@ -51,7 +52,6 @@ BuildRequires: sed >= 4.0
BuildRequires: zlib-devel
Requires(post,preun): GConf2
Requires: %{name}-libs = %{version}-%{release}
-Requires: ORBit2 >= 1:2.14.9
Requires: shared-mime-info >= 0.18
Obsoletes: gnome-vfs-extras
Obsoletes: gnome-vfs2-vfolder-menu
@@ -71,7 +71,12 @@ Wirtualny Systemu Plików GNOME.
Summary: gnome-vfs library
Summary(pl.UTF-8): Biblioteka gnome-vfs
Group: Libraries
+Requires: GConf2-libs >= 2.22.0
+Requires: avahi-glib >= 0.6.17
+Requires: dbus-glib >= 0.73
+Requires: glib2 >= 1:2.10.0
%{?with_hal:Requires: hal-libs >= 0.5.9}
+Requires: openssl >= 0.9.8b
%description libs
This package contains gnome-vfs libraries.
@@ -87,7 +92,6 @@ Requires: %{name}-libs = %{version}-%{release}
Requires: GConf2-devel >= 2.22.0
Requires: avahi-glib-devel >= 0.6.17
Requires: dbus-glib-devel >= 0.73
-Requires: gtk-doc-common
Requires: libselinux-devel
Requires: openssl-devel >= 0.9.8b
@@ -132,8 +136,6 @@ Dokumentacja API gnome-vfs.
%patch6 -p1
%build
-# force rebuild
-touch libgnomevfs/GNOME_VFS_Daemon.idl
%{__gtkdocize}
%{__glib_gettextize}
%{__intltoolize}
@@ -145,6 +147,7 @@ touch libgnomevfs/GNOME_VFS_Daemon.idl
%{__enable_disable hal hal} \
--disable-howl \
--disable-schemas-install \
+ %{!?with_static_libs:--disable-static} \
--enable-gtk-doc \
--enable-ipv6 \
--with-html-dir=%{_gtkdocdir}
@@ -156,13 +159,14 @@ rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_desktopdir}
%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT \
- m4dir=%{_aclocaldir} \
- GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+ DESTDIR=$RPM_BUILD_ROOT
-# no static modules
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/*.{la,a}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+# no static modules or *.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la \
+ $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/*.la
+%if %{with static_libs}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/*.a
+%endif
install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/defaults.list
@@ -193,7 +197,11 @@ rm -rf $RPM_BUILD_ROOT
%files -f gnome-vfs-2.0.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README
-%{_sysconfdir}/gnome-vfs-2.0
+%dir %{_sysconfdir}/gnome-vfs-2.0
+%dir %{_sysconfdir}/gnome-vfs-2.0/modules
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gnome-vfs-2.0/modules/default-modules.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gnome-vfs-2.0/modules/ssl-modules.conf
%{_sysconfdir}/gconf/schemas/desktop_default_applications.schemas
%{_sysconfdir}/gconf/schemas/desktop_gnome_url_handlers.schemas
%{_sysconfdir}/gconf/schemas/system_dns_sd.schemas
@@ -208,16 +216,8 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/gnomevfs-monitor
%attr(755,root,root) %{_bindir}/gnomevfs-mv
%attr(755,root,root) %{_bindir}/gnomevfs-rm
-%{_datadir}/dbus-1/services/gnome-vfs-daemon.service
-%{_desktopdir}/defaults.list
-
-%files libs
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgnomevfs-2.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgnomevfs-2.so.0
-%dir %{_libdir}/gnome-vfs-2.0
+%attr(755,root,root) %{_libexecdir}/gnome-vfs-daemon
%dir %{_libdir}/gnome-vfs-2.0/modules
-%attr(755,root,root) %{_libdir}/gnome-vfs-daemon
%attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/libbzip2.so
%attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/libcomputer.so
%attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/libdns-sd.so
@@ -231,6 +231,14 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/libsmb.so
%attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/libtar.so
%attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/libvfs-test.so
+%{_datadir}/dbus-1/services/gnome-vfs-daemon.service
+%{_desktopdir}/defaults.list
+
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgnomevfs-2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgnomevfs-2.so.0
+%dir %{_libdir}/gnome-vfs-2.0
%files devel
%defattr(644,root,root,755)
@@ -241,9 +249,11 @@ rm -rf $RPM_BUILD_ROOT
%{_pkgconfigdir}/gnome-vfs-2.0.pc
%{_pkgconfigdir}/gnome-vfs-module-2.0.pc
+%if %{with static_libs}
%files static
%defattr(644,root,root,755)
%{_libdir}/libgnomevfs-2.a
+%endif
%files apidocs
%defattr(644,root,root,755)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gnome-vfs2.git/commitdiff/a737f3eaa2670477ee97e2645a8b71d500ec0d2a
More information about the pld-cvs-commit
mailing list