[svn] r5644 - in trunk/rpms: . apachetop clamav duma gdal guichan ifinfo irssi libgc madwifi metakit perl-GD python-cddb python-ogg python-sexy xmms-flac

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Sat Jul 28 16:09:30 CEST 2007


Author: dag
Date: 2007-07-28 16:09:27 +0200 (Sat, 28 Jul 2007)
New Revision: 5644

Removed:
   trunk/rpms/python-CDDB/
Modified:
   trunk/rpms/apachetop/apachetop.spec
   trunk/rpms/clamav/clamav.spec
   trunk/rpms/duma/duma.spec
   trunk/rpms/gdal/gdal.spec
   trunk/rpms/guichan/guichan.spec
   trunk/rpms/ifinfo/ifinfo.spec
   trunk/rpms/irssi/irssi.spec
   trunk/rpms/libgc/libgc.spec
   trunk/rpms/madwifi/madwifi.spec
   trunk/rpms/metakit/metakit.spec
   trunk/rpms/perl-GD/perl-GD.spec
   trunk/rpms/python-cddb/python-cddb.spec
   trunk/rpms/python-ogg/python-ogg.spec
   trunk/rpms/python-sexy/python-sexy.spec
   trunk/rpms/xmms-flac/xmms-flac.spec
Log:
Updates

Modified: trunk/rpms/apachetop/apachetop.spec
===================================================================
--- trunk/rpms/apachetop/apachetop.spec	2007-07-27 22:27:33 UTC (rev 5643)
+++ trunk/rpms/apachetop/apachetop.spec	2007-07-28 14:09:27 UTC (rev 5644)
@@ -14,12 +14,13 @@
 Summary: Top-like display of Apache logs
 Name: apachetop
 Version: 0.12.6
-Release: 1
+Release: 2
 License: BSD
 Group: Applications/Internet
 URL: http://www.webta.org/projects/apachetop/wiki/Download
 
 Source: http://www.webta.org/apachetop/apachetop-%{version}.tar.gz
+Patch: apachetop-0.12.6-gcc41.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: ncurses-devel, m4, readline-devel, gcc-c++, pcre-devel
@@ -33,15 +34,16 @@
 
 %prep
 %setup
+%patch0
 
 %build
 %configure \
-	--with-logfile="%{_localstatedir}/log/httpd/access_log"
+    --with-logfile="%{_localstatedir}/log/httpd/access_log"
 %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR="%{buildroot}"
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -53,12 +55,12 @@
 %{_bindir}/apachetop
 
 %changelog
+* Sat Jul 28 2007 Dag Wieers <dag at wieers.com> - 0.12.6-2
+- Added a patch to build on gcc 4.1. (Greg Swallow)
+
 * Wed Apr 19 2006 Dries Verachtert <dries at ulyssis.org> - 0.12.6-1
 - Updated to release 0.12.6.
 
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 0.12.5-1.2
-- Rebuild for Fedora Core 5.
-
 * Fri Aug 12 2005 Dag Wieers <dag at wieers.com> - 0.12.5-1
 - Updated to release 0.12.5.
 

Modified: trunk/rpms/clamav/clamav.spec
===================================================================
--- trunk/rpms/clamav/clamav.spec	2007-07-27 22:27:33 UTC (rev 5643)
+++ trunk/rpms/clamav/clamav.spec	2007-07-28 14:09:27 UTC (rev 5644)
@@ -11,7 +11,7 @@
 
 Summary: Anti-virus software
 Name: clamav
-Version: 0.91
+Version: 0.91.1
 Release: 1
 License: GPL
 Group: Applications/System
@@ -359,6 +359,9 @@
 %{_libdir}/pkgconfig/libclamav.pc
 
 %changelog
+* Tue Jul 17 2007 Dag Wieers <dag at wieers.com> - 0.91.1-1
+- Updated to release 0.91.1.
+
 * Wed Jul 11 2007 Dag Wieers <dag at wieers.com> - 0.91-1
 - Updated to release 0.91.
 

Modified: trunk/rpms/duma/duma.spec
===================================================================
--- trunk/rpms/duma/duma.spec	2007-07-27 22:27:33 UTC (rev 5643)
+++ trunk/rpms/duma/duma.spec	2007-07-28 14:09:27 UTC (rev 5644)
@@ -44,22 +44,23 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%{__install} -d %{buildroot}%{_bindir} %{buildroot}%{_mandir}/man3 %{buildroot}%{_libdir}
-%makeinstall BIN_INSTALL_DIR=%{buildroot}%{_bindir} LIB_INSTALL_DIR=%{buildroot}%{_libdir} MAN_INSTALL_DIR=%{buildroot}%{_mandir}/man3/
+%{__install} -d -m0755 %{buildroot}%{_bindir}
+%{__install} -d -m0755 %{buildroot}%{_mandir}/man3/
+%{__install} -d -m0755 %{buildroot}%{_libdir}
+%makeinstall BIN_INSTALL_DIR="%{buildroot}%{_bindir}" \
+    LIB_INSTALL_DIR="%{buildroot}%{_libdir}" \
+    MAN_INSTALL_DIR="%{buildroot}%{_mandir}/man3/"
 
-%post
-/sbin/ldconfig 2>/dev/null
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig 2>/dev/null
-
 %clean
 %{__rm} -rf %{buildroot}
 
 %files
 %defattr(-, root, root, 0755)
 %doc INSTALL README.txt TODO
-%doc %{_mandir}/man?/duma*
+%doc %{_mandir}/man3/duma.3*
 %{_bindir}/duma
 %{_libdir}/libduma.so.*
 
@@ -78,9 +79,6 @@
 * Thu Apr 27 2006 Dries Verachtert <dries at ulyssis.org> - 2.4.27-1
 - Updated to release 2.4.27.
 
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 2.4.26-2.2
-- Rebuild for Fedora Core 5.
-
 * Thu Nov 10 2005 Dries Verachtert <dries at ulyssis.org> - 2.4.26-2
 - Fixed the project url and source url.
 

Modified: trunk/rpms/gdal/gdal.spec
===================================================================
--- trunk/rpms/gdal/gdal.spec	2007-07-27 22:27:33 UTC (rev 5643)
+++ trunk/rpms/gdal/gdal.spec	2007-07-28 14:09:27 UTC (rev 5644)
@@ -41,19 +41,16 @@
 %setup
 
 %build
-%configure --datadir=%{_datadir}/gdal
+%configure --datadir="%{_datadir}/gdal"
 %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
+%{__make} install DESTDIR="%{buildroot}"
 
-%post
-/sbin/ldconfig 2>/dev/null
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig 2>/dev/null
-
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -70,8 +67,8 @@
 %{_bindir}/epsg_tr.py
 %{_bindir}/pct2rgb.py
 %{_bindir}/rgb2pct.py
-%{_libdir}/libgdal.so.*
 %{_datadir}/gdal/
+%{_libdir}/libgdal.so.*
 %{python_sitearch}/_gdalmodule.*
 %{python_sitearch}/gdal*.py
 %{python_sitearch}/ogr.py

Modified: trunk/rpms/guichan/guichan.spec
===================================================================
--- trunk/rpms/guichan/guichan.spec	2007-07-27 22:27:33 UTC (rev 5643)
+++ trunk/rpms/guichan/guichan.spec	2007-07-28 14:09:27 UTC (rev 5644)
@@ -10,7 +10,7 @@
 Release: 1
 License: BSD
 Group: Development/Libraries
-URL: http://guichan.sourceforge.net
+URL: http://guichan.sourceforge.net/
 
 Source: http://guichan.googlecode.com/files/guichan-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -35,7 +35,7 @@
 
 %prep
 %setup
-%{__perl} -pi -e 's|-Werror||g;' configure*
+%{__perl} -pi.orig -e 's|-Werror||g;' configure*
 
 %build
 %configure
@@ -43,14 +43,11 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR="%{buildroot}"
 
-%post
-/sbin/ldconfig 2>/dev/null
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig 2>/dev/null
-
 %clean
 %{__rm} -rf %{buildroot}
 

Modified: trunk/rpms/ifinfo/ifinfo.spec
===================================================================
--- trunk/rpms/ifinfo/ifinfo.spec	2007-07-27 22:27:33 UTC (rev 5643)
+++ trunk/rpms/ifinfo/ifinfo.spec	2007-07-28 14:09:27 UTC (rev 5644)
@@ -4,12 +4,12 @@
 Summary: Commandline network inquiry/formatting tool
 Name: ifinfo
 Version: 0.90
-Release: 1.2
+Release: 1
 License: GPL
 Group: Applications/System
 URL: http://scalableinformatics.com/ifinfo.html
 
-Source: http://scalableinformatics.com/downloads/ifinfo/ifinfo-%{version}.tar.gz
+Source: http://downloads.scalableinformatics.com/downloads/ifinfo/ifinfo-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: perl
@@ -29,7 +29,7 @@
 %install
 %{__rm} -rf %{buildroot}
 %{__install} -Dp -m0755 ifinfo %{buildroot}%{_bindir}/ifinfo
-%{__install} -Dp -m0755 ifinfo.8 %{buildroot}%{_mandir}/man8/ifinfo.8
+#%{__install} -Dp -m0755 ifinfo.8 %{buildroot}%{_mandir}/man8/ifinfo.8
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -37,13 +37,10 @@
 %files
 %defattr(-, root, root, 0755)
 %doc LICENSE README
-%doc %{_mandir}/man8/ifinfo
+#doc %{_mandir}/man8/ifinfo.8*
 %{_bindir}/ifinfo
 
 %changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 0.90-1.2
-- Rebuild for Fedora Core 5.
-
 * Wed Apr 06 2005 Dag Wieers <dag at wieers.com> - 0.90-1
 - Updates to release 0.90.
 

Modified: trunk/rpms/irssi/irssi.spec
===================================================================
--- trunk/rpms/irssi/irssi.spec	2007-07-27 22:27:33 UTC (rev 5643)
+++ trunk/rpms/irssi/irssi.spec	2007-07-28 14:09:27 UTC (rev 5644)
@@ -16,7 +16,7 @@
 Summary: Modular text-mode IRC client
 Name: irssi
 Version: 0.8.10a
-Release: 2
+Release: 3
 License: GPL
 Group: Applications/Communications
 URL: http://irssi.org/
@@ -27,7 +27,7 @@
 
 BuildRequires: autoconf, automake, gcc-c++,
 BuildRequires: glib2-devel, imlib-devel, ncurses-devel
-%{!?_Without_gc:BuildRequires: libgc-devel}
+%{!?_without_gc:BuildRequires: libgc-devel}
 
 Provides: irssi-devel = %{version}-%{release}
 Obsoletes: irssi-devel <= %{version}-%{release}
@@ -94,6 +94,9 @@
 %exclude %{_docdir}/irssi/
 
 %changelog
+* Fri Jul 27 2007 Dag Wieers <dag at wieers.com> - 0.8.10a-3
+- Rebuild against libgc-7.0.
+
 * Mon Apr 30 2007 Dag Wieers <dag at wieers.com> - 0.8.10a-2
 - Remove --with-perl="module" as it disables /script support. (Tom�Laovika)
 

Modified: trunk/rpms/libgc/libgc.spec
===================================================================
--- trunk/rpms/libgc/libgc.spec	2007-07-27 22:27:33 UTC (rev 5643)
+++ trunk/rpms/libgc/libgc.spec	2007-07-28 14:09:27 UTC (rev 5644)
@@ -77,7 +77,7 @@
 %files devel
 %defattr(-, root, root, 0755)
 %doc doc/*
-%doc %{_mandir}/man?/*
+%doc %{_mandir}/man1/libgc.1*
 %{_libdir}/libgc.so
 %{_libdir}/libgccpp.so
 %{_libdir}/libcord.so

Modified: trunk/rpms/madwifi/madwifi.spec
===================================================================
--- trunk/rpms/madwifi/madwifi.spec	2007-07-27 22:27:33 UTC (rev 5643)
+++ trunk/rpms/madwifi/madwifi.spec	2007-07-28 14:09:27 UTC (rev 5644)
@@ -1,10 +1,13 @@
 # $Id$
 # Authority: matthias
 
+%define real_name madwifi-ng
+
 Summary: Multiband Atheros Driver for Wireless Fidelity
 Name: madwifi
 Version: 0.9.4
-Release: 0.1.r2594
+%define real_version r2598-20070725
+Release: 0.1.r2598
 License: GPL
 Group: System Environment/Kernel
 URL: http://madwifi.org/
@@ -26,7 +29,7 @@
 
 
 %prep
-%setup -n madwifi-ng-r2594-20070719
+%setup -n %{real_name}-%{real_version}
 
 
 %build

Modified: trunk/rpms/metakit/metakit.spec
===================================================================
--- trunk/rpms/metakit/metakit.spec	2007-07-27 22:27:33 UTC (rev 5643)
+++ trunk/rpms/metakit/metakit.spec	2007-07-28 14:09:27 UTC (rev 5644)
@@ -51,21 +51,19 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%{__install} -d -m0755 %{buildroot}%{_libdir}/python%{python_version}/site-packages/
-%{__make} install -C unix DESTDIR=%{buildroot}
+%{__install} -d -m0755 %{buildroot}%{_libdir}/python%{python_version}
+%{__make} install -C unix DESTDIR="%{buildroot}"
 
+touch %{_libdir}/python%{python_version}/metakit.py{c,o}
 
 %clean
 %{__rm} -rf %{buildroot}
 
 
-%post
-/sbin/ldconfig 2>/dev/null
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig 2>/dev/null
 
-
 %files
 %defattr(-, root, root, 0755)
 %doc README
@@ -74,6 +72,8 @@
 #%{_libdir}/python%{python_version}/site-packages/metakit.py
 %{_libdir}/python%{python_version}/Mk4py.so
 %{_libdir}/python%{python_version}/metakit.py
+%ghost %{_libdir}/python%{python_version}/metakit.pyc
+%ghost %{_libdir}/python%{python_version}/metakit.pyo
 %{_lib32dir}/tcl*/Mk4tcl/
 
 

Modified: trunk/rpms/perl-GD/perl-GD.spec
===================================================================
--- trunk/rpms/perl-GD/perl-GD.spec	2007-07-27 22:27:33 UTC (rev 5643)
+++ trunk/rpms/perl-GD/perl-GD.spec	2007-07-28 14:09:27 UTC (rev 5644)
@@ -74,9 +74,6 @@
 %{_bindir}/bdf2gdfont.pl
 
 %changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 2.30-2.2
-- Rebuild for Fedora Core 5.
-
 * Sun Dec 25 2005 Dag Wieers <dag at wieers.com> - 2.30-2
 - Added PNG support. (Why was it gone ?)
 

Modified: trunk/rpms/python-cddb/python-cddb.spec
===================================================================
--- trunk/rpms/python-cddb/python-cddb.spec	2007-07-27 22:27:33 UTC (rev 5643)
+++ trunk/rpms/python-cddb/python-cddb.spec	2007-07-28 14:09:27 UTC (rev 5644)
@@ -9,7 +9,7 @@
 Summary: Fetch information about audio cd's
 Name: python-cddb
 Version: 1.4
-Release: 1.2
+Release: 2
 License: GPL
 Group: Applications/Internet
 URL: http://cddb-py.sourceforge.net/
@@ -17,8 +17,10 @@
 Source: http://dl.sf.net/cddb-py/CDDB-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires: python, python-devel
+BuildRequires: python-devel
 Requires: python
+Provides: python-CDDB = %{version}-%{release}
+Obsoletes: python-CDDB <= %{version}-%{release}
 
 %description
 This is a set of three modules to access the CDDB and FreeDB online
@@ -47,8 +49,8 @@
 %{python_sitearch}/cdrom.so
 
 %changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 1.4-1.2
-- Rebuild for Fedora Core 5.
+* Sat Jul 28 2007 Dag Wieers <dag at wieers.com> - 1.4-2
+- Provides and obsoletes python-CDDB.
 
 * Fri Mar 03 2006 Dries Verachtert <dries at ulyssis.org> - 1.4-1
 - Initial package.

Modified: trunk/rpms/python-ogg/python-ogg.spec
===================================================================
--- trunk/rpms/python-ogg/python-ogg.spec	2007-07-27 22:27:33 UTC (rev 5643)
+++ trunk/rpms/python-ogg/python-ogg.spec	2007-07-28 14:09:27 UTC (rev 5644)
@@ -52,8 +52,5 @@
 %{python_includedir}/pyogg/
 
 %changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 1.3-1.2
-- Rebuild for Fedora Core 5.
-
 * Sun May 08 2005 Dag Wieers <dag at wieers.com> - 1.3-1
 - Initial package. (using DAR)

Modified: trunk/rpms/python-sexy/python-sexy.spec
===================================================================
--- trunk/rpms/python-sexy/python-sexy.spec	2007-07-27 22:27:33 UTC (rev 5643)
+++ trunk/rpms/python-sexy/python-sexy.spec	2007-07-28 14:09:27 UTC (rev 5644)
@@ -1,60 +1,59 @@
 # $Id$
-# Authority:    hadams
+# Authority: hadams
 
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%define python_sitearch %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1)')
+
 %define real_name sexy-python
-Name:           python-sexy
-Version:        0.1.9
-Release:        3
 
-Summary:        Python bindings to libsexy
+Summary: Python bindings to libsexy
+Name: python-sexy
+Version: 0.1.9
+Release: 3
+License: LGPL
+Group: System Environment/Libraries
+URL: http://www.chipx86.com/wiki/Libsexy
 
-Group:          System Environment/Libraries
-License:        LGPL
-URL:            http://www.chipx86.com/wiki/Libsexy
-Source0:        http://releases.chipx86.com/libsexy/sexy-python/sexy-python-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source: http://releases.chipx86.com/libsexy/sexy-python/sexy-python-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires:  libsexy-devel >= 0.1.10
-BuildRequires:  python-devel >= 2
-BuildRequires:  pygtk2-devel >= 2.8.0
-BuildRequires:  libxml2-devel
-Requires:  	libsexy >= 0.1.10
+BuildRequires: python-devel >= 2.0
+BuildRequires: pygtk2-devel >= 2.8.0
+BuildRequires: libsexy-devel >= 0.1.10
+BuildRequires: libxml2-devel
+Requires: libsexy >= 0.1.10
 
 %description
 sexy-python is a set of Python bindings around libsexy.
 
 
 %prep
-%setup -q -n  %{real_name}-%{version}
+%setup -n %{real_name}-%{version}
 
 %build
 %configure --enable-docs
-make %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
-
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=${RPM_BUILD_ROOT} install
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR="%{buildroot}"
 
-
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
-
-
 %files
 %defattr(-, root, root, 0755)
-%doc AUTHORS COPYING ChangeLog NEWS README
+%doc AUTHORS ChangeLog COPYING NEWS README
+%dir %{python_sitearch}/gtk-2.0/
 %{python_sitearch}/gtk-2.0/sexy.so
+%dir %{_datadir}/pygtk/
+%dir %{_datadir}/pygtk/2.0/
+%dir %{_datadir}/pygtk/2.0/defs/
 %{_datadir}/pygtk/2.0/defs/sexy.defs
+%exclude %{python_sitearch}/gtk-2.0/sexy.la
 
-
-
 %changelog
-* Sun Jul 22 2007 Heiko Adams <info at fedora-blog.de> - 1.4-2
-- rebuild for rpmforge
+* Sun Jul 22 2007 Heiko Adams <info at fedora-blog.de> - 0.1.9-3
+- Rebuild for RPMforge.
 
 * Thu Oct 26 2006 Haïkel Guémar <karlthered at gmail.com> - 0.1.9-2
 - fixed requires that asked libsexy-devel instead of libsexy.

Modified: trunk/rpms/xmms-flac/xmms-flac.spec
===================================================================
--- trunk/rpms/xmms-flac/xmms-flac.spec	2007-07-27 22:27:33 UTC (rev 5643)
+++ trunk/rpms/xmms-flac/xmms-flac.spec	2007-07-28 14:09:27 UTC (rev 5644)
@@ -23,6 +23,8 @@
 Source: http://dl.sf.net/flac/flac-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: xmms-devel, libogg-devel, gettext
+### Doesn't actually require it, but at least we won't build it for older FLAC releases
+BuildRequires: flac-devel >= 1.1
 %{!?_without_gettextdevel:BuildRequires: gettext-devel}
 
 %description
@@ -88,4 +90,3 @@
   someone wants to provide a simple script to extract only the relevant sources
   in order to create a custom source package of the plugin only, that would
   be great!
-




More information about the commits mailing list