packages: poppler/poppler.spec - add bcond for glib wrapper - if statements...

lisu lisu at pld-linux.org
Wed Jun 16 16:39:53 CEST 2010


Author: lisu                         Date: Wed Jun 16 14:39:53 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add bcond for glib wrapper
- if statements for cpp bcond in %%files

---- Files affected:
packages/poppler:
   poppler.spec (1.105 -> 1.106) 

---- Diffs:

================================================================
Index: packages/poppler/poppler.spec
diff -u packages/poppler/poppler.spec:1.105 packages/poppler/poppler.spec:1.106
--- packages/poppler/poppler.spec:1.105	Wed Jun 16 16:27:52 2010
+++ packages/poppler/poppler.spec	Wed Jun 16 16:39:48 2010
@@ -8,6 +8,7 @@
 %bcond_without	qt	# disable qt wrapper
 %bcond_without	qt4	# disable qt4 wrapper
 %bcond_without	cpp	# disable cpp wrapper
+%bcond_without	glib	# disable glib wrapper
 #
 %define		cairo_ver	1.4.0
 #
@@ -288,6 +289,7 @@
 	%{!?with_qt:--disable-poppler-qt} \
 	%{!?with_qt4:--disable-poppler-qt4} \
 	%{!?with_cpp:--disable-poppler-cpp} \
+	%{!?with_glib:--disable-poppler-glib} \
 	--enable-a4-paper \
 	%{?with_apidocs:--enable-gtk-doc} \
 	--enable-xpdf-headers \
@@ -354,6 +356,7 @@
 %{_gtkdocdir}/poppler
 %endif
 
+%if %{with cpp}
 %files cpp
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpoppler-cpp.so.*.*.*
@@ -369,7 +372,9 @@
 %files cpp-static
 %defattr(644,root,root,755)
 %{_libdir}/libpoppler-cpp.a
+%endif
 
+%if %{with glib}
 %files glib
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpoppler-glib.so.*.*.*
@@ -385,6 +390,7 @@
 %files glib-static
 %defattr(644,root,root,755)
 %{_libdir}/libpoppler-glib.a
+%endif
 
 %if %{with qt}
 %files qt
@@ -433,6 +439,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.106  2010/06/16 14:39:48  lisu
+- add bcond for glib wrapper
+- if statements for cpp bcond in %%files
+
 Revision 1.105  2010/06/16 14:27:52  lisu
 - add bcond and subpackages for cpp wrapper
 - rel 2
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/poppler/poppler.spec?r1=1.105&r2=1.106&f=u



More information about the pld-cvs-commit mailing list