SPECS: xpcd.spec - updated dirs patch, switched to modular xorg - ...

[qboosh]

Author: qboosh                       Date: Tue Oct 17 23:00:49 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated dirs patch, switched to modular xorg
- added c patch (needed by gcc 4)
- disable gimp by default (not ready for 1.3+)
- release 5

---- Files affected:
SPECS:
   xpcd.spec (1.38 -> 1.39) 

---- Diffs:

================================================================
Index: SPECS/xpcd.spec
diff -u SPECS/xpcd.spec:1.38 SPECS/xpcd.spec:1.39
--- SPECS/xpcd.spec:1.38	Wed Sep  7 00:05:07 2005
+++ SPECS/xpcd.spec	Wed Oct 18 01:00:43 2006
@@ -1,14 +1,14 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without	gimp	# without xpcd-gate plugin (not ready for gimp 1.3)
+%bcond_with	gimp	# with xpcd-gate plugin (not ready for gimp 2.0)
 %bcond_without	svga	# don't build svgalib viewer
 #
 Summary:	PhotoCD tool collection
 Summary(pl):	Narzędzia do obsługi formatu PhotoCD
 Name:		xpcd
 Version:	2.09
-Release:	4
+Release:	5
 License:	GPL
 Group:		X11/Applications/Graphics
 Source0:	http://dl.bytesex.org/releases/xpcd/%{name}-%{version}.tar.gz
@@ -17,6 +17,7 @@
 Source2:	%{name}.png
 Patch0:		%{name}-dirs.patch
 Patch1:		%{name}-gimp.patch
+Patch2:		%{name}-c.patch
 URL:		http://linux.bytesex.org/fbida/xpcd.html
 BuildRequires:	Xaw3d-devel >= 1.3E
 BuildRequires:	autoconf
@@ -26,12 +27,14 @@
 BuildRequires:	libtiff-devel
 BuildRequires:	libtool
 %{?with_svga:BuildRequires:	svgalib-devel}
+BuildRequires:	xorg-lib-libXext-devel
+Requires:	xorg-lib-libXt >= 1.0.0
+%{!?with_gimp:Obsoletes:	xpcd-gimp}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %if %{with gimp}
 %define		gimpplugindir	%(gimptool --gimpplugindir)/plug-ins
 %endif
-%define		_appdefsdir	/usr/X11R6/lib/X11/app-defaults
 
 %description
 This is a PhotoCD tool collection. The main application - xpcd - is a
@@ -75,6 +78,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__autoconf}
@@ -105,9 +109,9 @@
 %attr(755,root,root) %{_bindir}/pcdtoppm
 %attr(755,root,root) %{_bindir}/xpcd
 %{_datadir}/xpcd
-%{_appdefsdir}/Xpcd-2
-%lang(da) %{_appdefsdir}/da/Xpcd-2
-%lang(de) %{_appdefsdir}/de/Xpcd-2
+%{_datadir}/X11/app-defaults/Xpcd-2
+%lang(da) %{_datadir}/X11/da/app-defaults/Xpcd-2
+%lang(de) %{_datadir}/X11/de/app-defaults/Xpcd-2
 %{_desktopdir}/*.desktop
 %{_pixmapsdir}/*.png
 %{_pixmapsdir}/*.xpm
@@ -133,6 +137,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.39  2006/10/17 23:00:43  qboosh
+- updated dirs patch, switched to modular xorg
+- added c patch (needed by gcc 4)
+- disable gimp by default (not ready for 1.3+)
+- release 5
+
 Revision 1.38  2005/09/06 22:05:07  arekm
 - rel 4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xpcd.spec?r1=1.38&r2=1.39&f=u