[svn] r5083 - in trunk/rpms: awstats kannel mpg123 oorexx

[packagers at lists.rpmforge.net]

Author: dag
Date: 2007-01-16 13:53:09 +0100 (Tue, 16 Jan 2007)
New Revision: 5083

Modified:
   trunk/rpms/awstats/awstats.spec
   trunk/rpms/kannel/kannel.spec
   trunk/rpms/mpg123/mpg123.spec
   trunk/rpms/oorexx/oorexx.spec
Log:
Updates

Modified: trunk/rpms/awstats/awstats.spec
===================================================================
--- trunk/rpms/awstats/awstats.spec	2007-01-16 12:01:20 UTC (rev 5082)
+++ trunk/rpms/awstats/awstats.spec	2007-01-16 12:53:09 UTC (rev 5083)
@@ -74,9 +74,9 @@
 #Alias /css/ %{_localstatedir}/www/awstats/css/
 #Alias /js/ %{_localstatedir}/www/awstats/js/
 EOF
+
 dos2unix tools/logresolvemerge.pl
 
-
 %install
 %{__rm} -rf %{buildroot}
 %{__install} -Dp -m0644 wwwroot/cgi-bin/awstats.model.conf %{buildroot}%{_sysconfdir}/awstats/awstats.model.conf
@@ -115,9 +115,6 @@
 - Updated to release 6.6.
 - Convert logresolvemerge.pl to unix line endings, thanks to Christoph Maser.
 
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 6.5-1.2
-- Rebuild for Fedora Core 5.
-
 * Fri Jan 13 2006 Dag Wieers <dag at wieers.com> - 6.5-1
 - Updated to release 6.5.
 

Modified: trunk/rpms/kannel/kannel.spec
===================================================================
--- trunk/rpms/kannel/kannel.spec	2007-01-16 12:01:20 UTC (rev 5082)
+++ trunk/rpms/kannel/kannel.spec	2007-01-16 12:53:09 UTC (rev 5083)
@@ -3,8 +3,12 @@
 
 %{?dist: %{expand: %%define %dist 1}}
 
-# kannel seems to need sqlite 2 and not 3
-%{?el4:%define _without_sqlite2 1}
+### Kannel needs sqlite2, on older systems it is packaged as sqlite, not sqlite2
+%{?el4:%define _without_sqlite2_package 1}
+%{?el3:%define _without_sqlite2_package 1}
+%{?rh9:%define _without_sqlite2_package 1}
+%{?rh7:%define _without_sqlite2_package 1}
+%{?el2:%define _without_sqlite2_package 1}
 
 Summary: WAP and SMS gateway
 Name: kannel
@@ -23,8 +27,8 @@
 BuildRequires: libxml2-devel, openssl-devel, zlib-devel
 BuildRequires: pcre-devel
 # DB backends
-%{!?_without_sqlite2:BuildRequires: sqlite2-devel}
-%{?_without_sqlite2:BuildRequires: sqlite-devel}
+%{!?_without_sqlite2_package:BuildRequires: sqlite2-devel}
+%{?_without_sqlite2_package:BuildRequires: sqlite-devel >= 2.0}
 # For the docs... I think we need transfig too, so disable for now.
 #BuildRequires: jadetex, tetex-dvips, docbook-dtds, docbook-style-dsssl
 

Modified: trunk/rpms/mpg123/mpg123.spec
===================================================================
--- trunk/rpms/mpg123/mpg123.spec	2007-01-16 12:01:20 UTC (rev 5082)
+++ trunk/rpms/mpg123/mpg123.spec	2007-01-16 12:53:09 UTC (rev 5083)
@@ -42,7 +42,7 @@
 
 Summary: MPEG audio player
 Name: mpg123
-Version: 0.63
+Version: 0.64
 Release: 1
 License: GPL/LGPL
 Group: Applications/Multimedia
@@ -95,6 +95,9 @@
 
 
 %changelog
+* Tue Jan 16 2007 Dag Wieers <dag at wieers.com> - 0.64-1
+- Updated to release 0.64.
+
 * Mon Jan 15 2007 Dag Wieers <dag at wieers.com> - 0.63-1
 - Updated to release 0.63.
 

Modified: trunk/rpms/oorexx/oorexx.spec
===================================================================
--- trunk/rpms/oorexx/oorexx.spec	2007-01-16 12:01:20 UTC (rev 5082)
+++ trunk/rpms/oorexx/oorexx.spec	2007-01-16 12:53:09 UTC (rev 5083)
@@ -6,8 +6,8 @@
 
 Summary: Open Object Rexx
 Name: oorexx
-Version: 3.0.0
-Release: 1.2
+Version: 3.1.1
+Release: 1
 License: CPL
 Group: Development/Languages
 URL: http://www.oorexx.org/
@@ -16,7 +16,9 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gcc-c++, ncurses-devel
 
-Obsoletes: ooRexx <= %{version}
+ExclusiveArch: i386
+Obsoletes: ooRexx <= %{version}-%{release}
+Obsoletes: oorexx-libs <= %{version}-%{release}
 
 %description
 Open Object Rexx is an object-oriented scripting language. The language
@@ -31,10 +33,8 @@
 %prep
 %setup -n %{real_name}-%{version}
 
-#%ifarch x86_64
-#%{__perl} -pi.orig -e 's|-m32|-m64|g;' configure
-#%endif
-%{__perl} -pi.orig -e 's|-m32||g;' configure
+### Fix shell interpreter path
+%{__perl} -pi.orig -e 's|^#!/usr/bin/sh|#!/bin/sh|g' samples/unix/trexx
 
 %build
 %configure \
@@ -45,21 +45,23 @@
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR="%{buildroot}"
 
-### Fix library symlinks
-for lib in $(ls %{buildroot}%{_libdir}/ooRexx/*.so.?.?.?); do
-	%{__ln_s} -f $(basename $lib) ${lib//%\.?}
-	%{__ln_s} -f $(basename $lib) ${lib//%\.?\.?}
-	%{__ln_s} -f $(basename $lib) ${lib//%\.?\.?\.?}
-done
+### Clean up docdir
+%{__find} samples/ -name 'Makefile*' | xargs %{__rm} -f
 
+%{__rm} -f %{buildroot}%{_datadir}/ooRexx/rexx.{csh,sh}
+
 %clean
 %{__rm} -rf %{buildroot}
 
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
 %files
 %defattr(-, root, root, 0755)
 %doc CPLv1.0.txt INSTALL samples/
 %doc %{_mandir}/man1/rexx*.1*
 %doc %{_mandir}/man1/rx*.1*
+%{_bindir}/oorexx-config
 %{_bindir}/rexx*
 %{_bindir}/rx*
 %{_datadir}/ooRexx/
@@ -67,8 +69,8 @@
 %{_libdir}/ooRexx/
 
 %changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 3.0.0-1.2
-- Rebuild for Fedora Core 5.
+* Mon Jan 15 2007 Dag Wieers <dag at wieers.com> - 3.1.1-1
+- Updated to release 3.1.1.
 
 * Mon Mar 28 2005 Dag Wieers <dag at wieers.com> - 3.0.0-1
 - Initial package. (using DAR)