[svn] r6091 - in trunk/rpms: exiv2 fuse-encfs gq gwenview imlib2 lib3ds libextractor libmpeg3 libquicktime rsync scribus soundconverter transcode twolame viruskiller

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Sun Jan 13 20:09:49 CET 2008


Author: dag
Date: 2008-01-13 20:09:42 +0100 (Sun, 13 Jan 2008)
New Revision: 6091

Modified:
   trunk/rpms/exiv2/exiv2.spec
   trunk/rpms/fuse-encfs/fuse-encfs.spec
   trunk/rpms/gq/gq.spec
   trunk/rpms/gwenview/gwenview.spec
   trunk/rpms/imlib2/imlib2.spec
   trunk/rpms/lib3ds/lib3ds.spec
   trunk/rpms/libextractor/libextractor.spec
   trunk/rpms/libmpeg3/libmpeg3.spec
   trunk/rpms/libquicktime/libquicktime.spec
   trunk/rpms/rsync/rsync-test.spec
   trunk/rpms/rsync/rsync.spec
   trunk/rpms/scribus/scribus.spec
   trunk/rpms/soundconverter/soundconverter.spec
   trunk/rpms/transcode/transcode.spec
   trunk/rpms/twolame/twolame.spec
   trunk/rpms/viruskiller/viruskiller.spec
Log:
Updates

Modified: trunk/rpms/exiv2/exiv2.spec
===================================================================
--- trunk/rpms/exiv2/exiv2.spec	2008-01-12 14:29:54 UTC (rev 6090)
+++ trunk/rpms/exiv2/exiv2.spec	2008-01-13 19:09:42 UTC (rev 6091)
@@ -14,7 +14,7 @@
 
 Summary: Exif and Iptc metadata manipulation library and tools
 Name: exiv2
-Version: 0.15
+Version: 0.16
 Release: 1
 License: GPL
 Group: Applications/Multimedia
@@ -86,6 +86,9 @@
 %{_libdir}/pkgconfig/exiv2.pc
 
 %changelog
+* Thu Jan 10 2008 Dag Wieers <dag at wieers.com> - 0.16-1
+- Updated to release 0.16.
+
 * Tue Jul 10 2007 Dries Verachtert <dries at ulyssis.org> - 0.15-1
 - Updated to release 0.15.
 

Modified: trunk/rpms/fuse-encfs/fuse-encfs.spec
===================================================================
--- trunk/rpms/fuse-encfs/fuse-encfs.spec	2008-01-12 14:29:54 UTC (rev 6090)
+++ trunk/rpms/fuse-encfs/fuse-encfs.spec	2008-01-13 19:09:42 UTC (rev 6091)
@@ -5,13 +5,14 @@
 
 Summary: Encrypted pass-thru filesystem in userspace
 Name: fuse-encfs
-Version: 1.4.0
+Version: 1.4.1
 Release: 1
 License: GPL
 Group: System Environment/Kernel
 URL: http://www.arg0.net/encfs
 
-Source: http://www.arg0.net/encfs-1.4.0.tar.gz
+#Source: http://www.arg0.net/encfs-1.4.1.tgz
+Source: http://encfs.googlecode.com/files/encfs-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: openssl-devel, fuse-devel >= 2.2, rlog-devel >= 1.3
@@ -39,7 +40,7 @@
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR="%{buildroot}"
-#find_lang %{real_name}
+%find_lang %{real_name}
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -47,8 +48,8 @@
 %clean
 %{__rm} -rf %{buildroot}
 
-#files -f %{real_name}.lang
-%files
+%files -f %{real_name}.lang
+#files
 %defattr(-, root, root, 0755)
 %doc AUTHORS ChangeLog COPYING README
 %doc %{_mandir}/man1/encfs.1*
@@ -60,6 +61,9 @@
 %exclude %{_libdir}/libencfs.la
 
 %changelog
+* Sun Jan 13 2008 Dag Wieers <dag at wieers.com> - 1.4.1-1
+- Updated to release 1.4.1.
+
 * Tue Jan 08 2008 Dag Wieers <dag at wieers.com> - 1.4.0-1
 - Updated to release 1.4.0.
 

Modified: trunk/rpms/gq/gq.spec
===================================================================
--- trunk/rpms/gq/gq.spec	2008-01-12 14:29:54 UTC (rev 6090)
+++ trunk/rpms/gq/gq.spec	2008-01-13 19:09:42 UTC (rev 6091)
@@ -12,7 +12,7 @@
 
 Summary: graphical LDAP directory browser and editor
 Name: gq
-Version: 1.2.2
+Version: 1.2.3
 Release: 1
 License: GPL
 Group: Applications/Internet
@@ -54,10 +54,10 @@
 
 %build
 %configure \
-	--enable-cache \
-	--enable-browser-dnd \
-	--disable-update-mimedb \
-	--with-included-gettext
+    --disable-update-mimedb \
+    --enable-browser-dnd \
+    --enable-cache \
+    --with-included-gettext
 %{__make} %{?_smp_mflags}
 
 %install
@@ -66,11 +66,11 @@
 %find_lang %{name}
 
 %if %{!?_without_freedesktop:1}0
-	%{__install} -d -m0755 %{buildroot}%{_datadir}/applications/
-	desktop-file-install --vendor %{desktop_vendor} --delete-original \
-		--add-category X-Red-Hat-Base                             \
-		--dir %{buildroot}%{_datadir}/applications                \
-		%{buildroot}%{_datadir}/applications/gq.desktop
+    %{__install} -d -m0755 %{buildroot}%{_datadir}/applications/
+    desktop-file-install --vendor %{desktop_vendor} --delete-original \
+        --add-category X-Red-Hat-Base                             \
+        --dir %{buildroot}%{_datadir}/applications                \
+        %{buildroot}%{_datadir}/applications/gq.desktop
 %endif
 
 %post
@@ -94,11 +94,14 @@
 %{?_without_freedesktop:%{_datadir}/gnome/apps/Internet/gq.desktop}
 
 %changelog
+* Thu Jan 10 2008 Dag Wieers <dag at wieers.com> - 1.2.3-1
+- Updated to release 1.2.3.
+
 * Mon Apr 16 2007 Dag Wieers <dag at wieers.com> - 1.2.2-1
-- Updated to release 1.2.2. 
+- Updated to release 1.2.2.
 
 * Mon Oct 09 2006 Dries Verachtert <dries at ulyssis.org> - 1.2.1-1
-- Updated to release 1.2.1. 
+- Updated to release 1.2.1.
 
 * Sat Sep 30 2006 Dag Wieers <dag at wieers.com> - 1.2.0-1
 - Updated to release 1.2.0.

Modified: trunk/rpms/gwenview/gwenview.spec
===================================================================
--- trunk/rpms/gwenview/gwenview.spec	2008-01-12 14:29:54 UTC (rev 6090)
+++ trunk/rpms/gwenview/gwenview.spec	2008-01-13 19:09:42 UTC (rev 6091)
@@ -6,12 +6,12 @@
 %{?dtag: %{expand: %%define %dtag 1}}
 
 ### Temporary exclude as it loops endlessly in configure on x86_64
-# ExcludeDist: el4
+##ExcludeDist: el4
 
 Summary: Image viewer for KDE
 Name: gwenview
 Version: 1.4.2
-Release: 1
+Release: 2
 License: GPL
 Group: Amusements/Graphics
 URL: http://gwenview.sourceforge.net/
@@ -43,13 +43,11 @@
 %{__rm} -rf %{buildroot}
 source /etc/profile.d/qt.sh
 %{__make} install DESTDIR="%{buildroot}"
-#%find_lang %{name}
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %files
-# -f %{name}.lang
 %defattr(-, root, root, 0755)
 %doc AUTHORS COPYING NEWS README
 %{_bindir}/gwenview
@@ -72,6 +70,9 @@
 %{_datadir}/config.kcfg/*.kcfg
 
 %changelog
+* Sun Jan 13 2008 Dag Wieers <dag at wieers.com> - 1.4.2-2
+- Rebuild against exiv2 0.16.
+
 * Wed Sep 19 2007 Dries Verachtert <dries at ulyssis.org> - 1.4.2-1
 - Updated to release 1.4.2.
 

Modified: trunk/rpms/imlib2/imlib2.spec
===================================================================
--- trunk/rpms/imlib2/imlib2.spec	2008-01-12 14:29:54 UTC (rev 6090)
+++ trunk/rpms/imlib2/imlib2.spec	2008-01-13 19:09:42 UTC (rev 6091)
@@ -1,29 +1,34 @@
 # $Id$
-# Authority: matthias
+# Authority: dag
 # Upstream: Carsten Haitzler <raster$rasterman,com>
 # Upstream: <enlightenment-devel$lists,sourceforge,net>
 
-#define date 20030417
-
 %{?dtag: %{expand: %%define %dtag 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: Powerful image loading and rendering library
 Name: imlib2
-Version: 1.2.2
-Release: %{?date:0.%{date}.}1
+Version: 1.4.0
+Release: 1
 License: BSD
 Group: System Environment/Libraries
 URL: http://enlightenment.org/pages/imlib2.html
+
 Source: http://dl.sf.net/enlightenment/imlib2-%{version}.tar.gz
+Patch0: imlib2-1.2.1-X11-path.patch
+Patch1: imlib2-1.3.0-multilib.patch
+Patch2: imlib2-1.3.0-loader_overflows.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
 BuildRequires: freetype-devel >= 1.2
 BuildRequires: zlib-devel, bzip2-devel
 BuildRequires: libpng-devel, libjpeg-devel, libungif-devel, libtiff-devel
@@ -50,46 +55,55 @@
 %description devel
 Header, static libraries and documentation for Imlib2.
 
-
 %prep
 %setup
+%patch0 -p1 -b .x11-path
+#patch1 -p1 -b .multilib
+%patch2 -p1 -b .overflow
+
 %{__perl} -pi.orig -e 's|/lib(?=[^/\w])|/%{_lib}|g' configure
 
+touch aclocal.m4
+touch configure
+touch config.h.in
+touch `find -name Makefile.in`
+
 %build
 %configure \
+    --disable-dependency-tracking \
+    --x-libraries="%{_prefix}/X11R6/%{_lib}" \
     --with-pic \
-    --x-libraries="%{_prefix}/X11R6/%{_lib}" \
 %ifarch %{ix86}
-    --enable-mmx
+    --enable-mmx \
 %else
-    --disable-mmx
+    --disable-mmx \
 %endif
+%ifarch x86_64
+    --enable-amd64
+%else
+    --disable-amd64
+%endif
 %{__make} %{?_smp_mflags}
+#LIBTOOL="%{_bindir}/libtool"
 
-
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR="%{buildroot}"
+#LIBTOOL="%{_bindir}/libtool"
 
-
 %clean
 %{__rm} -rf %{buildroot}
 
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
-%post
-/sbin/ldconfig 2>/dev/null
-
-%postun
-/sbin/ldconfig 2>/dev/null
-
-
 %files
 %defattr(-, root, root, 0755)
 %doc AUTHORS ChangeLog COPYING doc/ README
 %{_bindir}/imlib2_*
+%{_datadir}/imlib2/
 %{_libdir}/libImlib2.so.*
 %{_libdir}/imlib2/
-%{_datadir}/imlib2/
 
 %files devel
 %defattr(-, root, root, 0755)
@@ -99,14 +113,16 @@
 ### Required by kdelibs bug (RHbz #142244)
 %{_libdir}/libImlib2.la
 %{_libdir}/libImlib2.so
+%{_libdir}/pkgconfig/imlib2.pc
 %exclude %{_libdir}/imlib2/filters/*.a
 %exclude %{_libdir}/imlib2/filters/*.la
 %exclude %{_libdir}/imlib2/loaders/*.a
 %exclude %{_libdir}/imlib2/loaders/*.la
-%{_libdir}/pkgconfig/imlib2.pc
 
+%changelog
+* Fri Jan 11 2008 Dag Wieers <dag at wieers.com> - 1.4.0-1
+- Updated to release 1.4.0.
 
-%changelog
 * Mon May 08 2006 Dries Verachtert <dries at ulyssis.org> - 1.2.2-1
 - Updated to release 1.2.2.
 
@@ -177,4 +193,3 @@
 
 * Tue Nov 2 1999 Lyle Kempler <kempler at utdallas.edu>
 - Mangled imlib 1.9.8 imlib spec file into imlib2 spec file
-

Modified: trunk/rpms/lib3ds/lib3ds.spec
===================================================================
--- trunk/rpms/lib3ds/lib3ds.spec	2008-01-12 14:29:54 UTC (rev 6090)
+++ trunk/rpms/lib3ds/lib3ds.spec	2008-01-13 19:09:42 UTC (rev 6091)
@@ -1,7 +1,7 @@
 # $Id$
 # Authority: dag
 
-%{?dtag:%{expand: %%define %{dist} 1}}
+%{?dtag:%{expand: %%define %dtag 1}}
 
 %{?el3:%define _without_freeglut 1}
 %{?rh9:%define _without_freeglut 1}

Modified: trunk/rpms/libextractor/libextractor.spec
===================================================================
--- trunk/rpms/libextractor/libextractor.spec	2008-01-12 14:29:54 UTC (rev 6090)
+++ trunk/rpms/libextractor/libextractor.spec	2008-01-13 19:09:42 UTC (rev 6091)
@@ -13,7 +13,7 @@
 
 Summary: Meta-data extraction library
 Name: libextractor
-Version: 0.5.19
+Version: 0.5.19a
 Release: 1
 License: GPL
 Group: System Environment/Libraries
@@ -112,6 +112,9 @@
 #%{python_sitearch}/extractor.so
 
 %changelog
+* Sun Jan 13 2008 Dag Wieers <dag at wieers.com> - 0.5.19a-1
+- Updated to release 0.5.19a.
+
 * Mon Jan 07 2008 Dag Wieers <dag at wieers.com> - 0.5.19-1
 - Updated to release 0.5.19.
 

Modified: trunk/rpms/libmpeg3/libmpeg3.spec
===================================================================
--- trunk/rpms/libmpeg3/libmpeg3.spec	2008-01-12 14:29:54 UTC (rev 6090)
+++ trunk/rpms/libmpeg3/libmpeg3.spec	2008-01-13 19:09:42 UTC (rev 6091)
@@ -5,13 +5,27 @@
 Summary: Decoder of various derivatives of MPEG standards
 Name: libmpeg3
 Version: 1.7
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Libraries
 URL: http://heroinewarrior.com/libmpeg3.php3
+
 Source: http://dl.sf.net/heroines/libmpeg3-%{version}-src.tar.bz2
-Patch0: libmpeg3-1.6-makefile.patch
+Patch0: libmpeg3-1.7-makefile.patch
+Patch1: libmpeg3-1.7-cinelerra_autotools.patch
+Patch2: libmpeg3-1.7-cinelerra_hacking.patch
+Patch3: libmpeg3-1.7-fix_commented.patch
+Patch4: libmpeg3-1.7-spec_in.patch
+Patch5: libmpeg3-1.7-pkgconfig.in.patch
+Patch6: libmpeg3-1.7-boostrap.patch
+# Patches 7/8 from gentoo 
+#http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libmpeg3/files/
+Patch7: libmpeg3-1.5.2-gnustack.patch
+Patch8: libmpeg3-1.7-memcpy.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires: a52dec-devel
+BuildRequires: libtool
 BuildRequires: nasm
 
 %description
@@ -30,6 +44,7 @@
 %package utils
 Summary: Utilities from libmpeg3
 Group: Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
 
 %description utils
 LibMPEG3 decodes the many many derivatives of MPEG standards into
@@ -37,10 +52,10 @@
 
 This package contains utility programs based on libmpeg3.
 
-
 %package devel
 Summary: Development files for libmpeg3
 Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
 
 %description devel
 LibMPEG3 decodes the many many derivatives of MPEG standards into
@@ -49,40 +64,45 @@
 This package contains files needed to build applications that will use
 libmpeg3.
 
-
 %prep
 %setup
-%patch0 -p1 -b .makefile
+#patch0 -p1 -b .makefile
+%patch1 -p1
+%patch3 -p1 -b .commented
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1 -b .gnustack
+%patch8 -p1 -b .memcpy
 
+### Touch docs files:
+touch INSTALL README NEWS AUTHORS ChangeLog
 
+### Build autotools
+chmod 755 bootstrap
+./bootstrap
+
 %build
-export OBJDIR=%{_arch}
-export CFLAGS="%{optflags} -fPIC"
-# Enable USE_MMX for archs that support it, not by default on i386
-%ifarch i686 athlon
-%{__perl} -pi -e 's|^USE_MMX = 0|USE_MMX = 1|g' Makefile
-%endif
-# EOF error which requires a second make invocation. Needs to be investigated
-%{__make} %{?_smp_mflags} || %{__make} %{?_smp_mflags}
+%configure --enable-shared --disable-static
+%{__make} %{?_smp_mflags}
 
-
 %install
 %{__rm} -rf %{buildroot}
-export OBJDIR=%{_arch}
-%{__make} install \
-    LIBDIR=%{_libdir} \
-    DESTDIR=%{buildroot}
+%{__make} install DESTDIR="%{buildroot}" \
+    LIBDIR="%{_libdir}" \
+    INSTALL="install -c -p"
 
-
 %clean
 %{__rm} -rf %{buildroot}
 
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
-#post -p /sbin/ldconfig
+%files
+%defattr(-, root, root, 0755)
+%doc COPYING
+%{_libdir}/libmpeg3.so.*
 
-#postun -p /sbin/ldconfig
-
-
 %files utils
 %defattr(-, root, root, 0755)
 %doc COPYING
@@ -94,12 +114,15 @@
 %files devel
 %defattr(-, root, root, 0755)
 %doc docs/*
-%{_libdir}/libmpeg3.a
-%{_includedir}/libmpeg3.h
-%{_includedir}/mpeg3private.h
+%{_libdir}/libmpeg3.so
+%{_includedir}/mpeg3/
+%{_libdir}/pkgconfig/libmpeg3.pc
+%exclude %{_libdir}/libmpeg3.la
 
+%changelog
+* Fri Jan 11 2008 Dag Wieers <dag at wieers.com> - 1.7-3
+- Added patches from Livna.
 
-%changelog
 * Wed Sep 20 2006 Matthias Saou <http://freshrpms.net/> 1.7-2
 - Run make twice since there is an EOF error that makes the first run abort.
 

Modified: trunk/rpms/libquicktime/libquicktime.spec
===================================================================
--- trunk/rpms/libquicktime/libquicktime.spec	2008-01-12 14:29:54 UTC (rev 6090)
+++ trunk/rpms/libquicktime/libquicktime.spec	2008-01-13 19:09:42 UTC (rev 6091)
@@ -43,7 +43,7 @@
 
 Summary: Library for reading and writing quicktime files
 Name: libquicktime
-Version: 1.0.1
+Version: 1.0.2
 Release: 1%{?prever:.%{prever}}
 License: GPL
 Group: System Environment/Libraries
@@ -79,7 +79,6 @@
 features such as a GNU build tools-based build process and dynamically
 loadable CODECs.
 
-
 %package devel
 Summary: Development files from the libquicktime library
 Group: Development/Libraries
@@ -92,19 +91,16 @@
 You will need to install this development package if you intend to rebuild
 programs that need to access quicktime files using libquicktime.
 
-
 %prep
 %setup -n %{name}-%{version}%{?prever}
 %patch0 -p0 -b .plugin_dir
 
-
 %build
 %configure \
     --enable-gpl \
     --with-cpuflags="%{optflags}"
 %{__make} %{?_smp_mflags}
 
-
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR="%{buildroot}"
@@ -114,41 +110,41 @@
 # (for transcode 1.0.0beta3)
 %{__ln_s} lqt %{buildroot}%{_includedir}/quicktime
 
-
 %clean
 %{__rm} -rf %{buildroot}
 
-
 %post -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 
-
 %files -f %{name}.lang
 %defattr(-, root, root, 0755)
 %doc COPYING README TODO
+%doc %{_mandir}/man1/lqtplay.1*
 %{_bindir}/lqtplay
 %{_bindir}/lqt_transcode
 %{_bindir}/qt*
 %{_libdir}/libquicktime.so.*
 %dir %{_libdir}/libquicktime/
 %{_libdir}/libquicktime/lqt_*.so
-%{_mandir}/man1/lqtplay.1*
 
 %files devel
 %defattr(-, root, root, 0755)
+%doc doc/*.html doc/*.html doc/apiref/
 %{?!_without_gtk24:%{_bindir}/libquicktime_config}
 %{_bindir}/lqt-config
 %{_datadir}/aclocal/*.m4
 %{_includedir}/lqt/
 %{_includedir}/quicktime
-%exclude %{_libdir}/*.la
 %{_libdir}/*.so
-%exclude %{_libdir}/libquicktime/*.la
 %{_libdir}/pkgconfig/libquicktime.pc
+%exclude %{_docdir}/libquicktime/
+%exclude %{_libdir}/*.la
+%exclude %{_libdir}/libquicktime/lqt_*.la
 
-
 %changelog
+* Wed Jan 09 2008 Dag Wieers <dag at wieers.com> - 1.0.2-1
+- Updated to release 1.0.2.
+
 * Sun Oct 14 2007 Dag Wieers <dag at wieers.com> - 1.0.1-1
 - Updated to release 1.0.1.
 

Modified: trunk/rpms/rsync/rsync-test.spec
===================================================================
--- trunk/rpms/rsync/rsync-test.spec	2008-01-12 14:29:54 UTC (rev 6090)
+++ trunk/rpms/rsync/rsync-test.spec	2008-01-13 19:09:42 UTC (rev 6091)
@@ -4,22 +4,22 @@
 
 # Tag: test
 
-# Rationale: rsync 2.6.3 uses less resources and has lots of improvements
+# Rationale: rsync 2.6.3+ uses less resources and has lots of improvements
 
-#%define real_version 2.6.4pre2
-%define real_version HEAD-20050315-1733GMT
+%define real_version 3.0.0pre8
+#define real_version HEAD-20050315-1733GMT
 
 Summary: Program for synchronizing files over a network
 Name: rsync
-Version: 2.6.4
-#Release: 0.pre2
-Release: 0.pre2.cvs20050315.2
+Version: 3.0.0
+Release: 0.pre8
+#Release: 0.pre2.cvs20050315.2
 License: GPL
 Group: Applications/Internet
 URL: http://rsync.samba.org/
 
-#Source: http://rsync.samba.org/ftp/rsync/preview/rsync-%{real_version}.tar.gz
-Source: http://rsync.samba.org/ftp/rsync/nightly/rsync-%{real_version}.tar.gz
+Source: http://rsync.samba.org/ftp/rsync/rsync-%{real_version}.tar.gz
+#Source: http://rsync.samba.org/ftp/rsync/nightly/rsync-%{real_version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
@@ -34,21 +34,19 @@
 %prep
 %setup -n %{name}-%{real_version}
 
-#patch -p0 < patches/delay-renames.diff
-
 %{__cat} <<EOF >rsync.xinet
 # default: off
 # description: The rsync server is a good addition to an ftp server, as it \
-#	allows crc checksumming etc.
+#   allows crc checksumming etc.
 service rsync
 {
-	disable	= yes
-	socket_type     = stream
-	wait            = no
-	user            = root
-	server          = %{_bindir}/rsync
-	server_args     = --daemon
-	log_on_failure  += USERID
+    disable = yes
+    socket_type     = stream
+    wait            = no
+    user            = root
+    server          = %{_bindir}/rsync
+    server_args     = --daemon
+    log_on_failure  += USERID
 }
 EOF
 
@@ -58,7 +56,7 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR="%{buildroot}"
 %{__install} -Dp -m0644 rsync.xinet %{buildroot}%{_sysconfdir}/xinetd.d/rsync
 
 %clean
@@ -66,15 +64,15 @@
 
 %files
 %defattr(-, root, root, 0755)
-%doc *.txt COPYING NEWS README tech_report.tex TODO
+%doc COPYING INSTALL NEWS OLDNEWS README tech_report.tex TODO *.txt doc/ support/
 %doc %{_mandir}/man1/rsync.1*
 %doc %{_mandir}/man5/rsyncd.conf.5*
 %config(noreplace) %{_sysconfdir}/xinetd.d/rsync
 %{_bindir}/rsync
 
 %changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 2.6.4-0.pre2.cvs20050315.2
-- Rebuild for Fedora Core 5.
+* Sun Jan 13 2008 Dag Wieers <dag at wieers.com> - 3.0.0-0.pre8
+- Updated to release 3.0.0pre8.
 
 * Tue Mar 15 2005 Dag Wieers <dag at wieers.com> - 2.6.4-0.pre2.cvs20050315
 - Updated to release 2.6.4pre2-cvsHEAD-20050315-1733GMT.

Modified: trunk/rpms/rsync/rsync.spec
===================================================================
--- trunk/rpms/rsync/rsync.spec	2008-01-12 14:29:54 UTC (rev 6090)
+++ trunk/rpms/rsync/rsync.spec	2008-01-13 19:09:42 UTC (rev 6091)
@@ -30,16 +30,16 @@
 %{__cat} <<EOF >rsync.xinet
 # default: off
 # description: The rsync server is a good addition to an ftp server, as it \
-#	allows crc checksumming etc.
+#   allows crc checksumming etc.
 service rsync
 {
-	disable	= yes
-	socket_type     = stream
-	wait            = no
-	user            = root
-	server          = %{_bindir}/rsync
-	server_args     = --daemon
-	log_on_failure  += USERID
+    disable = yes
+    socket_type     = stream
+    wait            = no
+    user            = root
+    server          = %{_bindir}/rsync
+    server_args     = --daemon
+    log_on_failure  += USERID
 }
 EOF
 
@@ -49,7 +49,7 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR="%{buildroot}"
 %{__install} -Dp -m0644 rsync.xinet %{buildroot}%{_sysconfdir}/xinetd.d/rsync
 
 %clean
@@ -57,7 +57,7 @@
 
 %files
 %defattr(-, root, root, 0755)
-%doc *.txt COPYING doc/ INSTALL NEWS OLDNEWS README support/ tech_report.tex TODO
+%doc COPYING INSTALL NEWS OLDNEWS README tech_report.tex TODO *.txt doc/ support/
 %doc %{_mandir}/man1/rsync.1*
 %doc %{_mandir}/man5/rsyncd.conf.5*
 %config(noreplace) %{_sysconfdir}/xinetd.d/rsync

Modified: trunk/rpms/scribus/scribus.spec
===================================================================
--- trunk/rpms/scribus/scribus.spec	2008-01-12 14:29:54 UTC (rev 6090)
+++ trunk/rpms/scribus/scribus.spec	2008-01-13 19:09:42 UTC (rev 6091)
@@ -11,7 +11,7 @@
 
 Summary: Graphical desktop publishing (DTP) application
 Name: scribus
-Version: 1.3.3.9
+Version: 1.3.3.10
 Release: 1
 License: GPL
 Group: Applications/Productivity
@@ -33,7 +33,7 @@
 %prep
 %setup
 
-%{__cat} <<EOF >%{name}.desktop
+%{__cat} <<EOF >scribus.desktop
 [Desktop Entry]
 Name=Scribus Desktop Publishing
 Comment=%{summary}
@@ -48,25 +48,25 @@
 %build
 source "%{_sysconfdir}/profile.d/qt.sh"
 %configure \
-	--disable-dependency-tracking \
-	--with-xinerama \
-	--with-extra-libs=%{_libdir}
+    --disable-dependency-tracking \
+    --with-extra-libs="%{_libdir}" \
+    --with-xinerama
 %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR="%{buildroot}"
 
 %{__install} -Dp -m0644 scribus/icons/scribusicon.png %{buildroot}%{_datadir}/pixmaps/scribus.png
 
 %if %{?_without_freedesktop:1}0
         %{__install} -Dp -m0644 scribus.desktop %{buildroot}%{_datadir}/gnome/apps/Applications/scribus.desktop
 %else
-	%{__install} -d -m0755 %{buildroot}%{_datadir}/applications/
-	desktop-file-install --vendor %{desktop_vendor}    \
-		--add-category X-Red-Hat-Base              \
-		--dir %{buildroot}%{_datadir}/applications \
-		%{name}.desktop
+    %{__install} -d -m0755 %{buildroot}%{_datadir}/applications/
+    desktop-file-install --vendor %{desktop_vendor}    \
+        --add-category X-Red-Hat-Base              \
+        --dir %{buildroot}%{_datadir}/applications \
+        scribus.desktop
 %endif
 
 ### Clean up buildroot
@@ -78,18 +78,22 @@
 %files
 %defattr(-, root, root, 0755)
 %doc AUTHORS ChangeLog COPYING README TODO
-%{_mandir}/man1/scribus*
-%{_mandir}/pl/man1/scribus*
-%{_bindir}/*
+%doc %{_mandir}/man1/scribus.1*
+%doc %{_mandir}/*/man1/scribus?1*
+%{_bindir}/scribus
+%{!?_without_freedesktop:%{_datadir}/applications/%{desktop_vendor}-scribus.desktop}
+%{?_without_freedesktop:%{_datadir}/gnome/apps/Applications/scribus.desktop}
+%{_datadir}/mime/packages/scribus.xml
+%{_datadir}/pixmaps/scribus.png
+%{_datadir}/pixmaps/scribusicon.png
+%{_datadir}/scribus
+%{_includedir}/scribus/
 %{_libdir}/scribus/
-%{_includedir}/scribus/
-%{_datadir}/scribus
-%{_datadir}/mime/packages/scribus.xml
-%{_datadir}/pixmaps/*
-%{?_without_freedesktop:%{_datadir}/gnome/apps/Applications/*.desktop}
-%{!?_without_freedesktop:%{_datadir}/applications/*.desktop}
 
 %changelog
+* Wed Jan 09 2008 Dag Wieers <dag at wieers.com> - 1.3.3.10-1
+- Updated to release 1.3.3.10.
+
 * Wed May 09 2007 Dries Verachtert <dries at ulyssis.org> - 1.3.3.9-1
 - Updated to release 1.3.3.9.
 

Modified: trunk/rpms/soundconverter/soundconverter.spec
===================================================================
--- trunk/rpms/soundconverter/soundconverter.spec	2008-01-12 14:29:54 UTC (rev 6090)
+++ trunk/rpms/soundconverter/soundconverter.spec	2008-01-13 19:09:42 UTC (rev 6091)
@@ -5,7 +5,7 @@
 
 Summary: Simple sound converter application
 Name: soundconverter
-Version: 0.9.4
+Version: 0.9.8
 Release: 1
 License: GPL
 Group: Applications/Multimedia
@@ -44,10 +44,14 @@
 %doc %{_mandir}/man1/soundconverter.1*
 %{_bindir}/soundconverter
 %{_datadir}/applications/soundconverter.desktop
-%{_datadir}/pixmaps/soundconverter-icon.png
+%{_datadir}/icons/hicolor/scalable/apps/soundconverter.svg
+%{_datadir}/icons/hicolor/*/apps/soundconverter.png
 %{_datadir}/soundconverter/
 
 %changelog
+* Thu Jan 10 2008 Dag Wieers <dag at wieers.com> - 0.9.8-1
+- Updated to release 0.9.8.
+
 * Sun Apr 01 2007 Dag Wieers <dag at wieers.com> - 0.9.4-1
 - Updated to release 0.9.4.
 

Modified: trunk/rpms/transcode/transcode.spec
===================================================================
--- trunk/rpms/transcode/transcode.spec	2008-01-12 14:29:54 UTC (rev 6090)
+++ trunk/rpms/transcode/transcode.spec	2008-01-13 19:09:42 UTC (rev 6091)
@@ -6,29 +6,28 @@
 %{?fedora: %{expand: %%define fc%{fedora} 1}}
 
 %{!?dtag:%define _with_modxorg 1}
-%{?el5:  %define _with_modxorg 1}
-%{?fc7:  %define _with_modxorg 1}
-%{?fc6:  %define _with_modxorg 1}
-%{?fc5:  %define _with_modxorg 1}
+%{?el5:%define _with_modxorg 1}
+%{?fc7:%define _with_modxorg 1}
+%{?fc6:%define _with_modxorg 1}
+%{?fc5:%define _with_modxorg 1}
 
+%{?el4:%define _without_magick 1}
+%{?el3:%define _without_magick 1}
+%{?rh9:%define _without_magick 1}
+%{?rh8:%define _without_magick 1}
+%{?el2:%define _without_magick 1}
+
 %{?fc1:%define _without_theora 1}
-
 %{?el3:%define _without_theora 1}
-
 %{?rh9:%define _without_theora 1}
-
 %{?rh8:%define _without_theora 1}
-%{?rh8:%define _without_magick 1}
-
 %{?rh7:%define _without_theora 1}
-
 %{?el2:%define _without_theora 1}
-
 %{?rh6:%define _without_theora 1}
 
 Summary: Linux video stream processing utility
 Name: transcode
-Version: 1.0.4
+Version: 1.0.5
 Release: 1
 License: GPL
 Group: Applications/Multimedia
@@ -84,27 +83,27 @@
 export CFLAGS="%{optflags} -I%{_includedir}/postproc -DSDL_VIDEO_DRIVER_X11"
 export LDFLAGS="-L%{_usr}/X11R6/%{_lib}"
 %configure \
-    --enable-netstream \
-    --enable-v4l \
-    %{!?_without_postproc:--enable-libpostproc} \
+    %{?_without_dvdread:--disable-dvdread} \
+    %{?_without_lame:--disable-lame} \
+    %{!?_without_a52:--enable-a52 --enable-a52-default-decoder} \
     --enable-freetype2 \
-    %{?_without_lame:--disable-lame} \
-    --enable-ogg \
-    --enable-vorbis \
-    %{!?_without_theora:--enable-theora} \
-    %{?_without_dvdread:--disable-dvdread} \
+    --enable-gtk \
+    %{!?_without_magick:--enable-imagemagick} \
     --enable-libdv \
+    %{!?_without_libfame:--enable-libfame} \
+    %{!?_without_mpeg3:--enable-libmpeg3} \
+    %{!?_without_postproc:--enable-libpostproc} \
     %{!?_without_quicktime:--enable-libquicktime} \
+    --enable-libxml2 \
     --enable-lzo \
-    --with-lzo-includes=%{_includedir}/lzo \
-    %{!?_without_a52:--enable-a52 --enable-a52-default-decoder} \
-    %{!?_without_mpeg3:--enable-libmpeg3} \
-    --enable-libxml2 \
     %{!?_without_mjpeg:--enable-mjpegtools} \
+    --enable-netstream \
+    --enable-ogg \
     --enable-sdl \
-    --enable-gtk \
-    %{!?_without_libfame:--enable-libfame} \
-    %{!?_without_magick:--enable-imagemagick}
+    %{!?_without_theora:--enable-theora} \
+    --enable-v4l \
+    --enable-vorbis \
+    --with-lzo-includes=%{_includedir}/lzo
 %{__make} %{?_smp_mflags}
 
 
@@ -135,6 +134,9 @@
 
 
 %changelog
+* Fri Jan 11 2008 Dag Wieers <dag at wieers.com> - 1.0.5-1
+- Updated to release 1.0.5.
+
 * Sat Sep 22 2007 Dag Wieers <dag at wieers.com> - 1.0.4-1
 - Updated to release 1.0.4.
 

Modified: trunk/rpms/twolame/twolame.spec
===================================================================
--- trunk/rpms/twolame/twolame.spec	2008-01-12 14:29:54 UTC (rev 6090)
+++ trunk/rpms/twolame/twolame.spec	2008-01-13 19:09:42 UTC (rev 6091)
@@ -3,13 +3,15 @@
 
 Summary: Optimised MPEG Audio Layer 2 (MP2) encoder
 Name: twolame
-Version: 0.3.10
+Version: 0.3.12
 Release: 1
 License: LGPL
 Group: Applications/Multimedia
 URL: http://www.twolame.org/
+
 Source: http://dl.sf.net/twolame/twolame-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
 BuildRequires: libsndfile-devel
 
 %description
@@ -17,7 +19,6 @@
 Mike Cheng, which in turn is based upon the ISO dist10 code and portions of
 LAME.
 
-
 %package devel
 Summary: Development files for TwoLAME
 Group: Development/Libraries
@@ -28,49 +29,44 @@
 Mike Cheng, which in turn is based upon the ISO dist10 code and portions of
 LAME.
 
-
 %prep
 %setup
 
-
 %build
 %configure --disable-static
 %{__make} %{?_smp_mflags}
 
-
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
 # Move docs back here to be included in the devel sub-package
 %{__mv} %{buildroot}%{_docdir}/twolame/ _doc
 
-
 %post -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 
-
 %clean
 %{__rm} -rf %{buildroot}
 
-
 %files
 %defattr(-, root, root, 0755)
 %doc AUTHORS COPYING ChangeLog README TODO 
+%doc %{_mandir}/man1/twolame.1*
 %{_bindir}/twolame
 %{_libdir}/libtwolame.so.*
-%{_mandir}/man1/twolame.1*
 
 %files devel
 %defattr(-, root, root, 0755)
 %doc _doc/* doc/html/
 %{_includedir}/twolame.h
 %{_libdir}/pkgconfig/twolame.pc
-%exclude %{_libdir}/libtwolame.la
 %{_libdir}/libtwolame.so
+%exclude %{_libdir}/libtwolame.la
 
-
 %changelog
+* Thu Jan 10 2008 Dag Wieers <dag at wieers.com> - 0.3.12-1
+- Updated to release 0.3.12.
+
 * Wed Mar 21 2007 Dag Wieers <dag at wieers.com> - 0.3.10-1
 - Updated to release 0.3.10.
 

Modified: trunk/rpms/viruskiller/viruskiller.spec
===================================================================
--- trunk/rpms/viruskiller/viruskiller.spec	2008-01-12 14:29:54 UTC (rev 6090)
+++ trunk/rpms/viruskiller/viruskiller.spec	2008-01-13 19:09:42 UTC (rev 6091)
@@ -1,27 +1,23 @@
 # $Id$
-# Authority: matthias
+# Authority: dag
 
 %define desktop_vendor rpmforge
 
-%{?dtag: %{expand: %%define %dtag 1}}
-
-%{?el2:%define _without_freedesktop 1}
-%{?rh7:%define _without_freedesktop 1}
-
 Summary: Frantic shooting game where viruses invade your computer
 Name: viruskiller
-Version: 0.9
+Version: 1.0
 Release: 1
 License: GPL
 Group: Amusements/Games
 URL: http://www.parallelrealities.co.uk/virusKiller.php
+
+#Source: http://www.parallelrealities.co.uk/download.php?file=viruskiller-1.0-1.tar.gz&type=zip
 Source: viruskiller-%{version}-1.tar.gz
-Patch0: viruskiller-0.9-makefile.patch
-Patch1: viruskiller-0.9-zzip.patch
+Patch0: viruskiller-1.0-makefile.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires: gcc-c++, zlib-devel
 BuildRequires: SDL-devel, SDL_mixer-devel, SDL_image-devel, SDL_ttf-devel
-BuildRequires: zziplib-devel, gcc-c++
-%{!?_without_freedesktop:BuildRequires: desktop-file-utils}
 
 %description
 Your computer has been invaded! Dozens of little viruses are pouring in via
@@ -35,29 +31,14 @@
 Available rpmbuild rebuild options :
 --without : freedesktop
 
-
 %prep
 %setup
-%patch0 -p1 -b .makefile
-%patch1 -p1 -b .zzip
+%patch0 -p0 -b .orig
 
-
-%build
-%{__make} %{?_smp_mflags} PREFIX="%{_prefix}" OPTFLAGS="%{optflags}"
-
-
-%install
-%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR="%{buildroot}"
-
-# Remove shipped menu entry, no Comment, wrong Exec... :-(
-%{__rm} -f %{buildroot}%{_datadir}/applications/viruskiller.desktop
-
-# Install menu entry
-%{__cat} > %{name}.desktop << EOF
+%{__cat} <<EOF >icons/viruskiller.desktop
 [Desktop Entry]
 Name=Virus Killer
-Comment=Frantic shooting game where viruses invade your computer
+Comment=Shoot viruses invading your computer
 Icon=viruskiller.png
 Exec=%{_prefix}/games/viruskiller
 Terminal=false
@@ -66,36 +47,27 @@
 Encoding=UTF-8
 EOF
 
-%if %{!?_without_freedesktop:1}0
-%{__mkdir_p} %{buildroot}%{_datadir}/applications
-desktop-file-install \
-    --vendor %{desktop_vendor} \
-    --dir %{buildroot}%{_datadir}/applications \
-    %{name}.desktop
-%else
-%{__install} -Dp -m 0644 %{name}.desktop \
-    %{buildroot}%{_sysconfdir}/X11/applnk/Games/%{name}.desktop
-%endif
+%build
+%{__make} %{?_smp_mflags} PREFIX="%{_prefix}" OPTFLAGS="%{optflags}"
 
+%install
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR="%{buildroot}"
 
 %clean
 %{__rm} -rf %{buildroot}
 
-
 %files
 %defattr(-, root, root, 0755)
 %doc doc/*
 %{_prefix}/games/viruskiller
-%{_prefix}/share/games/viruskiller
+%{_datadir}/games/viruskiller
+%{_datadir}/applications/viruskiller.desktop
 %{_datadir}/pixmaps/viruskiller.png
-%if %{!?_without_freedesktop:1}0
-%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
-%else
-%{_sysconfdir}/X11/applnk/Games/%{name}.desktop
-%endif
 
-
 %changelog
+* Thu Jan 10 2008 Vincent Knecht <vknecht at users.sourceforge.net> 1.0-1
+- Updated to release 1.0.
+
 * Tue Jun  8 2004 Matthias Saou <http://freshrpms.net/> 0.9-1
 - Initial RPM release.
-



More information about the svn-commits mailing list