SPECS: ghostscript-gpl.spec - added bcond for gtk, removed for cups

djurban djurban at pld-linux.org
Tue Sep 6 18:19:02 CEST 2005


Author: djurban                      Date: Tue Sep  6 16:19:02 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added bcond for gtk, removed for cups

---- Files affected:
SPECS:
   ghostscript-gpl.spec (1.153 -> 1.154) 

---- Diffs:

================================================================
Index: SPECS/ghostscript-gpl.spec
diff -u SPECS/ghostscript-gpl.spec:1.153 SPECS/ghostscript-gpl.spec:1.154
--- SPECS/ghostscript-gpl.spec:1.153	Tue Sep  6 18:15:58 2005
+++ SPECS/ghostscript-gpl.spec	Tue Sep  6 18:18:56 2005
@@ -3,7 +3,7 @@
 #	- update patch4
 #	- check svga??
 # Conditional build:
-%bcond_without	cups		# without CUPS support
+%bcond_without	gtk		# without gtk version of the gs command (as gsx)
 %bcond_with	svga		# with svgalib display support (vgalib and lvga256 devices)
 %bcond_without	omni		# without omni support
 
@@ -37,11 +37,10 @@
 BuildRequires:	XFree86-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
-%{?with_cups:BuildRequires:	cups-devel}
 BuildRequires:	docbook-style-dsssl
 BuildRequires:	glib2-devel
 # for gsx
-#BuildRequires:	gtk+-devel
+%{?with_gtk:BuildRequires:	gtk+-devel}
 BuildRequires:	libpng-devel >= 1.0.8
 BuildRequires:	libstdc++-devel
 BuildRequires:	pkgconfig
@@ -167,7 +166,6 @@
 	--with-fontpath="%{_datadir}/fonts:%{_datadir}/fonts/Type1" \
 	--with-ijs \
 	--without-gimp-print \
-	%{!?with_cups:--disable-cups} \
 	--with%{!?with_omni:out}-omni \
 	--with-x
 
@@ -278,9 +276,11 @@
 %lang(fr) %{_mandir}/fr/man*/*
 %lang(pl) %{_mandir}/pl/man*/*
 
+%if %{with gtk}
 %files gtk
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/gsx
+%endif
 
 %files devel
 %defattr(644,root,root,755)
@@ -304,6 +304,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.154  2005/09/06 16:18:56  djurban
+- added bcond for gtk, removed for cups
+
 Revision 1.153  2005/09/06 16:15:58  djurban
 - official ghostscript GPL 8.15, rel 1 as it works, but svga is untested and patch4 is not updated
 - removed cups filter as it is only in the ESP fork which is now in ghostscript-esp.spec
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ghostscript-gpl.spec?r1=1.153&r2=1.154&f=u




More information about the pld-cvs-commit mailing list