[svn] r5482 - in trunk/rpms: python-adns straw

Wed Jun 6 02:14:03 CEST 2007

Author: dag
Date: 2007-06-06 02:14:01 +0200 (Wed, 06 Jun 2007)
New Revision: 5482

Modified:
   trunk/rpms/python-adns/python-adns.spec
   trunk/rpms/straw/straw-0.21.1.spec
   trunk/rpms/straw/straw.spec
Log:
Updates

Modified: trunk/rpms/python-adns/python-adns.spec
===================================================================

--- trunk/rpms/python-adns/python-adns.spec	2007-06-05 20:23:23 UTC (rev 5481)
+++ trunk/rpms/python-adns/python-adns.spec	2007-06-06 00:14:01 UTC (rev 5482)
@@ -8,13 +8,14 @@
 
 Summary: Python bindings for GNU adns library
 Name: python-adns
-Version: 1.1.0
-Release: 1.2
+Version: 1.1.1
+Release: 1
 License: GPL
 Group: Development/Libraries
 URL: http://dustman.net/andy/python/adns-python/
 
 Source: http://dustman.net/andy/python/adns-python/%{version}/adns-python-%{version}.tar.gz
+Patch: python-adns-1.1.0-srv.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: python, python-devel, adns-devel
@@ -26,9 +27,10 @@
 
 %prep
 %setup -n %{real_name}-%{version}
+%patch0 -p1 -b .srv
 
 %build
-CFLAGS="%{optflags} -fPIC -fomit-frame-pointer -DPIC" %{__python} setup.py build
+CFLAGS="%{optflags}" %{__python} setup.py build
 
 %install
 %{__rm} -rf %{buildroot}
@@ -40,11 +42,14 @@
 %files
 %defattr(-, root, root, 0755)
 %doc GPL README
-%{python_sitearch}/*
+%{python_sitearch}/adns.so
+%{python_sitearch}/*.py
+%{python_sitearch}/*.pyc
+%ghost %{python_sitearch}/*.pyo
 
 %changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 1.1.0-1.2
-- Rebuild for Fedora Core 5.
+* Wed Jun 06 2007 Dag Wieers <dag at wieers.com> - 1.1.1-1
+- Updated to release 1.1.1.
 
 * Fri Nov 11 2005 Dries Verachtert <dries at ulyssis.org> - 1.1.0-1
 - Updated to release 1.1.0.

Modified: trunk/rpms/straw/straw-0.21.1.spec
===================================================================
--- trunk/rpms/straw/straw-0.21.1.spec	2007-06-05 20:23:23 UTC (rev 5481)
+++ trunk/rpms/straw/straw-0.21.1.spec	2007-06-06 00:14:01 UTC (rev 5482)
@@ -13,12 +13,11 @@
 Release: 2
 License: GPL
 Group: Applications/Internet
-URL: http://www.nongnu.org/straw/
+URL: http://www.gnome.org/projects/straw/
 
 Source: http://savannah.nongnu.org/download/straw/straw.pkg/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-
 BuildRequires: python >= 2.2, gtk2 >= 2.0, libglade2 >= 2.0
 BuildRequires: adns, libxml2-python >= 1.99.13
 #BuildRequires: pyorbit, pygtk2 >= 1.99.13

Modified: trunk/rpms/straw/straw.spec
===================================================================
--- trunk/rpms/straw/straw.spec	2007-06-05 20:23:23 UTC (rev 5481)
+++ trunk/rpms/straw/straw.spec	2007-06-06 00:14:01 UTC (rev 5482)
@@ -2,26 +2,31 @@
 # Authority: dag
 # Upstream: Juri Pakaste <juri$iki,fi>
 
+%define python_sitelib %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib()')
+
+%define desktop_vendor rpmforge
+
 Summary: Desktop news aggregator
 Name: straw
-Version: 0.26
-Release: 1.2
+Version: 0.27
+Release: 1
 License: GPL
 Group: Applications/Internet
-URL: http://www.nongnu.org/straw/
+URL: http://www.gnome.org/projects/straw/
 
-Source: http://savannah.nongnu.org/download/straw/straw-%{version}.tar.gz
+Source: http://download.gnome.org/sources/straw/%{version}/straw-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires: python >= 2.2, gtk2 >= 2.4, libglade2 >= 2.3
+BuildArch: noarch
+BuildRequires: python >= 2.4, gtk2 >= 2.4, libglade2 >= 2.3
 BuildRequires: python-adns, python-bsddb3, libxml2-python >= 1.99.13
 BuildRequires: pyorbit, pygtk2 >= 1.99.13, pygtk2-libglade
 BuildRequires: gnome-python2-gtkhtml2, gnome-python2-gconf, gnome-python2-gnomevfs
+Requires: python >= 2.4, gtk2 >= 2.4, libglade2 >= 2.3
+Requires: python-adns, python-bsddb3, libxml2-python >= 1.99.13, mx
+Requires: pyorbit, pygtk2 >= 1.99.13, pygtk2-libglade
+Requires: gnome-python2-gtkhtml2, gnome-python2-gconf, gnome-python2-gnomevfs
 
-Requires: python >= 2.2, gtk2 >= 2.4, libglade2 >= 2.0
-Requires: libxml2-python >= 1.99.13, python-adns, python-bsddb3, mx
-Requires: gnome-python2-gconf, gnome-python2-gnomevfs, pyorbit, pygtk2 >= 1.99.13
-
 %description
 Straw is a desktop news aggregator for the GNOME environment. Its aim
 is to be a faster, easier and more accessible way to read news and
@@ -48,15 +53,13 @@
 
 %install
 %{__rm} -rf %{buildroot}
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-python setup.py install \
-	--prefix="%{buildroot}%{_prefix}" \
-	--sysconfdir="%{buildroot}%{_sysconfdir}"
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
+%{__python} setup.py install -O1 --skip-build --root="%{buildroot}" --prefix="%{_prefix}" --sysconfdir="%{_sysconfdir}"
 %find_lang %{name}
 
 %{__install} -Dp -m0644 data/straw.schemas %{buildroot}%{_sysconfdir}/gconf/schemas/straw.schemas
 
-desktop-file-install --vendor gnome --delete-original \
+desktop-file-install --vendor %{desktop_vendor} --delete-original \
 	--add-category X-Red-Hat-Base                 \
 	--dir %{buildroot}%{_datadir}/applications    \
 	%{buildroot}%{_datadir}/applications/*.desktop
@@ -70,16 +73,16 @@
 
 %files -f %{name}.lang
 %defattr(-, root, root, 0755)
-%config %{_sysconfdir}/gconf/schemas/*.schemas
-%{_bindir}/*
-%{_libdir}/python*/site-packages/straw/
+%config %{_sysconfdir}/gconf/schemas/straw.schemas
+%{_bindir}/straw
+%{python_sitelib}/straw/
 %{_datadir}/straw/
-%{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/*.png
+%{_datadir}/applications/%{desktop_vendor}-straw.desktop
+%{_datadir}/pixmaps/straw.png
 
 %changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 0.26-1.2
-- Rebuild for Fedora Core 5.
+* Wed Jun 06 2007 Dag Wieers <dag at wieers.com> - 0.27-1
+- Updated to release 0.27.
 
 * Sun Mar 12 2006 Dag Wieers <dag at wieers.com> - 0.26-1
 - Updated to release 0.26.

