[svn] r4837 - in trunk/rpms: . dnsmasq ffmpeg gip gle graphviz libevent mplayer rtorrent sdparm spamass-milter tightvnc x264

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Wed Oct 18 10:24:16 CEST 2006 

Author: dag
Date: 2006-10-18 10:24:13 +0200 (Wed, 18 Oct 2006)
New Revision: 4837

Added:
   trunk/rpms/sdparm/
   trunk/rpms/sdparm/sdparm.spec
Modified:
   trunk/rpms/dnsmasq/dnsmasq.spec
   trunk/rpms/ffmpeg/ffmpeg.spec
   trunk/rpms/gip/gip.spec
   trunk/rpms/gle/gle.spec
   trunk/rpms/graphviz/graphviz.spec
   trunk/rpms/libevent/libevent.spec
   trunk/rpms/mplayer/mplayer.spec
   trunk/rpms/rtorrent/rtorrent.spec
   trunk/rpms/spamass-milter/spamass-milter.spec
   trunk/rpms/tightvnc/tightvnc.spec
   trunk/rpms/x264/x264.spec
Log:
Updates

Modified: trunk/rpms/dnsmasq/dnsmasq.spec
===================================================================
--- trunk/rpms/dnsmasq/dnsmasq.spec	2006-10-17 16:05:43 UTC (rev 4836)
+++ trunk/rpms/dnsmasq/dnsmasq.spec	2006-10-18 08:24:13 UTC (rev 4837)
@@ -4,7 +4,7 @@
 
 Summary: Lightweight caching nameserver with integrated DHCP server
 Name: dnsmasq
-Version: 2.33
+Version: 2.34
 Release: 1
 License: GPL
 Group: System Environment/Daemons
@@ -156,6 +156,9 @@
 %{_localstatedir}/lib/misc/
 
 %changelog
+* Mon Oct 16 2006 Dag Wieers <dag at wieers.com> - 2.34-1
+- Updated to release 2.34.
+
 * Sun Aug 06 2006 Dag Wieers <dag at wieers.com> - 2.33-1
 - Updated to release 2.33.
 

Modified: trunk/rpms/ffmpeg/ffmpeg.spec
===================================================================
--- trunk/rpms/ffmpeg/ffmpeg.spec	2006-10-17 16:05:43 UTC (rev 4836)
+++ trunk/rpms/ffmpeg/ffmpeg.spec	2006-10-18 08:24:13 UTC (rev 4837)
@@ -3,17 +3,29 @@
 
 %{?dist: %{expand: %%define %dist 1}}
 
+%{?el4:%define _without_texi2html 1}
+%{?fc3:%define _without_texi2html 1}
+%{?fc2:%define _without_texi2html 1}
+
+%{?fc1:%define _without_texi2html 1}
 %{?fc1:%define _without_theora 1}
+%{?fc1:%define _without_x264 1}
+
+%{?el3:%define _without_texi2html 1}
 %{?el3:%define _without_theora 1}
+%{?el3:%define _without_x264 1}
 
+%{?rh9:%define _without_texi2html 1}
 %{?rh9:%define _without_theora 1}
 %{?rh9:%define _without_x264 1}
 
 %{?rh7:%define _without_faac 1}
+%{?rh7:%define _without_texi2html 1}
 %{?rh7:%define _without_theora 1}
 %{?rh7:%define _without_x264 1}
 
 %{?el2:%define _without_faac 1}
+%{?el2:%define _without_texi2html 1}
 %{?el2:%define _without_theora 1}
 %{?el2:%define _without_vorbis 1}
 %{?el2:%define _without_x264 1}
@@ -37,7 +49,7 @@
 Patch0: ffmpeg-20060918-gsm.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: imlib2-devel, SDL-devel, freetype-devel, zlib-devel
-BuildRequires: texi2html
+%{!?_without_texi2html:BuildRequires: texi2html}
 %{!?_without_lame:BuildRequires: lame-devel}
 %{!?_without_vorbis:BuildRequires: libogg-devel, libvorbis-devel}
 #{!?_without_theora:BuildRequires: libogg-devel, libtheora-devel}

Modified: trunk/rpms/gip/gip.spec
===================================================================
--- trunk/rpms/gip/gip.spec	2006-10-17 16:05:43 UTC (rev 4836)
+++ trunk/rpms/gip/gip.spec	2006-10-18 08:24:13 UTC (rev 4837)
@@ -9,7 +9,7 @@
 Summary: GUI for making IP address based calculations
 Name: gip
 Version: 1.6.1.1
-Release: 1.2
+Release: 1
 License: GPL
 Group: Applications/Internet
 URL: http://www.debain.org/software/gip/
@@ -74,9 +74,6 @@
 %{_datadir}/gip/
 
 %changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 1.6.1.1-1.2
-- Rebuild for Fedora Core 5.
-
 * Fri Jan 06 2006 Dries Verachtert <dries at ulyssis.org> - 1.6.0.1-1
 - Updated to release 1.6.0-1
 

Modified: trunk/rpms/gle/gle.spec
===================================================================
--- trunk/rpms/gle/gle.spec	2006-10-17 16:05:43 UTC (rev 4836)
+++ trunk/rpms/gle/gle.spec	2006-10-18 08:24:13 UTC (rev 4837)
@@ -4,13 +4,15 @@
 
 %{?dist: %{expand: %%define %dist 1}}
 
+%{?fc4:%define _without_modxorg 1}
 %{?el4:%define _without_modxorg 1}
-%{?el3:%define _without_modxorg 1}
-%{?el2:%define _without_modxorg 1}
-%{?fc4:%define _without_modxorg 1}
 %{?fc3:%define _without_modxorg 1}
 %{?fc2:%define _without_modxorg 1}
 %{?fc1:%define _without_modxorg 1}
+%{?el3:%define _without_modxorg 1}
+%{?rh9:%define _without_modxorg 1}
+%{?rh7:%define _without_modxorg 1}
+%{?el2:%define _without_modxorg 1}
 
 Summary: Graphics Layout Engine
 Name: gle
@@ -24,6 +26,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: gcc-c++, libpng-devel, libtiff-devel, ncurses-devel, zlib-devel
+BuildRequires: libstdc++-devel >= 3.0
 %{?_without_modxorg:BuildRequires: XFree86-devel}
 %{!?_without_modxorg:BuildRequires: xorg-x11-proto-devel}
 

Modified: trunk/rpms/graphviz/graphviz.spec
===================================================================
--- trunk/rpms/graphviz/graphviz.spec	2006-10-17 16:05:43 UTC (rev 4836)
+++ trunk/rpms/graphviz/graphviz.spec	2006-10-18 08:24:13 UTC (rev 4837)
@@ -3,31 +3,39 @@
 
 %{?dist: %{expand: %%define %dist 1}}
 
+%{?fc6:%define _without_java 1}
+%{?fc5:%define _without_java 1}
+
+%{?fc4:%define _without_java 1}
+%{?fc4:%define _without_modxorg 1}
+
+%{?el4:%define _without_java 1}
 %{?el4:%define _without_modxorg 1}
-%{?el3:%define _without_modxorg 1}
-%{?el2:%define _without_modxorg 1}
-%{?fc4:%define _without_modxorg 1}
+
+%{?fc3:%define _without_java 1}
 %{?fc3:%define _without_modxorg 1}
+
+%{?fc2:%define _without_java 1}
 %{?fc2:%define _without_modxorg 1}
+
+%{?fc1:%define _without_java 1}
 %{?fc1:%define _without_modxorg 1}
 
+%{?el3:%define _without_java 1}
+%{?el3:%define _without_modxorg 1}
+
+%{?rh9:%define _without_java 1}
 %{?rh9:%define _without_tcltk_devel 1}
+
+%{?rh8:%define _without_java 1}
 %{?rh8:%define _without_tcltk_devel 1}
+
+%{?rh7:%define _without_java 1}
 %{?rh7:%define _without_tcltk_devel 1}
-%{?el2:%define _without_tcltk_devel 1}
 
-%{?el4:%define _without_java 1)
-%{?el3:%define _without_java 1)
-%{?fc6:%define _without_java 1)
-%{?fc5:%define _without_java 1)
-%{?fc4:%define _without_java 1)
-%{?fc3:%define _without_java 1)
-%{?fc2:%define _without_java 1)
-%{?fc1:%define _without_java 1}
-%{?rh9:%define _without_java 1}
-%{?rh8:%define _without_java 1}
-%{?rh7:%define _without_java 1}
 %{?el2:%define _without_java 1}
+%{?el2:%define _without_modxorg 1}
+%{?el2:%define _without_tcltk_devel 1}
 
 Summary: Graph Visualization Tools
 Name: graphviz
@@ -110,7 +118,6 @@
 The %{name}-guile package contains the various guile packages (extensions)
 for version %{version} of the %{name} tools.
 
-%if %{!?_without_java:1}0
 %package java
 Group: Applications/Multimedia
 Summary: Java extension tools for version %{version} of %{name}
@@ -119,7 +126,6 @@
 %description java
 The %{name}-java package contains the various java packages (extensions)
 for version %{version} of the %{name} tools.
-%endif
 
 %package lua
 Group: Applications/Multimedia

Modified: trunk/rpms/libevent/libevent.spec
===================================================================
--- trunk/rpms/libevent/libevent.spec	2006-10-17 16:05:43 UTC (rev 4836)
+++ trunk/rpms/libevent/libevent.spec	2006-10-18 08:24:13 UTC (rev 4837)
@@ -4,7 +4,7 @@
 
 Summary: Abstract asynchronous event notification library
 Name: libevent
-Version: 1.1b
+Version: 1.2
 Release: 1
 License: BSD
 Group: System Environment/Libraries
@@ -51,18 +51,25 @@
 %files
 %defattr(-, root, root, 0755)
 %doc README
+%{_bindir}/event_rpcgen.py
 %{_libdir}/libevent-%{version}.so.*
 
 %files devel
 %defattr(-, root, root, 0755)
 %doc sample/
+%doc %{_mandir}/man3/evdns.3*
+%doc %{_mandir}/man3/event.3*
+%{_includedir}/evdns.h
 %{_includedir}/event.h
+%{_includedir}/evhttp.h
 %{_libdir}/libevent.a
 %{_libdir}/libevent.so
 %exclude %{_libdir}/libevent.la
-%{_mandir}/man3/event.3*
 
 %changelog
+* Mon Oct 16 2006 Dag Wieers <dag at wieers.com> - 1.2-1
+- Updated to release 1.2.
+
 * Sat Aug 12 2006 Dag Wieers <dag at wieers.com> - 1.1b-1
 - Updated to release 1.1b.
 

Modified: trunk/rpms/mplayer/mplayer.spec
===================================================================
--- trunk/rpms/mplayer/mplayer.spec	2006-10-17 16:05:43 UTC (rev 4836)
+++ trunk/rpms/mplayer/mplayer.spec	2006-10-18 08:24:13 UTC (rev 4837)
@@ -8,28 +8,37 @@
 %{?fc6:  %define _with_modxorg 1}
 %{?fc5:  %define _with_modxorg 1}
 
+%{?el4:%define _without_nas 1}
+%{?fc3:%define _without_nas 1}
+%{?fc2:%define _without_nas 1}
+
 %{?fc1:%define _without_alsa 1}
+%{?fc1:%define _without_nas 1}
 %{?fc1:%define _without_theora 1}
 %{?fc1:%define _without_xvmc 1}
 
 %{?el3:%define _without_alsa 1}
 %{?el3:%define _without_fribidi 1}
+%{?el3:%define _without_nas 1}
 %{?el3:%define _without_theora 1}
 %{?el3:%define _without_xvmc 1}
 
 %{?rh9:%define _without_alsa 1}
 %{?rh9:%define _without_fribidi 1}
+%{?rh9:%define _without_nas 1}
 %{?rh9:%define _without_theora 1}
 %{?rh9:%define _without_xvmc 1}
 
 %{?rh8:%define _without_alsa 1}
 %{?rh8:%define _without_fribidi 1}
+%{?rh8:%define _without_nas 1}
 %{?rh8:%define _without_theora 1}
 %{?rh8:%define _without_xvmc 1}
 
 %{?rh7:%define _without_alsa 1}
 %{?rh7:%define _without_fribidi 1}
 %{?rh7:%define _without_freedesktop 1}
+%{?rh7:%define _without_nas 1}
 %{?rh7:%define _without_theora 1}
 %{?rh7:%define _without_gcccheck 1}
 %{?rh7:%define _without_xvmc 1}
@@ -40,11 +49,13 @@
 %{?el2:%define _without_dv 1}
 %{?el2:%define _without_fribidi 1}
 %{?el2:%define _without_freedesktop 1}
+%{?el2:%define _without_nas 1}
 %{?el2:%define _without_theora 1}
 %{?el2:%define _without_xvmc 1}
 
 %{?yd3:%define _without_alsa 1}
 %{?yd3:%define _without_fribidi 1}
+%{?yd3:%define _without_nas 1}
 %{?yd3:%define _without_theora 1}
 
 # Is this a daily build? If so, put the date like "20020808" otherwise put 0

Modified: trunk/rpms/rtorrent/rtorrent.spec
===================================================================
--- trunk/rpms/rtorrent/rtorrent.spec	2006-10-17 16:05:43 UTC (rev 4836)
+++ trunk/rpms/rtorrent/rtorrent.spec	2006-10-18 08:24:13 UTC (rev 4837)
@@ -12,7 +12,8 @@
 Source: http://libtorrent.rakshasa.no/downloads/rtorrent-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires: libtorrent-devel, gcc-c++, curl-devel, libsigc++20-devel, ncurses-devel
+BuildRequires: gcc-c++, libsigc++20-devel, ncurses-devel
+BuildRequires: libtorrent-devel, curl-devel >= 7.12
 
 %description
 rTorrent is a console-based BitTorrent client. It aims to be a 
@@ -29,7 +30,7 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR="%{buildroot}"
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -37,11 +38,11 @@
 %files
 %defattr(-, root, root, 0755)
 %doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO
-%doc %{_mandir}/man1/rtorrent*
+%doc %{_mandir}/man1/rtorrent.1*
 %{_bindir}/rtorrent
 
 %changelog
-* Mon Apr 10 2006 Dries Verachtert <dries at ulyssis.org> - 0.5.0-1
+* Mon Apr 10 2006 Dries Verachtert <dries at ulyssis.org> - 0.5.3-1
 - Updated to release 0.5.3.
 
 * Mon Apr 10 2006 Dries Verachtert <dries at ulyssis.org> - 0.5.0-1

Added: trunk/rpms/sdparm/sdparm.spec
===================================================================
--- trunk/rpms/sdparm/sdparm.spec	                        (rev 0)
+++ trunk/rpms/sdparm/sdparm.spec	2006-10-18 08:24:13 UTC (rev 4837)
@@ -0,0 +1,50 @@
+# $Id$
+# Authority: dag
+
+Summary: List or change SCSI disk parameters
+Name: sdparm
+Version: 1.00
+Release: 1
+License: FreeBSD
+Group: System Environment/Base
+URL: http://www.torque.net/sg/sdparm.html
+
+Source: http://www.torque.net/sg/p/%{name}-%{version}.tgz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+%description
+SCSI disk parameters are held in mode pages. This utility lists or
+changes those parameters. Other SCSI devices (or devices that use
+the SCSI command set) such as CD/DVD and tape drives may also find
+parts of sdparm useful. Requires the linux kernel 2.4 series or later.
+In the 2.6 series any device node the understands a SCSI command set
+may be used (e.g. /dev/sda). In the 2.4 series SCSI device node may be used.
+
+Fetches Vital Product Data pages. Can send commands to start or stop
+the media and load or unload removable media.
+
+Warning: It is possible (but unlikely) to change SCSI disk settings
+such that the disk stops operating or is slowed down. Use with care.
+
+%prep
+%setup
+
+%build
+%configure
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR="%{buildroot}"
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+%doc AUTHORS ChangeLog COPYING CREDITS INSTALL README notes.txt
+%doc %{_mandir}/man8/sdparm.8*
+%{_bindir}/sdparm
+
+%changelog
+* Tue Oct 17 2006 Dag Wieers <dag at wieers.com> - 1.00-1
+- Initial package. (based on upstream package)


Property changes on: trunk/rpms/sdparm/sdparm.spec
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + native

Modified: trunk/rpms/spamass-milter/spamass-milter.spec
===================================================================
--- trunk/rpms/spamass-milter/spamass-milter.spec	2006-10-17 16:05:43 UTC (rev 4836)
+++ trunk/rpms/spamass-milter/spamass-milter.spec	2006-10-18 08:24:13 UTC (rev 4837)
@@ -4,8 +4,8 @@
 
 Summary: Sendmail milter for spamassassin
 Name: spamass-milter
-Version: 0.3.0
-Release: 1.2
+Version: 0.3.1
+Release: 1
 License: GPL
 Group: System Environment/Daemons
 URL: http://savannah.gnu.org/projects/spamass-milt/
@@ -150,8 +150,8 @@
 %{_sbindir}/spamass-milter
 
 %changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 0.3.0-1.2
-- Rebuild for Fedora Core 5.
+* Tue Feb 08 2005 Dag Wieers <dag at wieers.com> - 0.3.1-1
+- Updated to release 0.3.1.
 
 * Tue Feb 08 2005 Dag Wieers <dag at wieers.com> - 0.3.0-1
 - Updated to release 0.3.0.

Modified: trunk/rpms/tightvnc/tightvnc.spec
===================================================================
--- trunk/rpms/tightvnc/tightvnc.spec	2006-10-17 16:05:43 UTC (rev 4836)
+++ trunk/rpms/tightvnc/tightvnc.spec	2006-10-18 08:24:13 UTC (rev 4837)
@@ -4,16 +4,33 @@
 
 %{?dist: %{expand: %%define %dist 1}}
 
-%{?rh7:%define _without_freedesktop 1}
-%{?el2:%define _without_freedesktop 1}
 
+%{?fc2:%define _without_fdsbits_patch 1}
+
+%{?fc1:%define _without_fdsbits_patch 1}
 %{?fc1:%define _without_xorg 1}
+
+%{?el3:%define _without_fdsbits_patch 1}
 %{?el3:%define _without_xorg 1}
+
+%{?rh9:%define _without_fdsbits_patch 1}
 %{?rh9:%define _without_xorg 1}
+
+%{?rh8:%define _without_fdsbits_patch 1}
 %{?rh8:%define _without_xorg 1}
+
+%{?rh7:%define _without_fdsbits_patch 1}
+%{?rh7:%define _without_freedesktop 1}
 %{?rh7:%define _without_xorg 1}
+
+%{?el2:%define _without_fdsbits_patch 1}
+%{?el2:%define _without_freedesktop 1}
 %{?el2:%define _without_xorg 1}
+
+%{?rh6:%define _without_fdsbits_patch 1}
 %{?rh6:%define _without_xorg 1}
+
+%{?yd3:%define _without_fdsbits_patch 1}
 %{?yd3:%define _without_xorg 1}
 
 %define desktop_vendor rpmforge
@@ -21,12 +38,19 @@
 Summary: Graphical remote administration system
 Name: tightvnc
 Version: 1.2.9
-Release: 3.2
+Release: 4
 License: GPL
 Group: User Interface/Desktops
 URL: http://www.tightvnc.com/
 
 Source: http://dl.sf.net/vnc-tight/tightvnc-%{version}_unixsrc.tar.bz2
+Patch1: tightvnc-1.2.6-config-x86_64.patch
+Patch2: vncserver-vncpasswd-1.2.6.patch
+Patch3: vncserver-halfbaked.patch
+Patch4: vncviewer-fix-crash-when-lose-focus.patch
+Patch5: tightvnc-1.2.9-fix-build-when-fds_bits-not-defined.patch
+Patch6: tightvnc-1.2.9-use-stdlib-malloc.patch
+Patch7: tightvnc-1.2.9-includes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildPrereq: /usr/bin/perl, tcp_wrappers
@@ -63,8 +87,18 @@
 
 %prep
 %setup -n vnc_unixsrc
-%{__perl} -pi -e 's|/usr/local/vnc/classes|%{_datadir}/vnc/classes|' vncserver
+#patch1 -p1 -b .orig
+%patch1 -p1 -b .config-x86_64
+%patch2 -p1
+%patch3 -p0 -b .halfbaked
+%patch4 -p1 -b .fix_crash
+%{!?_without_fdsbits_patch:%patch5 -p1 -b .fds_bits}
+%patch6 -p1 -b .stdlib_malloc
+%patch7 -p1 -b .includes
 
+%{__perl} -pi -e 's|/usr/local/vnc/classes|%{_datadir}/vnc/classes|;' vncserver
+%{__perl} -pi -e 's|unix/:7100|unix/:-1|;' vncserver
+
 %{__cat} <<EOF >vncservers.sysconfig
 # The VNCSERVERS variable is a list of display:user pairs.
 #
@@ -190,12 +224,10 @@
 patch < vnc-xclients.patch
 
 xmkmf -a
-%{__make} %{?_smp_mflags} World \
-	CDEBUGFLAGS="%{optflags}"
+%{__make} World CDEBUGFLAGS="%{optflags}"
 cd Xvnc
 %configure
-%{__make} %{?_smp_mflags} \
-	CDEBUGFLAGS="%{optflags}" \
+%{__make} CDEBUGFLAGS="%{optflags}" \
 	EXTRA_DEFINES="-DUSE_LIBWRAP=1" \
 	EXTRA_LIBRARIES="-lwrap -lnss_nis"
 
@@ -259,8 +291,8 @@
 %{_datadir}/vnc/
 
 %changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 1.2.9-3.2
-- Rebuild for Fedora Core 5.
+* Tue Oct 17 2006 Dag Wieers <dag at wieers.com> - 1.2.9-4
+- 
 
 * Sun May 23 2004 Dag Wieers <dag at wieers.com> - 1.2.9-3
 - Fixed dependency on xorg-x11 instead of XFree86 on fc2. (Christopher V. Browne)

Modified: trunk/rpms/x264/x264.spec
===================================================================
--- trunk/rpms/x264/x264.spec	2006-10-17 16:05:43 UTC (rev 4836)
+++ trunk/rpms/x264/x264.spec	2006-10-18 08:24:13 UTC (rev 4837)
@@ -8,6 +8,15 @@
 %{?fc6:  %define _with_modxorg 1}
 %{?fc5:  %define _with_modxorg 1}
 
+%{?el4:%define _without_gtk26 1}
+%{?fc3:%define _without_gtk26 1}
+%{?fc2:%define _without_gtk26 1}
+%{?fc1:%define _without_gtk26 1}
+%{?el3:%define _without_gtk26 1}
+%{?rh9:%define _without_gtk26 1}
+%{?rh7:%define _without_gtk26 1}
+%{?el2:%define _without_gtk26 1}
+
 %define date 20060917
 
 Summary: Library for encoding and decoding H264/AVC video streams
@@ -17,10 +26,11 @@
 License: GPL
 Group: System Environment/Libraries
 URL: http://developers.videolan.org/x264.html
-Source: ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-%{date}-2245.tar.bz2
+Source: http://downloads.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-%{date}-2245.tar.bz2
 Patch0: x264-snapshot-20060731-2245-gtk.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: nasm, yasm, gtk2-devel, gettext
+BuildRequires: nasm, yasm, gettext
+%{?!_without_gtk26:BuildRequires: gtk2-devel >= 2.6}
 %{?_with_visualize:%{?_with_modxorg:BuildRequires: libXt-devel}}
 %{?_with_visualize:%{!?_with_modxorg:BuildRequires: XFree86-devel}}
 # version.sh requires svnversion
@@ -72,7 +82,7 @@
     --bindir=%{_bindir} \
     --includedir=%{_includedir} \
     --libdir=%{_libdir} \
-    --enable-gtk \
+%{?!_without_gtk26:    --enable-gtk} \
     --enable-pthread \
     --enable-debug \
     %{?_with_visualize:--enable-visualize} \
@@ -85,7 +95,7 @@
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
-%find_lang x264_gtk
+%{?!_without_gtk26:%find_lang x264_gtk}
 
 
 %clean
@@ -111,6 +121,7 @@
 %{_libdir}/libx264.a
 %{_libdir}/libx264.so
 
+%if %{!?_without_gtk26:1}0
 %files gtk -f x264_gtk.lang
 %defattr(-, root, root, 0755)
 %doc AUTHORS COPYING
@@ -126,8 +137,8 @@
 %{_libdir}/pkgconfig/x264gtk.pc
 %{_libdir}/libx264gtk.a
 %{_libdir}/libx264gtk.so
+%endif
 
-
 %changelog
 * Mon Sep 18 2006 Matthias Saou <http://freshrpms.net/> 0.0.0-0.2.20060731
 - Update to 20060917 snapshot.

More information about the svn-commits mailing list