[svn] r5231 - in trunk/rpms: . clamav clamtk conserver fio
fontforge fslint icewm k9copy libextractor libmrss libnxml
moin nagios-plugins nfswatch proxytunnel rdup revelation
rsstail typespeed wine xine xine-lib zvbi
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Sun Mar 18 21:47:01 CET 2007
Author: dag
Date: 2007-03-18 21:46:57 +0100 (Sun, 18 Mar 2007)
New Revision: 5231
Added:
trunk/rpms/k9copy/
trunk/rpms/k9copy/k9copy.spec
trunk/rpms/moin/
trunk/rpms/moin/moin-1.3.5-config.patch
trunk/rpms/moin/moin-1.3.5-xml_newline.patch
trunk/rpms/moin/moin-1.3.spec
trunk/rpms/moin/moin-1.5.2-config.patch
trunk/rpms/moin/moin-1.5.2-xml_newline.patch
trunk/rpms/moin/moin.spec
Modified:
trunk/rpms/clamav/clamav.spec
trunk/rpms/clamtk/clamtk.spec
trunk/rpms/conserver/conserver.spec
trunk/rpms/fio/fio.spec
trunk/rpms/fontforge/fontforge.spec
trunk/rpms/fslint/fslint.spec
trunk/rpms/icewm/icewm.spec
trunk/rpms/libextractor/libextractor.spec
trunk/rpms/libmrss/libmrss.spec
trunk/rpms/libnxml/libnxml.spec
trunk/rpms/nagios-plugins/nagios-plugins.spec
trunk/rpms/nfswatch/nfswatch.spec
trunk/rpms/proxytunnel/proxytunnel.spec
trunk/rpms/rdup/rdup.spec
trunk/rpms/revelation/revelation.spec
trunk/rpms/rsstail/rsstail.spec
trunk/rpms/typespeed/typespeed.spec
trunk/rpms/wine/wine.spec
trunk/rpms/xine-lib/xine-lib.spec
trunk/rpms/xine/xine.spec
trunk/rpms/zvbi/zvbi.spec
Log:
Updates.
Modified: trunk/rpms/clamav/clamav.spec
===================================================================
--- trunk/rpms/clamav/clamav.spec 2007-03-14 10:55:34 UTC (rev 5230)
+++ trunk/rpms/clamav/clamav.spec 2007-03-18 20:46:57 UTC (rev 5231)
@@ -134,6 +134,7 @@
' etc/clamd.conf
%{__perl} -pi.orig -e '
+ s|^(Example)|#$1|;
s|^#(DatabaseDirectory) .+$|$1 %{_localstatedir}/clamav|;
s|^#(UpdateLogFile) .+$|$1 %{_localstatedir}/log/clamav/freshclam.log|;
s|^#(LogSyslog)|$1|;
Modified: trunk/rpms/clamtk/clamtk.spec
===================================================================
--- trunk/rpms/clamtk/clamtk.spec 2007-03-14 10:55:34 UTC (rev 5230)
+++ trunk/rpms/clamtk/clamtk.spec 2007-03-18 20:46:57 UTC (rev 5231)
@@ -13,7 +13,7 @@
Summary: Easy to use front-end for ClamAV
Name: clamtk
-Version: 2.28
+Version: 2.30
Release: 1
License: Perl
Group: Applications/File
@@ -24,7 +24,7 @@
%{!?_without_freedesktop:BuildRequires: desktop-file-utils}
Requires: perl-Gtk2, perl-File-Find-Rule, perl-Date-Calc, perl-libwww-perl
-Requires: clamav >= 0.83, clamav-db
+Requires: clamav >= 0.90, clamav-db
Obsoletes: clamtk2
@@ -82,6 +82,9 @@
%{_datadir}/pixmaps/clamtk.png
%changelog
+* Sun Mar 18 2007 Dag Wieers <dag at wieers.com> - 2.30-1
+- Updated to release 2.30.
+
* Fri Feb 23 2007 Dag Wieers <dag at wieers.com> - 2.28-1
- Updated to release 2.28.
Modified: trunk/rpms/conserver/conserver.spec
===================================================================
--- trunk/rpms/conserver/conserver.spec 2007-03-14 10:55:34 UTC (rev 5230)
+++ trunk/rpms/conserver/conserver.spec 2007-03-18 20:46:57 UTC (rev 5231)
@@ -7,7 +7,7 @@
Summary: Serial console server daemon/client
Name: conserver
-Version: 8.1.14
+Version: 8.1.15
Release: 1
License: BSD style
Group: System Environment/Daemons
@@ -71,6 +71,9 @@
%exclude %{_datadir}/examples/
%changelog
+* Sun Mar 18 2007 Dag Wieers <dag at wieers.com> - 8.1.15-1
+- Updated to release 8.1.15.
+
* Tue Apr 11 2006 Dag Wieers <dag at wieers.com> - 8.1.14-1
- Updated to release 8.1.14.
Modified: trunk/rpms/fio/fio.spec
===================================================================
--- trunk/rpms/fio/fio.spec 2007-03-14 10:55:34 UTC (rev 5230)
+++ trunk/rpms/fio/fio.spec 2007-03-18 20:46:57 UTC (rev 5231)
@@ -4,7 +4,7 @@
Summary: I/O benchmark and stress/hardware verification tool
Name: fio
-Version: 1.13
+Version: 1.14
Release: 1
License: GPL
Group: Applications/System
@@ -51,6 +51,9 @@
#%{_libdir}/fio/
%changelog
+* Sun Mar 18 2007 Dag Wieers <dag at wieers.com> - 1.14-1
+- Updated to release 1.14.
+
* Sun Mar 04 2007 Dag Wieers <dag at wieers.com> - 1.13-1
- Updated to release 1.13.
Modified: trunk/rpms/fontforge/fontforge.spec
===================================================================
--- trunk/rpms/fontforge/fontforge.spec 2007-03-14 10:55:34 UTC (rev 5230)
+++ trunk/rpms/fontforge/fontforge.spec 2007-03-18 20:46:57 UTC (rev 5231)
@@ -3,6 +3,12 @@
%{?dist: %{expand: %%define %dist 1}}
+%{!?dist:%define _with_modxorg 1}
+%{?fc7: %define _with_modxorg 1}
+%{?el5: %define _with_modxorg 1}
+%{?fc6: %define _with_modxorg 1}
+%{?fc5: %define _with_modxorg 1}
+
%{?rh7:%define _without_freedesktop 1}
%{?el2:%define _without_freedesktop 1}
@@ -19,9 +25,11 @@
Source: http://dl.sf.net/fontforge/fontforge_full-20050502.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: XFree86-devel, freetype-devel, libuninameslist-devel
+BuildRequires: freetype-devel, libuninameslist-devel
BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, libungif-devel
BuildRequires: libxml2-devel
+%{?_with_modxorg:BuildRequires: libX11-devel, libSM-devel, libXi-devel}
+%{!?_with_modxorg:BuildRequires: XFree86-devel}
%{!?_without_freedesktop:BuildRequires: desktop-file-utils}
Obsoletes: pfaedit
@@ -99,8 +107,5 @@
%exclude %{_libdir}/*.so
%changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 0.0-0.cvs20050502.2
-- Rebuild for Fedora Core 5.
-
* Mon May 30 2005 Dag Wieers <dag at wieers.com> - 0.0-0.20050502
- Initial package. (using DAR)
Modified: trunk/rpms/fslint/fslint.spec
===================================================================
--- trunk/rpms/fslint/fslint.spec 2007-03-14 10:55:34 UTC (rev 5230)
+++ trunk/rpms/fslint/fslint.spec 2007-03-18 20:46:57 UTC (rev 5231)
@@ -15,7 +15,7 @@
Summary: Utility to find and clean "lint" on a filesystem
Name: fslint
-Version: 2.18
+Version: 2.20
Release: 1
License: GPL
Group: System Environment/Base
@@ -104,6 +104,9 @@
%{!?_without_freedesktop:%{_datadir}/applications/%{desktop_vendor}-fslint.desktop}
%changelog
+* Sun Mar 18 2007 Dag Wieers <dag at wieers.com> - 2.20-1
+- Updated to release 2.20.
+
* Tue Dec 26 2006 Dag Wieers <dag at wieers.com> - 2.18-1
- Updated to release 2.18.
Modified: trunk/rpms/icewm/icewm.spec
===================================================================
--- trunk/rpms/icewm/icewm.spec 2007-03-14 10:55:34 UTC (rev 5230)
+++ trunk/rpms/icewm/icewm.spec 2007-03-18 20:46:57 UTC (rev 5231)
@@ -28,11 +28,11 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: autoconf, automake, libtool
-BuildRequires: imlib-devel, libpng-devel, kdelibs
+BuildRequires: imlib2-devel, libpng-devel, kdelibs
BuildRequires: gcc-c++, gettext
%{!?_without_gnome2:BuildRequires: gnome-desktop-devel}
%{!?_with_modxorg:BuildRequires: XFree86-devel, XFree86-font-utils}
-%{?_with_modxorg:BuildRequires: xorg-x11-devel, xorg-x11-font-utils}
+%{?_with_modxorg:BuildRequires: libX11-devel, xorg-x11-font-utils}
Obsoletes: icewm-common <= %{version}
Obsoletes: icewm-l10n <= %{version}
Obsoletes: icewm-menu-gnome2 <= %{version}
Added: trunk/rpms/k9copy/k9copy.spec
===================================================================
--- trunk/rpms/k9copy/k9copy.spec (rev 0)
+++ trunk/rpms/k9copy/k9copy.spec 2007-03-18 20:46:57 UTC (rev 5231)
@@ -0,0 +1,52 @@
+# $Id$
+# Authority: dag
+
+Summary: Video DVD backup tool
+Name: k9copy
+Version: 1.1.0
+Release: 1
+License: GPL
+Group: Applications/Multimedia
+URL: http://k9copy.sf.net/
+
+Source: http://dl.sf.net/k9copy/k9copy-%{version}.tar.gz
+Source1: http://dl.sf.net/vamps/vamps-0.99.2.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+%description
+k9copy is a DVD backup utility which allows copying of one or more titles
+from a 9.6 GB DVD to a normal DVD.
+
+%prep
+%setup -a 1
+
+%build
+source /etc/profile.d/qt.sh
+%configure
+%{__make} -C vamps-* %{?_smp_mflags} PREFIX="%{_prefix}" CFLAGS="%{optflags} -DHAVE_BUILTIN_EXPECT"
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+source /etc/profile.d/qt.sh
+%{__make} install -C vamps-* PREFIX="%{buildroot}%{_prefix}"
+%{__make} install DESTDIR="%{buildroot}"
+%find_lang %{name}
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files -f %{name}.lang
+%defattr(-, root, root, 0755)
+%doc %{_docdir}/HTML/*/k9copy/
+%{_bindir}/*
+%{_libdir}/libk9copy.so*
+%{_datadir}/applnk/Multimedia/k9copy.desktop
+%{_datadir}/apps/konqueror/servicemenus/k9copy_open.desktop
+%{_datadir}/apps/k9copy
+%{_datadir}/icons/*/*/*/*
+%exclude %{_includedir}
+
+%changelog
+* Sun Mar 11 2007 Dag Wieers <dag at wieers.com> - 1.1.0-1
+- Initial package. (using DAR)
Property changes on: trunk/rpms/k9copy/k9copy.spec
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Modified: trunk/rpms/libextractor/libextractor.spec
===================================================================
--- trunk/rpms/libextractor/libextractor.spec 2007-03-14 10:55:34 UTC (rev 5230)
+++ trunk/rpms/libextractor/libextractor.spec 2007-03-18 20:46:57 UTC (rev 5231)
@@ -13,7 +13,7 @@
Summary: Meta-data extraction library
Name: libextractor
-Version: 0.5.17a
+Version: 0.5.18
Release: 1
License: GPL
Group: System Environment/Libraries
@@ -100,6 +100,9 @@
#%{python_sitearch}/extractor.so
%changelog
+* Sun Mar 18 2007 Dag Wieers <dag at wieers.com> - 0.5.18-1
+- Updated to release 0.5.18.
+
* Wed Jan 10 2007 Dag Wieers <dag at wieers.com> - 0.5.17a-1
- Updated to release 0.5.17a.
Modified: trunk/rpms/libmrss/libmrss.spec
===================================================================
--- trunk/rpms/libmrss/libmrss.spec 2007-03-14 10:55:34 UTC (rev 5230)
+++ trunk/rpms/libmrss/libmrss.spec 2007-03-18 20:46:57 UTC (rev 5231)
@@ -4,8 +4,8 @@
Summary: Library for parsing, writing and creating RSS files or streams
Name: libmrss
-Version: 0.7
-Release: 1.2
+Version: 0.17
+Release: 1
License: GPL
Group: Development/Libraries
URL: http://www2.autistici.org/bakunin/libmrss/
@@ -37,14 +37,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}
@@ -57,13 +54,13 @@
%defattr(-, root, root, 0755)
%{_includedir}/mrss.h
%{_libdir}/libmrss.a
+%exclude %{_libdir}/libmrss.la
%{_libdir}/libmrss.so
%{_libdir}/pkgconfig/mrss.pc
-%exclude %{_libdir}/*.la
%changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 0.7-1.2
-- Rebuild for Fedora Core 5.
+* Sun Mar 18 2007 Dag Wieers <dag at wieers.com> - 0.17-1
+- Updated to release 0.17.
* Sun Jan 29 2006 Dries Verachtert <dries at ulyssis.org> - 0.7-1
- Initial package.
Modified: trunk/rpms/libnxml/libnxml.spec
===================================================================
--- trunk/rpms/libnxml/libnxml.spec 2007-03-14 10:55:34 UTC (rev 5230)
+++ trunk/rpms/libnxml/libnxml.spec 2007-03-18 20:46:57 UTC (rev 5231)
@@ -4,7 +4,7 @@
Summary: Library for parsing, writing and creating XML
Name: libnxml
-Version: 0.16
+Version: 0.17
Release: 1
License: GPL
Group: Development/Libraries
@@ -57,10 +57,13 @@
%{_includedir}/nxml.h
%{_libdir}/libnxml.a
%{_libdir}/libnxml.so
-%exclude %{_libdir}/*.la
+%exclude %{_libdir}/libnxml.la
%{_libdir}/pkgconfig/nxml.pc
%changelog
+* Sun Mar 18 2007 Dag Wieers <dag at wieers.com> - 0.17-1
+- Updated to release 0.17.
+
* Sat Dec 30 2006 Dries Verachtert <dries at ulyssis.org> - 0.16-1
- Updated to release 0.16.
Added: trunk/rpms/moin/moin-1.3.5-config.patch
===================================================================
--- trunk/rpms/moin/moin-1.3.5-config.patch (rev 0)
+++ trunk/rpms/moin/moin-1.3.5-config.patch 2007-03-18 20:46:57 UTC (rev 5231)
@@ -0,0 +1,65 @@
+diff -Naupr moin-1.3.5.orig/MoinMoin/multiconfig.py moin-1.3.5/MoinMoin/multiconfig.py
+--- moin-1.3.5.orig/MoinMoin/multiconfig.py 2005-07-30 17:58:51.000000000 +0200
++++ moin-1.3.5/MoinMoin/multiconfig.py 2005-08-15 13:42:13.000000000 +0200
+@@ -151,7 +151,7 @@ class DefaultConfig:
+
+ FIXME: update according to MoinMoin:UpdateConfiguration
+ """
+- acl_enabled = 0
++ acl_enabled = 1
+ # All acl_right lines must use unicode!
+ acl_rights_default = u"Trusted:read,write,delete,revert Known:read,write,delete,revert All:read,write"
+ acl_rights_before = u""
+@@ -165,7 +165,7 @@ class DefaultConfig:
+ attachments = None # {'dir': path, 'url': url-prefix}
+ auth_http_enabled = 0
+ auth_http_insecure = 0
+- bang_meta = 0
++ bang_meta = 1
+ backtick_meta = 1
+ caching_formats = ['text_html']
+ changed_time_fmt = '%H:%M'
+@@ -274,13 +274,13 @@ class DefaultConfig:
+ 'remember_last_visit': 0,
+ 'show_fancy_links': 1,
+ 'show_nonexist_qm': nonexist_qm,
+- 'show_page_trail': 1,
++ 'show_page_trail': 0,
+ 'show_toolbar': 1,
+ 'show_topbottom': 0,
+ 'show_fancy_diff': 1,
+ 'wikiname_add_spaces': 0,
+ 'remember_me': 1,
+- 'want_trivial': 0,
++ 'want_trivial': 1,
+ }
+ # don't let the user change those
+ # user_checkbox_disable = ['disabled', 'want_trivial']
+diff -Naupr moin-1.3.5.orig/wiki/config/wikiconfig.py moin-1.3.5/wiki/config/wikiconfig.py
+--- moin-1.3.5.orig/wiki/config/wikiconfig.py 2005-06-26 17:43:05.000000000 +0200
++++ moin-1.3.5/wiki/config/wikiconfig.py 2005-08-15 13:43:18.000000000 +0200
+@@ -54,14 +54,14 @@ class Config(DefaultConfig):
+
+ # Where your mutable wiki pages are. You want to make regular
+ # backups of this directory.
+- data_dir = './data/'
++ data_dir = '../data/'
+
+ # Where read-only system and help page are. You might want to share
+ # this directory between several wikis. When you update MoinMoin,
+ # you can safely replace the underlay directory with a new one. This
+ # directory is part of MoinMoin distribution, you don't have to
+ # backup it.
+- data_underlay_dir = './underlay/'
++ data_underlay_dir = '../underlay/'
+
+ # This must be '/wiki' for twisted and standalone. For CGI, it should
+ # match your Apache Alias setting.
+@@ -115,6 +115,7 @@ class Config(DefaultConfig):
+ u'%(page_front_page)s',
+ u'RecentChanges',
+ u'FindPage',
++ u'SiteNavigation',
+ u'HelpContents',
+ ]
+
Added: trunk/rpms/moin/moin-1.3.5-xml_newline.patch
===================================================================
--- trunk/rpms/moin/moin-1.3.5-xml_newline.patch (rev 0)
+++ trunk/rpms/moin/moin-1.3.5-xml_newline.patch 2007-03-18 20:46:57 UTC (rev 5231)
@@ -0,0 +1,12 @@
+diff -Naupr moin-1.3.5.orig/MoinMoin/formatter/xml_docbook.py moin-1.3.5/MoinMoin/formatter/xml_docbook.py
+--- moin-1.3.5.orig/MoinMoin/formatter/xml_docbook.py 2005-07-26 20:46:50.000000000 +0200
++++ moin-1.3.5/MoinMoin/formatter/xml_docbook.py 2005-12-19 10:06:34.000000000 +0100
+@@ -98,7 +98,7 @@ class Formatter(FormatterBase):
+
+ def linebreak(self, preformatted=1):
+ if preformatted:
+- self.text('\\n')
++ self.text('\n')
+ else:
+ #this should not happen
+ #self.text('CRAP')
Added: trunk/rpms/moin/moin-1.3.spec
===================================================================
--- trunk/rpms/moin/moin-1.3.spec (rev 0)
+++ trunk/rpms/moin/moin-1.3.spec 2007-03-18 20:46:57 UTC (rev 5231)
@@ -0,0 +1,64 @@
+# $Id$
+# Authority: dag
+
+%define python_sitelib %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib()')
+
+Summary: Advanced, easy to use and extensible WikiEngine
+Name: moin
+Version: 1.3.5
+Release: 1
+License: GPL
+Group: Applications/Internet
+URL: http://moinmoin.wikiwikiweb.de/
+
+Source: http://dl.sf.net/moin/moin-%{version}.tar.gz
+Patch0: moin-1.3.5-xml_newline.patch
+Patch1: moin-1.3.5-config.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildArch: noarch
+BuildRequires: python-devel >= 2.2.2
+Requires: python >= 2.2.2
+
+Provides: moinmoin = %{version}
+Obsoletes: moinmoin <= %{version}-%{release}
+
+%description
+MoinMoin is an advanced, easy to use and extensible WikiEngine with a large
+community of users. Said in a few words, it is about collaboration on easily
+editable web pages.
+
+%prep
+%setup
+### Remove CR for diff in EL4 and older
+%{__perl} -pi.orig -e 's|\r$||' MoinMoin/formatter/xml_docbook.py
+%patch0 -p1 -b .xml_newline
+%patch1 -p1 -b .config
+
+%build
+%{__python} setup.py build
+
+%install
+%{__rm} -rf %{buildroot}
+%{__python} setup.py install --root="%{buildroot}"
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+%doc README docs/CHANGES* docs/README* docs/*.html docs/licenses/
+%{_bindir}/cachecleaner
+%{_bindir}/globaledit
+%{_bindir}/moin-build-index
+%{_bindir}/moin-dump
+%{_bindir}/moin-optimize-index
+%{_bindir}/pagescleaner
+%{_bindir}/print-stats
+%{_bindir}/repair-language
+%{_datadir}/moin/
+%{python_sitelib}/MoinMoin/
+
+%changelog
+* Sun Mar 11 2007 Dag Wieers <dag at wieers.com> - 1.3.5-1
+- Initial package.
Property changes on: trunk/rpms/moin/moin-1.3.spec
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Added: trunk/rpms/moin/moin-1.5.2-config.patch
===================================================================
--- trunk/rpms/moin/moin-1.5.2-config.patch (rev 0)
+++ trunk/rpms/moin/moin-1.5.2-config.patch 2007-03-18 20:46:57 UTC (rev 5231)
@@ -0,0 +1,47 @@
+diff -Naupr moin-1.5.2.orig/MoinMoin/multiconfig.py moin-1.5.2/MoinMoin/multiconfig.py
+--- moin-1.5.2.orig/MoinMoin/multiconfig.py 2006-02-04 13:31:37.000000000 +0100
++++ moin-1.5.2/MoinMoin/multiconfig.py 2006-02-06 11:45:22.000000000 +0100
+@@ -353,13 +353,13 @@ class DefaultConfig:
+ 'edit_on_doubleclick': 0,
+ 'remember_last_visit': 0,
+ 'show_nonexist_qm': nonexist_qm,
+- 'show_page_trail': 1,
++ 'show_page_trail': 0,
+ 'show_toolbar': 1,
+ 'show_topbottom': 0,
+ 'show_fancy_diff': 1,
+ 'wikiname_add_spaces': 0,
+ 'remember_me': 1,
+- 'want_trivial': 0,
++ 'want_trivial': 1,
+ }
+ # don't let the user change those
+ # user_checkbox_disable = ['disabled', 'want_trivial']
+diff -Naupr moin-1.5.2.orig/wiki/config/wikiconfig.py moin-1.5.2/wiki/config/wikiconfig.py
+--- moin-1.5.2.orig/wiki/config/wikiconfig.py 2006-02-04 22:20:20.000000000 +0100
++++ moin-1.5.2/wiki/config/wikiconfig.py 2006-02-06 11:46:18.000000000 +0100
+@@ -65,14 +65,14 @@ class Config(DefaultConfig):
+
+ # Where your mutable wiki pages are. You want to make regular
+ # backups of this directory.
+- data_dir = './data/'
++ data_dir = '../data/'
+
+ # Where read-only system and help page are. You might want to share
+ # this directory between several wikis. When you update MoinMoin,
+ # you can safely replace the underlay directory with a new one. This
+ # directory is part of MoinMoin distribution, you don't have to
+ # backup it.
+- data_underlay_dir = './underlay/'
++ data_underlay_dir = '../underlay/'
+
+ # This must be '/wiki' for twisted and standalone. For CGI, it should
+ # match your Apache Alias setting.
+@@ -123,6 +123,7 @@ class Config(DefaultConfig):
+ #u'%(page_front_page)s',
+ u'RecentChanges',
+ u'FindPage',
++ u'SiteNavigation',
+ u'HelpContents',
+ ]
+
Added: trunk/rpms/moin/moin-1.5.2-xml_newline.patch
===================================================================
--- trunk/rpms/moin/moin-1.5.2-xml_newline.patch (rev 0)
+++ trunk/rpms/moin/moin-1.5.2-xml_newline.patch 2007-03-18 20:46:57 UTC (rev 5231)
@@ -0,0 +1,12 @@
+diff -Naupr moin-1.3.5.orig/MoinMoin/formatter/xml_docbook.py moin-1.3.5/MoinMoin/formatter/xml_docbook.py
+--- moin-1.3.5.orig/MoinMoin/formatter/xml_docbook.py 2005-07-26 20:46:50.000000000 +0200
++++ moin-1.3.5/MoinMoin/formatter/xml_docbook.py 2005-12-19 10:06:34.000000000 +0100
+@@ -98,7 +98,7 @@ class Formatter(FormatterBase):
+
+ def linebreak(self, preformatted=1):
+ if preformatted:
+- self.text('\\n')
++ self.text('\n')
+ else:
+ #this should not happen
+ #self.text('CRAP')
Added: trunk/rpms/moin/moin.spec
===================================================================
--- trunk/rpms/moin/moin.spec (rev 0)
+++ trunk/rpms/moin/moin.spec 2007-03-18 20:46:57 UTC (rev 5231)
@@ -0,0 +1,55 @@
+# $Id$
+# Authority: dag
+
+%define python_sitelib %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib()')
+
+Summary: Advanced, easy to use and extensible WikiEngine
+Name: moin
+Version: 1.5.7
+Release: 1
+License: GPL
+Group: Applications/Internet
+URL: http://moinmoin.wikiwikiweb.de/
+
+Source: http://dl.sf.net/moin/moin-%{version}.tar.gz
+Patch0: moin-1.5.2-xml_newline.patch
+Patch1: moin-1.5.2-config.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildArch: noarch
+BuildRequires: python-devel >= 2.3
+Requires: python >= 2.3
+
+Provides: moinmoin = %{version}
+Obsoletes: moinmoin <= %{version}-%{release}
+
+%description
+MoinMoin is an advanced, easy to use and extensible WikiEngine with a large
+community of users. Said in a few words, it is about collaboration on easily
+editable web pages.
+
+%prep
+%setup
+%patch0 -p1 -b .xml_newline
+%patch1 -p1 -b .config
+
+%build
+%{__python} setup.py build
+
+%install
+%{__rm} -rf %{buildroot}
+%{__python} setup.py install --root="%{buildroot}"
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+%doc README docs/CHANGES* docs/README* docs/*.html docs/licenses/
+%{_bindir}/moin
+%{_datadir}/moin/
+%{python_sitelib}/MoinMoin/
+
+%changelog
+* Sun Mar 11 2007 Dag Wieers <dag at wieers.com> - 1.5.7-1
+- Initial package.
Property changes on: trunk/rpms/moin/moin.spec
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Modified: trunk/rpms/nagios-plugins/nagios-plugins.spec
===================================================================
--- trunk/rpms/nagios-plugins/nagios-plugins.spec 2007-03-14 10:55:34 UTC (rev 5230)
+++ trunk/rpms/nagios-plugins/nagios-plugins.spec 2007-03-18 20:46:57 UTC (rev 5231)
@@ -16,7 +16,7 @@
Summary: Host/service/network monitoring program plugins for Nagios
Name: nagios-plugins
-Version: 1.4.5
+Version: 1.4.6
Release: 1
License: GPL
Group: Applications/System
@@ -127,6 +127,9 @@
%{_libdir}/nagios/plugins/check_icmp
%changelog
+* Wed Mar 14 2007 Dag Wieers <dag at wieers.com> - 1.4.6-1
+- Updated to release 1.4.6.
+
* Tue Dec 12 2006 Dag Wieers <dag at wieers.com> - 1.4.5-1
- Updated to release 1.4.5.
- Added setuid sub-package for setuid plugins. (Philip Chase)
Modified: trunk/rpms/nfswatch/nfswatch.spec
===================================================================
--- trunk/rpms/nfswatch/nfswatch.spec 2007-03-14 10:55:34 UTC (rev 5230)
+++ trunk/rpms/nfswatch/nfswatch.spec 2007-03-18 20:46:57 UTC (rev 5231)
@@ -3,7 +3,7 @@
Summary: Command line tool to monitor NFS traffic
Name: nfswatch
-Version: 4.99.7
+Version: 4.99.8
Release: 1
License: BSD
Group: Applications/Internet
@@ -45,6 +45,9 @@
%{_sbindir}/nfswatch
%changelog
+* Sun Mar 18 2007 Dag Wieers <dag at wieers.com> - 4.99.8-1
+- Updated to release 4.99.8.
+
* Fri Feb 02 2007 Dag Wieers <dag at wieers.com> - 4.99.7-1
- Updated to release 4.99.7.
Modified: trunk/rpms/proxytunnel/proxytunnel.spec
===================================================================
--- trunk/rpms/proxytunnel/proxytunnel.spec 2007-03-14 10:55:34 UTC (rev 5230)
+++ trunk/rpms/proxytunnel/proxytunnel.spec 2007-03-18 20:46:57 UTC (rev 5231)
@@ -4,7 +4,7 @@
Summary: Punching holes in HTTP(S) proxy's
Name: proxytunnel
-Version: 1.6.3
+Version: 1.7.0
Release: 1
License: GPL
Group: Applications/Internet
@@ -35,17 +35,13 @@
%prep
%setup
-### FIXME: Fix typo in Makefile
-%{__perl} -pi.orig -e 's|\)\)|\)/man1|' Makefile
-
%build
%{__make} %{?_smp_mflags} \
CFLAGS="%{optflags} -DHAVE_GETOPT_LONG -DUSE_SSL -DSETPROCTITLE -DSPT_TYPE=2 -I/usr/kerberos/include"
%install
%{__rm} -rf %{buildroot}
-#%{__make} install DESTDIR="%{buildroot}" PREFIX="%{_prefix}"
-%{__make} install PREFIX="%{buildroot}%{_prefix}" MANDIR="%{buildroot}%{_mandir}/man1"
+%{__make} install DESTDIR="%{buildroot}" PREFIX="%{_prefix}"
%clean
%{__rm} -rf %{buildroot}
@@ -57,6 +53,9 @@
%{_bindir}/proxytunnel
%changelog
+* Fri Mar 16 2007 Dag Wieers <dag at wieers.com> - 1.7.0-1
+- Updated to release 1.7.0.
+
* Sun Aug 06 2006 Dag Wieers <dag at wieers.com> - 1.6.3-1
- Updated to release 1.6.3.
Modified: trunk/rpms/rdup/rdup.spec
===================================================================
--- trunk/rpms/rdup/rdup.spec 2007-03-14 10:55:34 UTC (rev 5230)
+++ trunk/rpms/rdup/rdup.spec 2007-03-18 20:46:57 UTC (rev 5231)
@@ -3,7 +3,7 @@
Summary: Prints filenames for backup
Name: rdup
-Version: 0.3.7
+Version: 0.3.8
Release: 1
License: GPL
Group: Applications/File
@@ -63,6 +63,9 @@
%{_datadir}/rdup/
%changelog
+* Sun Mar 18 2007 Dag Wieers <dag at wieers.com> - 0.3.8-1
+- Updated to release 0.3.8.
+
* Tue Feb 13 2007 Dag Wieers <dag at wieers.com> - 0.3.7-1
- Updated to release 0.3.7.
Modified: trunk/rpms/revelation/revelation.spec
===================================================================
--- trunk/rpms/revelation/revelation.spec 2007-03-14 10:55:34 UTC (rev 5230)
+++ trunk/rpms/revelation/revelation.spec 2007-03-18 20:46:57 UTC (rev 5231)
@@ -20,6 +20,8 @@
BuildRequires: gnome-keyring-devel, pygtk2-devel >= 2.8, gnome-python2
BuildRequires: gnome-vfs2-devel, libgnomeui-devel, gnome-python2-bonobo
BuildRequires: GConf2-devel, gnome-python2-gconf, gnome-python2-desktop
+%{?el5:BuildRequires: gnome-python2-extras, gnome-panel-devel}
+%{?fc6:BuildRequires: gnome-python2-extras, gnome-panel-devel}
%{?fc5:BuildRequires: gnome-python2-extras, gnome-panel-devel}
%{?fc4:BuildRequires: gnome-python2-extras, gnome-panel-devel}
Requires: python >= 2.3, pygtk2 >= 2.4, python-crypto >= 1.9
@@ -42,8 +44,8 @@
%install
%{__rm} -rf %{buildroot}
-%{__make} install \
- DESTDIR="%{buildroot}"
+%{__make} install DESTDIR="%{buildroot}"
+%find_lang %{name}
%post
export GCONF_CONFIG_SOURCE="$(gconftool-2 --get-default-source)"
@@ -58,7 +60,7 @@
%clean
%{__rm} -rf %{buildroot}
-%files
+%files -f %{name}.lang
%defattr(-, root, root, 0755)
%doc AUTHORS ChangeLog COPYING NEWS README TODO
%config %{_sysconfdir}/gconf/schemas/revelation.schemas
@@ -68,8 +70,6 @@
%{_datadir}/revelation/
%{_datadir}/icons/hicolor/*/apps/revelation.png
%{_datadir}/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-revelation.png
-%{_datadir}/icons/hicolor/scalable/filesystems/revelation-fallback-folder.svg
-%{_datadir}/icons/hicolor/scalable/filesystems/revelation-fallback-folder-open.svg
%{_datadir}/mime/packages/revelation.xml
%config %{_sysconfdir}/gconf/schemas/revelation-applet.schemas
Modified: trunk/rpms/rsstail/rsstail.spec
===================================================================
--- trunk/rpms/rsstail/rsstail.spec 2007-03-14 10:55:34 UTC (rev 5230)
+++ trunk/rpms/rsstail/rsstail.spec 2007-03-18 20:46:57 UTC (rev 5231)
@@ -4,7 +4,7 @@
Summary: Console RSS reader
Name: rsstail
-Version: 0.8
+Version: 1.0
Release: 1
License: GPL
Group: Applications/Internet
@@ -13,7 +13,7 @@
Source: http://www.vanheusden.com/rsstail/rsstail-%{version}.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: libmrss-devel
+BuildRequires: libmrss-devel >= 0.16
%description
RSSTail is more or less an RSS reader. It monitors an RSS feed, and if it
@@ -39,12 +39,12 @@
%{_bindir}/rsstail
%changelog
+* Sun Mar 18 2007 Dag Wieers <dag at wieers.com> - 0.18-1
+- Updated to release 0.18.
+
* Sun Dec 03 2006 Dries Verachtert <dries at ulyssis.org> - 0.8-1
- Updated to release 0.8.
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 0.7-1.2
-- Rebuild for Fedora Core 5.
-
* Sun Jan 29 2006 Dries Verachtert <dries at ulyssis.org> - 0.7-1
- Updated to release 0.7.
Modified: trunk/rpms/typespeed/typespeed.spec
===================================================================
--- trunk/rpms/typespeed/typespeed.spec 2007-03-14 10:55:34 UTC (rev 5230)
+++ trunk/rpms/typespeed/typespeed.spec 2007-03-18 20:46:57 UTC (rev 5231)
@@ -3,7 +3,7 @@
Summary: Test your typing speed and get your fingers' CPS
Name: typespeed
-Version: 0.6.0
+Version: 0.6.1
Release: 1
License: GPL
Group: Applications/Text
@@ -52,6 +52,9 @@
%dir %{_localstatedir}/games/typespeed/
%changelog
+* Sun Mar 18 2007 Dag Wieers <dag at wieers.com> - 0.6.1-1
+- Updated to release 0.6.1.
+
* Sat Jan 20 2007 Dag Wieers <dag at wieers.com> - 0.6.0-1
- Updated to release 0.6.0.
Modified: trunk/rpms/wine/wine.spec
===================================================================
--- trunk/rpms/wine/wine.spec 2007-03-14 10:55:34 UTC (rev 5230)
+++ trunk/rpms/wine/wine.spec 2007-03-18 20:46:57 UTC (rev 5231)
@@ -47,7 +47,7 @@
Summary: Windows 16/32/64 bit emulator
Name: wine
-Version: 0.9.32
+Version: 0.9.33
Release: 1
License: LGPL
Group: Applications/Emulators
@@ -579,6 +579,7 @@
%{_libdir}/wine/dnsapi.dll.so
%{_libdir}/wine/dplay.dll.so
%{_libdir}/wine/dplayx.dll.so
+%{_libdir}/wine/dpnaddr.dll.so
%{_libdir}/wine/dpnet.dll.so
%{_libdir}/wine/dpnhpast.dll.so
%{_libdir}/wine/dsound.dll.so
@@ -809,6 +810,9 @@
%{_libdir}/wine/*.def
%changelog
+* Sun Mar 18 2007 Dag Wieers <dag at wieers.com> - 0.9.33-1
+- Updated to release 0.9.33.
+
* Sat Mar 03 2007 Dag Wieers <dag at wieers.com> - 0.9.32-1
- Updated to release 0.9.32.
- Fixed the depenency to update-desktop-database. (Bart Schaefer)
Modified: trunk/rpms/xine/xine.spec
===================================================================
--- trunk/rpms/xine/xine.spec 2007-03-14 10:55:34 UTC (rev 5230)
+++ trunk/rpms/xine/xine.spec 2007-03-18 20:46:57 UTC (rev 5231)
@@ -6,7 +6,6 @@
%{!?dist:%define _with_moles 1}
%{?fc7: %define _with_moles 1}
-%{?el5: %define _with_moles 1}
%{?fc6: %define _with_moles 1}
%{?fc5: %define _with_moles 1}
Modified: trunk/rpms/xine-lib/xine-lib.spec
===================================================================
--- trunk/rpms/xine-lib/xine-lib.spec 2007-03-14 10:55:34 UTC (rev 5230)
+++ trunk/rpms/xine-lib/xine-lib.spec 2007-03-18 20:46:57 UTC (rev 5231)
@@ -52,12 +52,17 @@
Summary: Core library of the xine multimedia player
Name: xine-lib
-Version: 1.1.2
-Release: 2
+Version: 1.1.4
+Release: 1
License: GPL
Group: Applications/Multimedia
URL: http://xinehq.de/
Source: http://dl.sf.net/xine/xine-lib-%{version}.tar.bz2
+Patch1: xine-lib-1.1.4-optflags.patch
+Patch2: xine-lib-1.1.4-CVE-2007-1246.patch
+Patch3: xine-lib-1.1.3-legacy-flac-init.patch
+Patch6: xine-lib-1.1.1-deepbind-939.patch
+Patch7: xine-lib-1.1.1-multilib-devel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: libdvdcss
BuildRequires: gcc-c++, pkgconfig, zlib-devel, libtiff-devel
@@ -136,8 +141,13 @@
%prep
%setup
+%patch1 -p1 -b .optflags
+%patch2 -p1 -b .CVE-2007-1246
+%patch3 -p0 -b .legacy-flac-init
+### Patch6 needed at least when compiling with external ffmpeg, #939.
+%patch6 -p1 -b .deepbind
+%patch7 -p0 -b .multilib-devel
-
%build
%configure \
%{?_with_modxorg:--with-xv-path=%{_libdir}} \
@@ -146,7 +156,8 @@
%{?_without_alsa:--disable-alsa} \
%{!?_with_extdvdnav:--with-included-dvdnav} \
--with-external-a52dec \
- --with-external-libmad
+ --with-external-libmad \
+ --with-pic
%{__make} %{?_smp_mflags}
@@ -170,12 +181,13 @@
%files -f %{libname}.lang
%defattr(-, root, root, 0755)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
-%doc doc/README.dvb doc/README.dxr3 doc/README.network_dvd doc/README.opengl
-%doc doc/README.syncfb doc/README_xxmc.html doc/faq/faq.html
+%doc doc/README.* doc/faq/faq.txt doc/faq/faq.html
+%doc %{_docdir}/xine-lib/hackersguide/
%{_libdir}/libxine.so.*
%{_libdir}/xine/
%{_datadir}/xine/
%{_mandir}/man5/xine.5*
+%exclude %{_docdir}/xine-lib/
%files devel
%defattr(-, root, root, 0755)
@@ -191,6 +203,10 @@
%changelog
+* Sun Mar 11 2007 Dag Wieers <dag at wieers.com> - 1.1.4-1
+- Updated to release 1.1.4.
+- Added Fedora Extras patches.
+
* Sun Sep 24 2006 Matthias Saou <http://freshrpms.net/> 1.1.2-2
- Rebuild against new libcdio.
Modified: trunk/rpms/zvbi/zvbi.spec
===================================================================
--- trunk/rpms/zvbi/zvbi.spec 2007-03-14 10:55:34 UTC (rev 5230)
+++ trunk/rpms/zvbi/zvbi.spec 2007-03-18 20:46:57 UTC (rev 5231)
@@ -11,7 +11,7 @@
Summary: Raw VBI, Teletext and Closed Caption decoding library
Name: zvbi
-Version: 0.2.24
+Version: 0.2.25
Release: 1
License: GPL
Group: Applications/Multimedia
@@ -89,6 +89,9 @@
%changelog
+* Sun Mar 18 2007 Dag Wieers <dag at wieers.com> - 0.2.25-1
+- Updated to release 0.2.25.
+
* Wed Mar 7 2007 Matthias Saou <http://freshrpms.net/> 0.2.24-1
- Update to 0.2.24.
- Remove no longer needed compiler patch.
More information about the svn-commits
mailing list