[packages/file-roller] - restored nautilus bcond

qboosh qboosh at pld-linux.org
Fri May 12 22:16:23 CEST 2017


commit b976055d6c82e686c2b0997688db174f0f0f7186
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri May 12 22:17:06 2017 +0200

    - restored nautilus bcond

 file-roller.spec | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/file-roller.spec b/file-roller.spec
index 3f7cab0..d580af6 100644
--- a/file-roller.spec
+++ b/file-roller.spec
@@ -1,3 +1,7 @@
+#
+# Conditional build:
+%bcond_without	nautilus	# Nautilus extension
+#
 Summary:	An archive manager for GNOME
 Summary(pl.UTF-8):	Zarządca archiwów dla GNOME
 Summary(pt_BR.UTF-8):	Gerenciador de arquivos compactados para o GNOME
@@ -23,7 +27,7 @@ BuildRequires:	libmagic-devel
 BuildRequires:	libnotify-devel >= 0.4.3
 BuildRequires:	libtool >= 2:2
 BuildRequires:	libxml2-progs
-BuildRequires:	nautilus-devel
+%{?with_nautilus:BuildRequires:	nautilus-devel >= 3.0.0}
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(find_lang) >= 1.23
 BuildRequires:	rpmbuild(macros) >= 1.601
@@ -120,6 +124,7 @@ plików GNOME).
 %{__autoheader}
 %{__automake}
 %configure \
+	%{!?with_nautilus:--disable-nautilus-actions} \
 	--disable-schemas-compile \
 	--disable-silent-rules \
 	--disable-static
@@ -132,8 +137,11 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{__mv} $RPM_BUILD_ROOT%{_localedir}/{sr at ije,sr at ijekavian}
+%if %{with nautilus}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0/*.la
+%endif
+
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{sr at ije,sr at ijekavian}
 
 %find_lang %{name} --with-gnome
 
@@ -167,6 +175,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_iconsdir}/hicolor/*x*/apps/file-roller.png
 %{_iconsdir}/hicolor/scalable/apps/file-roller-symbolic.svg
 
+%if %{with nautilus}
 %files -n nautilus-extension-file-roller
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/nautilus/extensions-3.0/libnautilus-fileroller.so
+%endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/file-roller.git/commitdiff/b976055d6c82e686c2b0997688db174f0f0f7186



More information about the pld-cvs-commit mailing list