SPECS: pornview.spec - added asneeded patch - added gtk2 bcond, di...

[qboosh]

Author: qboosh                       Date: Tue Oct 17 18:06:53 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added asneeded patch
- added gtk2 bcond, disabled by default (it crashes)
- release .4

---- Files affected:
SPECS:
   pornview.spec (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: SPECS/pornview.spec
diff -u SPECS/pornview.spec:1.18 SPECS/pornview.spec:1.19
--- SPECS/pornview.spec:1.18	Sun Oct 24 22:26:30 2004
+++ SPECS/pornview.spec	Tue Oct 17 20:06:48 2006
@@ -1,24 +1,37 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_with	gtk2	# use GTK+2 instead of 1.2 (broken)
+%bcond_without	xine	# XINE support for movies
+#
 Summary:	JPEG file viewer
 Summary(pl):	Przeglądarka plików JPEG
 Name:		pornview
 Version:	0.2.0
-Release:	0.pre1.3
+Release:	0.pre1.4
 License:	GPL
 Group:		X11/Applications/Graphics
-Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}pre1.tar.gz
+Source0:	http://dl.sourceforge.net/pornview/%{name}-%{version}pre1.tar.gz
 # Source0-md5:	339fde6d7ff0cc1053abe951601373e6
-URL:		http://pornview.sourceforge.net/
 Patch0:		%{name}-no_libcharset.patch
 Patch1:		%{name}-desktop.patch
+Patch2:		%{name}-asneeded.patch
+URL:		http://pornview.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	gdk-pixbuf-devel
 BuildRequires:	gettext-devel
-BuildRequires:	gtk+-devel
+BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
 BuildRequires:	libtool
-BuildRequires:	xine-lib-devel
+BuildRequires:	pkgconfig
+%{?with_xine:BuildRequires:	xine-lib-devel >= 1.0.0}
+BuildRequires:	xorg-lib-libXinerama-devel
+%if %{with gtk2}
+BuildRequires:	gtk+2-devel >= 1:2.0.0
+%else
+BuildRequires:	gdk-pixbuf-devel >= 0.16.0
+BuildRequires:	gtk+-devel >= 1.2.10
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -39,9 +52,16 @@
 %setup -q -n %{name}-%{version}pre1
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+
+%if %{with gtk2}
+cat >> acinclude.m4 <<'EOF'
+AC_DEFUN([AM_PATH_GTK],[$3])
+AC_DEFUN([AM_PATH_GDK_PIXBUF],[$3])
+EOF
+%endif
 
 %build
-rm -f missing
 %{__libtoolize}
 %{__gettextize}
 %{__aclocal} -I m4
@@ -49,17 +69,18 @@
 %{__autoheader}
 %{__automake}
 %configure \
-	--enable-xine
+	%{?with_xine:--enable-xine} \
+	%{?with_gtk2:--with-gtk2}
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 install -d $RPM_BUILD_ROOT%{_desktopdir}
 
-%{__make} DESTDIR=$RPM_BUILD_ROOT install
-mv $RPM_BUILD_ROOT%{_datadir}/gnome/apps/Graphics/* $RPM_BUILD_ROOT%{_desktopdir}
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT \
+	desktopdir=%{_desktopdir}
 
 %find_lang %{name}
 
@@ -69,10 +90,10 @@
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS README ChangeLog
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/pornview
 %{_datadir}/%{name}
-%{_desktopdir}/*.desktop
-%{_pixmapsdir}/*.png
+%{_desktopdir}/pornview.desktop
+%{_pixmapsdir}/pornview.png
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -80,6 +101,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2006/10/17 18:06:48  qboosh
+- added asneeded patch
+- added gtk2 bcond, disabled by default (it crashes)
+- release .4
+
 Revision 1.18  2004/10/24 20:26:30  paladine
 - spelling fixes, uppercases, etc.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/pornview.spec?r1=1.18&r2=1.19&f=u