From fedora-extras-commits at redhat.com Thu Feb 1 01:52:48 2007 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Wed, 31 Jan 2007 20:52:48 -0500 Subject: rpms/pitivi/devel .cvsignore, 1.4, 1.5 pitivi.spec, 1.13, 1.14 sources, 1.4, 1.5 Message-ID: <200702010152.l111qmlH004535@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/pitivi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4513 Modified Files: .cvsignore pitivi.spec sources Log Message: Update to 0.10.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pitivi/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 4 Jun 2006 02:19:11 -0000 1.4 +++ .cvsignore 1 Feb 2007 01:52:18 -0000 1.5 @@ -1 +1 @@ -pitivi-0.10.1.tar.bz2 +pitivi-0.10.2.tar.bz2 Index: pitivi.spec =================================================================== RCS file: /cvs/extras/rpms/pitivi/devel/pitivi.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- pitivi.spec 14 Dec 2006 13:54:03 -0000 1.13 +++ pitivi.spec 1 Feb 2007 01:52:18 -0000 1.14 @@ -1,13 +1,13 @@ Name: pitivi -Version: 0.10.1 -Release: 7%{?dist} +Version: 0.10.2 +Release: 1%{?dist} Summary: Non-linear video editor Group: Applications/Multimedia License: GPL URL: http://www.pitivi.org/ Source0: http://download.sf.net/pitivi/%{name}-%{version}.tar.bz2 -Patch0: pitivi-0.10.1-sync.patch +Patch0: pitivi-0.10.2-pygtk-configure.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -26,6 +26,8 @@ BuildRequires: desktop-file-utils BuildRequires: gnome-python2 BuildRequires: gnonlin +BuildRequires: autoconf +BuildRequires: automake %description Pitivi is an application using the GStreamer multimedia framework to @@ -36,7 +38,7 @@ %prep %setup0 -q -%patch0 -p0 -b .sync +%patch0 -p1 -R -b .pygtk-configure for f in `find . -name \*.py` do @@ -44,6 +46,9 @@ done %build +aclocal -I common/m4 +autoconf +automake -a -c %configure --libdir=%{_datadir} make %{?_smp_mflags} @@ -56,10 +61,11 @@ --dir %{buildroot}%{_datadir}/applications \ pitivi.desktop +%find_lang %{name} %clean rm -rf %{buildroot} -%files +%files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS %{_bindir}/pitivi @@ -68,6 +74,13 @@ %{_datadir}/applications/* %changelog +* Wed Jan 31 2007 Jeffrey C. Ollie - 0.10.2-1 +- Update to 0.10.2 +- Drop sync patch +- Add find_lang to pick up localizations +- Temporarily re-run auto* tools until PyGTK detection is fixed. +- See http://bugzilla.gnome.org/show_bug.cgi?id=402995 + * Thu Dec 14 2006 Jeffrey C. Ollie - 0.10.1-7 - Fix stupid mistake Index: sources =================================================================== RCS file: /cvs/extras/rpms/pitivi/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 Jun 2006 02:19:11 -0000 1.4 +++ sources 1 Feb 2007 01:52:18 -0000 1.5 @@ -1 +1 @@ -129fd579006b9284802043dff46680c1 pitivi-0.10.1.tar.bz2 +d070bbf7ff78f897ad4517787e4f1c8d pitivi-0.10.2.tar.bz2 From fedora-extras-commits at redhat.com Thu Feb 1 02:39:53 2007 From: fedora-extras-commits at redhat.com (John Berninger (jwb)) Date: Wed, 31 Jan 2007 21:39:53 -0500 Subject: rpms/wordpress/FC-5 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 wordpress.spec, 1.9, 1.10 Message-ID: <200702010239.l112drNo008077@cvs-int.fedora.redhat.com> Author: jwb Update of /cvs/extras/rpms/wordpress/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8058 Modified Files: .cvsignore sources wordpress.spec Log Message: update to v2.1 to fix multiple bz/vuln's Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wordpress/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 27 Dec 2006 16:04:36 -0000 1.4 +++ .cvsignore 1 Feb 2007 02:39:23 -0000 1.5 @@ -1 +1 @@ -wordpress-2.0.5.tar.gz +wordpress-2.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wordpress/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 27 Dec 2006 16:04:36 -0000 1.4 +++ sources 1 Feb 2007 02:39:23 -0000 1.5 @@ -1 +1 @@ -f16ffc47e22ba3540a1e4f32354fae0e wordpress-2.0.5.tar.gz +a8ffd0063b080de4789b928696c1fb26 wordpress-2.1.tar.gz Index: wordpress.spec =================================================================== RCS file: /cvs/extras/rpms/wordpress/FC-5/wordpress.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- wordpress.spec 27 Dec 2006 16:04:36 -0000 1.9 +++ wordpress.spec 1 Feb 2007 02:39:23 -0000 1.10 @@ -1,9 +1,9 @@ Summary: WordPress blogging software URL: http://www.wordpress.org Name: wordpress -Version: 2.0.5 +Version: 2.1 Group: Applications/Publishing -Release: 1%{?dist} +Release: 0%{?dist} License: GPL # Source0 with name-version does not work for web retrieval, # latest.tar.gz does not work for build @@ -57,6 +57,7 @@ %{_datadir}/wordpress/wp-config-sample.php %{_datadir}/wordpress/wp-config.php %config(noreplace) %{_sysconfdir}/wordpress/wp-config.php +%{_datadir}/wordpress/wp-cron.php %{_datadir}/wordpress/wp-feed.php %{_datadir}/wordpress/wp-links-opml.php %{_datadir}/wordpress/wp-login.php @@ -72,6 +73,9 @@ %dir %{_sysconfdir}/wordpress %changelog +* Wed Jan 31 2007 John Berninger - 2.1-0 +- update to v2.1 to fix multiple BZ vuln's + * Wed Dec 27 2006 John Berninger - 2.0.5-1 - fix bz 220818 From fedora-extras-commits at redhat.com Thu Feb 1 02:46:28 2007 From: fedora-extras-commits at redhat.com (John Berninger (jwb)) Date: Wed, 31 Jan 2007 21:46:28 -0500 Subject: rpms/wordpress/FC-6 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 wordpress.spec, 1.10, 1.11 Message-ID: <200702010246.l112kSUP008187@cvs-int.fedora.redhat.com> Author: jwb Update of /cvs/extras/rpms/wordpress/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8165 Modified Files: .cvsignore sources wordpress.spec Log Message: update to v2.1 to fix multiple bz/vuln's Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wordpress/FC-6/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 27 Dec 2006 16:05:20 -0000 1.4 +++ .cvsignore 1 Feb 2007 02:45:58 -0000 1.5 @@ -1 +1 @@ -wordpress-2.0.5.tar.gz +wordpress-2.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wordpress/FC-6/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 27 Dec 2006 16:05:20 -0000 1.4 +++ sources 1 Feb 2007 02:45:58 -0000 1.5 @@ -1 +1 @@ -f16ffc47e22ba3540a1e4f32354fae0e wordpress-2.0.5.tar.gz +a8ffd0063b080de4789b928696c1fb26 wordpress-2.1.tar.gz Index: wordpress.spec =================================================================== RCS file: /cvs/extras/rpms/wordpress/FC-6/wordpress.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- wordpress.spec 27 Dec 2006 16:05:20 -0000 1.10 +++ wordpress.spec 1 Feb 2007 02:45:58 -0000 1.11 @@ -1,9 +1,9 @@ Summary: WordPress blogging software URL: http://www.wordpress.org Name: wordpress -Version: 2.0.5 +Version: 2.1 Group: Applications/Publishing -Release: 1%{?dist} +Release: 0%{?dist} License: GPL # Source0 with name-version does not work for web retrieval, # latest.tar.gz does not work for build @@ -57,6 +57,7 @@ %{_datadir}/wordpress/wp-config-sample.php %{_datadir}/wordpress/wp-config.php %config(noreplace) %{_sysconfdir}/wordpress/wp-config.php +%{_datadir}/wordpress/wp-cron.php %{_datadir}/wordpress/wp-feed.php %{_datadir}/wordpress/wp-links-opml.php %{_datadir}/wordpress/wp-login.php @@ -72,6 +73,9 @@ %dir %{_sysconfdir}/wordpress %changelog +* Wed Jan 31 2007 John Berninger - 2.1-0 +- update to v 2.1 to fix multiple bz/vuln's + * Wed Dec 27 2006 John Berninger - 2.0.5-1 - ver 2.0.5 to fix bz 220818 From fedora-extras-commits at redhat.com Thu Feb 1 02:48:47 2007 From: fedora-extras-commits at redhat.com (John Berninger (jwb)) Date: Wed, 31 Jan 2007 21:48:47 -0500 Subject: rpms/wordpress/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 wordpress.spec, 1.8, 1.9 Message-ID: <200702010248.l112mluK008267@cvs-int.fedora.redhat.com> Author: jwb Update of /cvs/extras/rpms/wordpress/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8248 Modified Files: .cvsignore sources wordpress.spec Log Message: update to v2.1 to fix multiple bz/vuln's Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wordpress/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 3 Dec 2006 18:09:58 -0000 1.4 +++ .cvsignore 1 Feb 2007 02:48:17 -0000 1.5 @@ -1 +1 @@ -wordpress-2.0.5.tar.gz +wordpress-2.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wordpress/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 3 Dec 2006 18:09:58 -0000 1.4 +++ sources 1 Feb 2007 02:48:17 -0000 1.5 @@ -1 +1 @@ -f16ffc47e22ba3540a1e4f32354fae0e wordpress-2.0.5.tar.gz +a8ffd0063b080de4789b928696c1fb26 wordpress-2.1.tar.gz Index: wordpress.spec =================================================================== RCS file: /cvs/extras/rpms/wordpress/devel/wordpress.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- wordpress.spec 3 Dec 2006 18:28:05 -0000 1.8 +++ wordpress.spec 1 Feb 2007 02:48:17 -0000 1.9 @@ -1,9 +1,9 @@ Summary: WordPress blogging software URL: http://www.wordpress.org Name: wordpress -Version: 2.0.5 +Version: 2.1 Group: Applications/Publishing -Release: 2%{?dist} +Release: 0%{?dist} License: GPL # Source0 with name-version does not work for web retrieval, # latest.tar.gz does not work for build @@ -57,6 +57,7 @@ %{_datadir}/wordpress/wp-config-sample.php %{_datadir}/wordpress/wp-config.php %config(noreplace) %{_sysconfdir}/wordpress/wp-config.php +%{_datadir}/wordpress/wp-cron.php %{_datadir}/wordpress/wp-feed.php %{_datadir}/wordpress/wp-links-opml.php %{_datadir}/wordpress/wp-login.php @@ -72,6 +73,9 @@ %dir %{_sysconfdir}/wordpress %changelog +* Wed Jan 31 2007 John Berninger - 2.1-0 +- update to v2.1 to fix multiple bz/vuln's + * Sun Dec 3 2006 John Berninger - 2.0.5-2 - Remove mysql-server dependency From fedora-extras-commits at redhat.com Thu Feb 1 02:51:57 2007 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Wed, 31 Jan 2007 21:51:57 -0500 Subject: rpms/gnome-sudoku/devel .cvsignore,1.4,NONE dead.package,1.1,NONE Message-ID: <200702010251.l112pv78008347@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/gnome-sudoku/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8342/devel Removed Files: .cvsignore dead.package Log Message: Remove dead devel branch, package now upstream in gnome-games --- .cvsignore DELETED --- --- dead.package DELETED --- From fedora-extras-commits at redhat.com Thu Feb 1 04:04:21 2007 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Wed, 31 Jan 2007 23:04:21 -0500 Subject: rpms/pitivi/devel pitivi-0.10.2-pygtk-configure.patch, NONE, 1.1 pitivi.spec, 1.14, 1.15 Message-ID: <200702010404.l1144LXv015595@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/pitivi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15573 Modified Files: pitivi.spec Added Files: pitivi-0.10.2-pygtk-configure.patch Log Message: Don't forget patch. pitivi-0.10.2-pygtk-configure.patch: --- NEW FILE pitivi-0.10.2-pygtk-configure.patch --- --- trunk/configure.ac 2006/12/02 17:53:19 834 +++ trunk/configure.ac 2006/12/04 15:40:32 836 @@ -51,10 +51,28 @@ PKG_CHECK_MODULES(GST, gstreamer-0.10 >= $GST_REQ) dnl check for pygtk -PKG_CHECK_MODULES(PYGTK, pygtk-2.0 >= $PYGTK_REQ) -PYGTK_DIR="`$PKG_CONFIG --variable=pyexecdir pygtk-2.0`" -AC_SUBST(PYGTK_DIR) -AC_MSG_NOTICE(Using pygtk installed in $PYGTK_DIR) +AC_MSG_CHECKING(for GTK python bindings) +prog=" +import sys +try: + import pygtk + pygtk.require('2.0') + import gtk +except ImportError: + sys.exit(1) +if gtk.pygtk_version < tuple([int(x) for x in '$PYGTK_REQ'.split('.')]): + sys.exit(1) +else: + sys.exit(0) +" +if $PYTHON -c "$prog" +then + AC_MSG_RESULT(found) +else + AC_MSG_RESULT(not found) + AC_MSG_ERROR( + [You need to have python gtk bindings >= $PYGTK_REQ installed]) +fi export PYTHONPATH=$PYGTK_DIR:$PYTHONPATH Index: pitivi.spec =================================================================== RCS file: /cvs/extras/rpms/pitivi/devel/pitivi.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- pitivi.spec 1 Feb 2007 01:52:18 -0000 1.14 +++ pitivi.spec 1 Feb 2007 04:03:50 -0000 1.15 @@ -1,6 +1,6 @@ Name: pitivi Version: 0.10.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Non-linear video editor Group: Applications/Multimedia @@ -74,6 +74,9 @@ %{_datadir}/applications/* %changelog +* Wed Jan 31 2007 Jeffrey C. Ollie - 0.10.2-2 +- Don't forget to add new patch to CVS + * Wed Jan 31 2007 Jeffrey C. Ollie - 0.10.2-1 - Update to 0.10.2 - Drop sync patch From fedora-extras-commits at redhat.com Thu Feb 1 05:17:53 2007 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Thu, 1 Feb 2007 00:17:53 -0500 Subject: rpms/viaideinfo/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 viaideinfo.spec, 1.3, 1.4 Message-ID: <200702010517.l115Hrv4019372@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/viaideinfo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19347/devel Modified Files: .cvsignore sources viaideinfo.spec Log Message: Update to new upstream release (0.5) which adds some new hardware support; add zlib-devel to BuildRequires; fix minor grammar error in previous %changelog entry. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/viaideinfo/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Oct 2006 06:50:13 -0000 1.2 +++ .cvsignore 1 Feb 2007 05:17:23 -0000 1.3 @@ -1 +1 @@ -viaideinfo-0.4.tar.gz +viaideinfo-0.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/viaideinfo/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Oct 2006 06:50:13 -0000 1.2 +++ sources 1 Feb 2007 05:17:23 -0000 1.3 @@ -1 +1 @@ -e436a580eb8a047a0551cb996b11e6f5 viaideinfo-0.4.tar.gz +5db6b9f406416e33efd31df1ad44a54c viaideinfo-0.5.tar.gz Index: viaideinfo.spec =================================================================== RCS file: /cvs/extras/rpms/viaideinfo/devel/viaideinfo.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- viaideinfo.spec 22 Oct 2006 01:48:57 -0000 1.3 +++ viaideinfo.spec 1 Feb 2007 05:17:23 -0000 1.4 @@ -1,6 +1,6 @@ Name: viaideinfo -Version: 0.4 -Release: 3%{?dist} +Version: 0.5 +Release: 1%{?dist} Summary: Displays the information of installed VIA IDE controllers Group: Applications/System License: GPL @@ -12,6 +12,7 @@ ExclusiveArch: %{ix86} x86_64 BuildRequires: pciutils-devel >= 2.2.0 +BuildRequires: zlib-devel # Taken from the README %description @@ -26,7 +27,7 @@ Supported devices: VT82C576, VT82C586, VT82C586A, VT82C586B, VT82C596A, VT82C596B, VT82C686, VT82C686A, VT82C686B, VT8231, VT8233, VT8233C, VT8233A, - VT8235, VT8237, VT8237A, VT8251, VT6410 + VT8235, VT8237, VT8237A, VT8251, VT6410, VT8237S, CX700 %prep @@ -55,11 +56,17 @@ %changelog +* Wed Jan 31 2007 Peter Gordon - 0.5-1 +- Update to new upstream release (0.5). This adds support for SATA_EIDE + controllers and VT8237S, CX700 southbridges. +- Added zlib-devel to BuildRequires. +- Fix minor grammar error in prior %%changelog entry. + * Sat Oct 21 2006 Peter Gordon - 0.4-3 - Bump release to fix CVS tagging issue * Sat Oct 21 2006 Peter Gordon - 0.4-2 -- Enable building on x86_64 (It works fine on x86-64 Via-based systems too, +- Enable building on x86_64. (It works fine on x86-64 Via-based systems too, according to an email from the upstream maintainer.) * Tue Oct 17 2006 Peter Gordon - 0.4-1 From fedora-extras-commits at redhat.com Thu Feb 1 05:28:12 2007 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Thu, 1 Feb 2007 00:28:12 -0500 Subject: rpms/viaideinfo/FC-6 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 viaideinfo.spec, 1.3, 1.4 Message-ID: <200702010528.l115SCcq019478@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/viaideinfo/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19459/FC-6 Modified Files: .cvsignore sources viaideinfo.spec Log Message: Update to new upstream release (0.5) which adds some new hardware support; add zlib-devel to BuildRequires; fix minor grammar error in previous %changelog entry. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/viaideinfo/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Oct 2006 06:50:13 -0000 1.2 +++ .cvsignore 1 Feb 2007 05:27:41 -0000 1.3 @@ -1 +1 @@ -viaideinfo-0.4.tar.gz +viaideinfo-0.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/viaideinfo/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Oct 2006 06:50:13 -0000 1.2 +++ sources 1 Feb 2007 05:27:41 -0000 1.3 @@ -1 +1 @@ -e436a580eb8a047a0551cb996b11e6f5 viaideinfo-0.4.tar.gz +5db6b9f406416e33efd31df1ad44a54c viaideinfo-0.5.tar.gz Index: viaideinfo.spec =================================================================== RCS file: /cvs/extras/rpms/viaideinfo/FC-6/viaideinfo.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- viaideinfo.spec 22 Oct 2006 01:48:57 -0000 1.3 +++ viaideinfo.spec 1 Feb 2007 05:27:41 -0000 1.4 @@ -1,6 +1,6 @@ Name: viaideinfo -Version: 0.4 -Release: 3%{?dist} +Version: 0.5 +Release: 1%{?dist} Summary: Displays the information of installed VIA IDE controllers Group: Applications/System License: GPL @@ -12,6 +12,7 @@ ExclusiveArch: %{ix86} x86_64 BuildRequires: pciutils-devel >= 2.2.0 +BuildRequires: zlib-devel # Taken from the README %description @@ -26,7 +27,7 @@ Supported devices: VT82C576, VT82C586, VT82C586A, VT82C586B, VT82C596A, VT82C596B, VT82C686, VT82C686A, VT82C686B, VT8231, VT8233, VT8233C, VT8233A, - VT8235, VT8237, VT8237A, VT8251, VT6410 + VT8235, VT8237, VT8237A, VT8251, VT6410, VT8237S, CX700 %prep @@ -55,11 +56,17 @@ %changelog +* Wed Jan 31 2007 Peter Gordon - 0.5-1 +- Update to new upstream release (0.5). This adds support for SATA_EIDE + controllers and VT8237S, CX700 southbridges. +- Added zlib-devel to BuildRequires. +- Fix minor grammar error in prior %%changelog entry. + * Sat Oct 21 2006 Peter Gordon - 0.4-3 - Bump release to fix CVS tagging issue * Sat Oct 21 2006 Peter Gordon - 0.4-2 -- Enable building on x86_64 (It works fine on x86-64 Via-based systems too, +- Enable building on x86_64. (It works fine on x86-64 Via-based systems too, according to an email from the upstream maintainer.) * Tue Oct 17 2006 Peter Gordon - 0.4-1 From fedora-extras-commits at redhat.com Thu Feb 1 05:48:24 2007 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Thu, 1 Feb 2007 00:48:24 -0500 Subject: rpms/viaideinfo/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 viaideinfo.spec, 1.2, 1.3 Message-ID: <200702010548.l115mO1P019615@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/viaideinfo/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19592/FC-5 Modified Files: .cvsignore sources viaideinfo.spec Log Message: Update to new upstream release (0.5) which adds some new hardware support; add zlib-devel to BuildRequires; fix minor grammar error in previous %changelog entry. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/viaideinfo/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Oct 2006 06:50:13 -0000 1.2 +++ .cvsignore 1 Feb 2007 05:47:54 -0000 1.3 @@ -1 +1 @@ -viaideinfo-0.4.tar.gz +viaideinfo-0.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/viaideinfo/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Oct 2006 06:50:13 -0000 1.2 +++ sources 1 Feb 2007 05:47:54 -0000 1.3 @@ -1 +1 @@ -e436a580eb8a047a0551cb996b11e6f5 viaideinfo-0.4.tar.gz +5db6b9f406416e33efd31df1ad44a54c viaideinfo-0.5.tar.gz Index: viaideinfo.spec =================================================================== RCS file: /cvs/extras/rpms/viaideinfo/FC-5/viaideinfo.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- viaideinfo.spec 23 Oct 2006 01:05:23 -0000 1.2 +++ viaideinfo.spec 1 Feb 2007 05:47:54 -0000 1.3 @@ -1,6 +1,6 @@ Name: viaideinfo -Version: 0.4 -Release: 2%{?dist} +Version: 0.5 +Release: 1%{?dist} Summary: Displays the information of installed VIA IDE controllers Group: Applications/System License: GPL @@ -12,6 +12,7 @@ ExclusiveArch: %{ix86} x86_64 BuildRequires: pciutils-devel >= 2.2.0 +BuildRequires: zlib-devel # Taken from the README %description @@ -26,7 +27,7 @@ Supported devices: VT82C576, VT82C586, VT82C586A, VT82C586B, VT82C596A, VT82C596B, VT82C686, VT82C686A, VT82C686B, VT8231, VT8233, VT8233C, VT8233A, - VT8235, VT8237, VT8237A, VT8251, VT6410 + VT8235, VT8237, VT8237A, VT8251, VT6410, VT8237S, CX700 %prep @@ -55,8 +56,14 @@ %changelog +* Wed Jan 31 2007 Peter Gordon - 0.5-1 +- Update to new upstream release (0.5). This adds support for SATA_EIDE + controllers and VT8237S & CX700 southbridges. +- Added zlib-devel to BuildRequires. +- Fix minor grammar error in prior %%changelog entry. + * Sun Oct 22 2006 Peter Gordon - 0.4-2 -- Enable x86-64 build support +- Enable x86-64 build support. * Tue Oct 17 2006 Peter Gordon - 0.4-1 - Initial packaging From fedora-extras-commits at redhat.com Thu Feb 1 08:12:09 2007 From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu)) Date: Thu, 1 Feb 2007 03:12:09 -0500 Subject: rpms/sysprof-kmod/devel sysprof-kmod.spec,1.28,1.29 Message-ID: <200702010812.l118C9QM030128@cvs-int.fedora.redhat.com> Author: giallu Update of /cvs/extras/rpms/sysprof-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30111 Modified Files: sysprof-kmod.spec Log Message: Rebuild for kernel 2.6.19-1.2916.fc7 Index: sysprof-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/sysprof-kmod/devel/sysprof-kmod.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sysprof-kmod.spec 29 Jan 2007 17:53:22 -0000 1.28 +++ sysprof-kmod.spec 1 Feb 2007 08:11:39 -0000 1.29 @@ -4,7 +4,7 @@ # end stuff to be ... # hardcode for now: -%{!?kversion: %define kversion 2.6.19-1.2914.fc7} +%{!?kversion: %define kversion 2.6.19-1.2916.fc7} # hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g. # --define "kversion 2.6.16-1.2096_FC5" From fedora-extras-commits at redhat.com Thu Feb 1 08:46:38 2007 From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer)) Date: Thu, 1 Feb 2007 03:46:38 -0500 Subject: rpms/ghdl/devel ghdl.spec,1.28,1.29 Message-ID: <200702010846.l118kcSv030361@cvs-int.fedora.redhat.com> Author: sailer Update of /cvs/extras/rpms/ghdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30346 Modified Files: ghdl.spec Log Message: do not try to set user/group during install Index: ghdl.spec =================================================================== RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- ghdl.spec 5 Jan 2007 14:08:12 -0000 1.28 +++ ghdl.spec 1 Feb 2007 08:46:08 -0000 1.29 @@ -5,7 +5,7 @@ Summary: A VHDL simulator, using the GCC technology Name: ghdl Version: 0.25 -Release: 0.%{ghdlsvnver}svn.1%{?dist} +Release: 0.%{ghdlsvnver}svn.2%{?dist} License: GPL Group: Development/Languages URL: http://ghdl.free.fr/ @@ -195,7 +195,7 @@ %ifarch x86_64 pushd obj-%{gcc_target_platform}/gcc/vhdl P32=%{buildroot}/%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/vhdl/lib/32/ -%{__install} -d -o 0 -g 0 ${P32} +%{__install} -d ${P32} make ghdllibs-clean %if %{!?_without_mock:0}%{?_without_mock:1} make grt-clean @@ -207,8 +207,8 @@ %endif PDIR=`pwd` pushd ${P32}/../.. -%{__install} -d -o 0 -g 0 lib/32/v93 -%{__install} -d -o 0 -g 0 lib/32/v87 +%{__install} -d lib/32/v93 +%{__install} -d lib/32/v87 %{__make} -f ${PDIR}/Makefile REL_DIR=../../../.. \ LIBSRC_DIR="src" LIB93_DIR=lib/32/v93 LIB87_DIR=lib/32/v87 \ ANALYZE="${PDIR}/../ghdl -a -m32 --GHDL1=${PDIR}/../ghdl1 --ieee=none" \ @@ -288,6 +288,9 @@ %changelog +* Fri Jan 5 2007 Thomas Sailer - 0.25-0.89svn.2 +- do not try to set user/group during install + * Fri Jan 5 2007 Thomas Sailer - 0.25-0.89svn.1 - back out hunks that cause build failures - un-exclude ppc From fedora-extras-commits at redhat.com Thu Feb 1 08:51:04 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 1 Feb 2007 03:51:04 -0500 Subject: rpms/smashteroid - New directory Message-ID: <200702010851.l118p49K030435@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/smashteroid In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30431/smashteroid Log Message: Directory /cvs/extras/rpms/smashteroid added to the repository From fedora-extras-commits at redhat.com Thu Feb 1 08:51:04 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 1 Feb 2007 03:51:04 -0500 Subject: rpms/smashteroid/devel - New directory Message-ID: <200702010851.l118p4pW030446@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/smashteroid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30431/smashteroid/devel Log Message: Directory /cvs/extras/rpms/smashteroid/devel added to the repository From fedora-extras-commits at redhat.com Thu Feb 1 08:51:23 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 1 Feb 2007 03:51:23 -0500 Subject: rpms/smashteroid Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200702010851.l118pN5j030478@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/smashteroid In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30472 Added Files: Makefile import.log Log Message: Setup of module smashteroid --- NEW FILE Makefile --- # Top level Makefile for module smashteroid all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Feb 1 08:51:29 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 1 Feb 2007 03:51:29 -0500 Subject: rpms/smashteroid/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702010851.l118pT0q030492@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/smashteroid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30472/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module smashteroid --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Feb 1 08:52:45 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 1 Feb 2007 03:52:45 -0500 Subject: rpms/smashteroid import.log,1.1,1.2 Message-ID: <200702010852.l118qjUi030587@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/smashteroid In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30549 Modified Files: import.log Log Message: auto-import smashteroid-1.11-2.fc7 on branch devel from smashteroid-1.11-2.fc7.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/smashteroid/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Feb 2007 08:51:23 -0000 1.1 +++ import.log 1 Feb 2007 08:52:14 -0000 1.2 @@ -0,0 +1 @@ +smashteroid-1_11-2_fc7:HEAD:smashteroid-1.11-2.fc7.src.rpm:1170320018 From fedora-extras-commits at redhat.com Thu Feb 1 08:52:45 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 1 Feb 2007 03:52:45 -0500 Subject: rpms/smashteroid/devel astro-fixes.patch, NONE, 1.1 smashteroid.desktop, NONE, 1.1 smashteroid.png, NONE, 1.1 smashteroid.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702010852.l118qjlP030588@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/smashteroid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30549/devel Modified Files: .cvsignore sources Added Files: astro-fixes.patch smashteroid.desktop smashteroid.png smashteroid.spec Log Message: auto-import smashteroid-1.11-2.fc7 on branch devel from smashteroid-1.11-2.fc7.src.rpm astro-fixes.patch: --- NEW FILE astro-fixes.patch --- --- /dev/null 2007-01-27 16:33:38.647762500 +0100 +++ smashteroid-1.11/license-change.txt 2007-01-27 17:05:02.000000000 +0100 @@ -0,0 +1,200 @@ +The original license statement in source.txt was: " +The Smashteroid source code is (c)2001 by NewCreature Design. The source may be +freely distributed and portions of the code may be extracted and used by you in +your own projects. NewCreature Design grants you permission to distribute any +[un]modified versions of the game you make, provided you include the original +"readme.txt" file and notify us about your distribution." + +This was changed to the current text in source.txt and readme.txt by Hans de +Goede , with permission from the original author Todd +Cope, below is are literal copies of the email exchange in which he gave his +permission: + +--- + +Message-ID: <456DE5CA.7020300 at hhs.nl> +Date: Wed, 29 Nov 2006 20:55:54 +0100 +From: Hans de Goede +User-Agent: Thunderbird 1.5.0.5 (X11/20060803) +MIME-Version: 1.0 +To: todd at t3-i.com +Subject: alphabet soup, laserwars en others license +X-Enigmail-Version: 0.94.0.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 7bit + +Hi Todd, + +Remember me I mailed you patches for a Linux version for crystalstacker +quite some time ago. and I've created Fedora Linux packages of +crystalstacker so that Fedora users can easily install it. + +Besides a Linux enthousiast / Fedora developer I'm also a Computer +Science teacher at a Dutch University. This period I'm teaching my +students howto write portable code, so I thought it would be fun to give +them some games written with allegro, but not with another OS like Linux +in mind, to "port" to Linux. Today there was a practical lesson where +they did just that and it was a great success. + +The managed to get smashteroid and alphabet soup running under Linux +quite easily. Their work still needs some cleaning up and then I'll send +it to you. Know that I've seen your other games in action I would like +to package them for Fedora Linux too. + +I'm interested in creating packages for all your (non java) games, but +lets start with those for which you currently already make source +available: alphabet soup, smashteroid and laserwars. + +All 3 of these come with a Freeware-ish license currently in the text. I +don't know if you remember, but we had some discussions about some rough +(and thus for Fedora troublesome) edges with the crystalstacker license. + +In the end you put the following license on crystalstacker (for which +I'm still very grateful): + +"Crystal Stacker is freeware. This means you can pass copies around +freely provided you include this document in it's original form in your +distribution. Please see the "Contacting Us" section of this document if +you need to contact us for any reason. + +The source code is provided as-is and you may do with it whatsoever you +please provided that you include this file in its unmodified form with +any new distribution. NewCreature Design makes no gaurantees regarding +the usability of the source but are willing to help with any problems +you might run into. Please see the "Contacting Us" section of this +document if you need to get in touch with us about any issues you have +regarding the source." + +Are you willing to release: alphabet soup, smashteroid and laserwars +under this license too? And in that case is it ok for me to distribute +the current available versions under this license? + +Thanks & Regards, + +Hans + + +p.s. + +While I'm asking any chance you could release source of any of your +other games like vgolf and secret of the hose? I know you already make +linux binaries available, but source under an unrestrictive license +would be really awsome! + + + +--- + +Return-Path: +Received: from koko.hhs.nl ([145.52.2.16] verified) + by hhs.nl (CommuniGate Pro SMTP 4.3.6) + with ESMTP id 55013466 for j.w.r.degoede at hhs.nl; Thu, 30 Nov 2006 01:50:54 +0100 +Received: from exim by koko.hhs.nl with spam-scanned (Exim 4.62) + (envelope-from ) + id 1Gpa8Z-0007DU-2j + for j.w.r.degoede at hhs.nl; Thu, 30 Nov 2006 01:50:54 +0100 +X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on koko.hhs.nl +X-Spam-Level: +X-Spam-Status: No, score=0.6 required=5.0 tests=AWL,BAYES_05,NO_REAL_NAME, + UNWANTED_LANGUAGE_BODY autolearn=no version=3.1.0 +Received: from exim (helo=koko) + by koko.hhs.nl with local-smtp (Exim 4.62) + (envelope-from ) + id 1Gpa8Y-0007DR-VX + for j.w.r.degoede at hhs.nl; Thu, 30 Nov 2006 01:50:51 +0100 +Received: from [68.178.232.10] (port=55956 helo=smtpout15-02.prod.mesa1.secureserver.net) + by koko.hhs.nl with smtp (Exim 4.62) + (envelope-from ) + id 1Gpa8Y-0007DM-Bx + for j.w.r.degoede at hhs.nl; Thu, 30 Nov 2006 01:50:50 +0100 +Received: (qmail 23995 invoked from network); 30 Nov 2006 00:50:48 -0000 +Received: from unknown (HELO gem-wbe25.prod.mesa1.secureserver.net) (64.202.189.228) + by smtpout15-02.prod.mesa1.secureserver.net with SMTP; 30 Nov 2006 00:50:48 -0000 +Received: (qmail 20967 invoked by uid 99); 30 Nov 2006 00:50:48 -0000 +Date: Wed, 29 Nov 2006 17:50:48 -0700 +From: todd at t3-i.com +Subject: RE: alphabet soup, laserwars en others license +To: Hans de Goede +Message-ID: <20061129175048.c1bf2b7c2c1de069cff39b794cd5d62e.b7005c9902.wbe at email.secureserver.net> +MIME-Version: 1.0 +Content-Type: TEXT/plain; CHARSET=US-ASCII +User-Agent: Web-Based Email 4.9.0 +X-Originating-IP: 70.157.254.177 +X-Anti-Virus: Kaspersky Anti-Virus for MailServers 5.5.2/RELEASE, bases: 30112006 #232888, status: clean + +Hello Hans, + +To your first request to release the other games (Alphabet Soup, Smashteroid, Laser War) under the Crystal Stacker license, I give you my permission to do so. + +As for vGolf, it is unfinished but the source code is available under the "Linux" packages on the web site. No Linux binaries exist as I have no idea how to make them so they work with all Linux versions :) I am fine with you releasing the current vGolf under the Crystal Stacker license as well. + +However, Secret of the Hose is closed-source at the request of the game designer. He wanted to keep it closed-sourced so that people wouldn't be able to cheat as easily in online play. I would love to release the source otherwise. I see no benefit personally in keeping my sources under wraps Your case of using them for educational purposes makes me quite happy. + +Sincerely, + +Todd + +> -------- Original Message -------- +> Subject: alphabet soup, laserwars en others license +> From: Hans de Goede +> Date: Wed, November 29, 2006 12:55 pm +> To: todd at t3-i.com +> +> Hi Todd, +> +> Remember me I mailed you patches for a Linux version for crystalstacker +> quite some time ago. and I've created Fedora Linux packages of +> crystalstacker so that Fedora users can easily install it. +> +> Besides a Linux enthousiast / Fedora developer I'm also a Computer +> Science teacher at a Dutch University. This period I'm teaching my +> students howto write portable code, so I thought it would be fun to give +> them some games written with allegro, but not with another OS like Linux +> in mind, to "port" to Linux. Today there was a practical lesson where +> they did just that and it was a great success. +> +> The managed to get smashteroid and alphabet soup running under Linux +> quite easily. Their work still needs some cleaning up and then I'll send +> it to you. Know that I've seen your other games in action I would like +> to package them for Fedora Linux too. +> +> I'm interested in creating packages for all your (non java) games, but +> lets start with those for which you currently already make source +> available: alphabet soup, smashteroid and laserwars. +> +> All 3 of these come with a Freeware-ish license currently in the text. I +> don't know if you remember, but we had some discussions about some rough +> (and thus for Fedora troublesome) edges with the crystalstacker license. +> +> In the end you put the following license on crystalstacker (for which +> I'm still very grateful): +> +> "Crystal Stacker is freeware. This means you can pass copies around +> freely provided you include this document in it's original form in your +> distribution. Please see the "Contacting Us" section of this document if +> you need to contact us for any reason. +> +> The source code is provided as-is and you may do with it whatsoever you +> please provided that you include this file in its unmodified form with +> any new distribution. NewCreature Design makes no gaurantees regarding +> the usability of the source but are willing to help with any problems +> you might run into. Please see the "Contacting Us" section of this +> document if you need to get in touch with us about any issues you have +> regarding the source." +> +> Are you willing to release: alphabet soup, smashteroid and laserwars +> under this license too? And in that case is it ok for me to distribute +> the current available versions under this license? +> +> Thanks & Regards, +> +> Hans +> +> +> p.s. +> +> While I'm asking any chance you could release source of any of your [...1767 lines suppressed...] --- smashteroid-1.11/source/objects.cc.fixes 2001-07-31 00:12:14.000000000 +0200 +++ smashteroid-1.11/source/objects.cc 2007-01-27 17:05:02.000000000 +0100 @@ -1,4 +1,5 @@ #include +#include //#include #include "objects.h" #include "collide.h" --- smashteroid-1.11/source/t3ssal.h.fixes 2001-07-18 03:55:56.000000000 +0200 +++ smashteroid-1.11/source/t3ssal.h 2007-01-27 17:05:02.000000000 +0100 @@ -7,6 +7,11 @@ extern "C" { #endif +/* Do we want to use pthreads? */ +#if !defined(ALLEGRO_WINDOWS) && !defined(T3SS_PTHREADS) +#define T3SS_PTHREADS +#endif + #define I_NULL -1 /* provide NULL value for signed integers */ #define MSAMPLE SAMPLE @@ -39,6 +44,14 @@ void t3ss_play_sound_ex(MSAMPLE * sp, int chan, int vol, int pan, int freq); void t3ss_play_sound_reserved(MSAMPLE * sp, int chan, int pan, int freq); int t3ss_place_sound(int x, int width); +void t3ss_pause_music(void); +void t3ss_resume_music(void); + +#ifdef T3SS_PTHREADS +#define t3ss_poll() +#else +void t3ss_poll(void); +#endif #ifdef __cplusplus } --- smashteroid-1.11/source/simon.cc.fixes 2001-07-27 15:11:00.000000000 +0200 +++ smashteroid-1.11/source/simon.cc 2007-01-27 17:05:02.000000000 +0100 @@ -15,15 +15,15 @@ void simon_init(void) { - simon_pic[0] = load_pcx("astro.dat#simon_0", NULL); - simon_pic[1] = load_pcx("astro.dat#simon_1", NULL); - simon_pic[2] = load_pcx("astro.dat#simon_2", NULL); - simon_pic[3] = load_pcx("astro.dat#simon_3", NULL); - simon_pic[4] = load_pcx("astro.dat#simon_4", NULL); - simon_sound[1] = t3ss_load_wav_fn("astro.dat#simon_sound_1"); - simon_sound[2] = t3ss_load_wav_fn("astro.dat#simon_sound_2"); - simon_sound[3] = t3ss_load_wav_fn("astro.dat#simon_sound_3"); - simon_sound[4] = t3ss_load_wav_fn("astro.dat#simon_sound_4"); + simon_pic[0] = load_pcx(DATADIR "astro.dat#simon_0", NULL); + simon_pic[1] = load_pcx(DATADIR "astro.dat#simon_1", NULL); + simon_pic[2] = load_pcx(DATADIR "astro.dat#simon_2", NULL); + simon_pic[3] = load_pcx(DATADIR "astro.dat#simon_3", NULL); + simon_pic[4] = load_pcx(DATADIR "astro.dat#simon_4", NULL); + simon_sound[1] = t3ss_load_wav_fn(DATADIR "astro.dat#simon_sound_1"); + simon_sound[2] = t3ss_load_wav_fn(DATADIR "astro.dat#simon_sound_2"); + simon_sound[3] = t3ss_load_wav_fn(DATADIR "astro.dat#simon_sound_3"); + simon_sound[4] = t3ss_load_wav_fn(DATADIR "astro.dat#simon_sound_4"); simon_over = 0; simon_count = 0; @@ -56,7 +56,7 @@ draw_sprite(astro_screen, simon_pic[simon_lit], 69, 10); ncd_draw_number(astro_screen, &astro_font, 286, 184, simon_count - 1 >= 0 ? simon_count - 1 : 0, 2); vsync(); - blit(astro_screen, screen, 0, 0, 1, 0, 320, 200); + stretch_blit(astro_screen, screen, 0, 0, 320, 200, 1*2, 0*2, 320*2, 480); } } --- smashteroid-1.11/source/pong.cc.fixes 2001-07-27 15:18:10.000000000 +0200 +++ smashteroid-1.11/source/pong.cc 2007-01-27 17:05:02.000000000 +0100 @@ -8,9 +8,10 @@ BASIC_SPRITE ball; int p1_score; int p2_score; -fix ball_acc = 1.0; -fix angle_chart[18] = { 32, 24, 16, 8, 0, 248, 240, 232, 224, - 96, 104, 112, 120, 128, 136, 144, 152, 160}; +fix ball_acc(1.0); +fix angle_chart[18] = { fix(32), fix(24), fix(16), fix(8), fix(0), fix(248), + fix(240), fix(232), fix(224), fix(96), fix(104), fix(112), fix(120), + fix(128), fix(136), fix(144), fix(152), fix(160) }; char current_angle = 5; int predicted_y; @@ -117,33 +118,33 @@ void pong_init(void) { - pong_bg = load_pcx("astro.dat#pong_backdrop", NULL); - load_animation(&paddle_animation, "astro.dat#pong_paddle"); - load_animation(&ball_animation, "astro.dat#pong_ball"); + pong_bg = load_pcx(DATADIR "astro.dat#pong_backdrop", NULL); + load_animation(&paddle_animation, DATADIR "astro.dat#pong_paddle"); + load_animation(&ball_animation, DATADIR "astro.dat#pong_ball"); /* initialize paddle 0 */ paddle[0].initialize(&paddle_animation); - paddle[0].set_friction(0, 0.5); - paddle[0].set_acceleration(0, 1); - paddle[0].set_max_speed(0, 1.5); - paddle[0].set_boundary(2, 18, 308, 166, BOUNDARY_STOP); - paddle[0].set_position(2, 76 + 16); + paddle[0].set_friction(fix(0), fix(0.5)); + paddle[0].set_acceleration(fix(0), fix(1)); + paddle[0].set_max_speed(fix(0), fix(1.5)); + paddle[0].set_boundary(fix(2), fix(18), fix(308), fix(166), BOUNDARY_STOP); + paddle[0].set_position(fix(2), fix(76 + 16)); paddle[0].activate(); /* initialize paddle 1 */ paddle[1].initialize(&paddle_animation); - paddle[1].set_friction(0, 0.5); - paddle[1].set_acceleration(0, 1); - paddle[1].set_max_speed(0, 1.5); - paddle[1].set_boundary(2, 18, 308, 166, BOUNDARY_STOP); - paddle[1].set_position(308, 76 + 16); + paddle[1].set_friction(fix(0), fix(0.5)); + paddle[1].set_acceleration(fix(0), fix(1)); + paddle[1].set_max_speed(fix(0), fix(1.5)); + paddle[1].set_boundary(fix(2), fix(18), fix(308), fix(166), BOUNDARY_STOP); + paddle[1].set_position(fix(308), fix(76 + 16)); paddle[1].activate(); /* ball */ ball_acc = 1; current_angle = ncd_random() % 18; ball.initialize(&ball_animation); - ball.set_position(155, 82); + ball.set_position(fix(155), fix(82)); ball.set_speed(ball_acc * cos(angle_chart[current_angle]), ball_acc * sin(angle_chart[current_angle])); ball.activate(); @@ -211,7 +212,7 @@ } if(ball.get_x() <= 2) { - ball.set_position(2, ball.get_y()); + ball.set_position(fix(2), ball.get_y()); current_angle = pick_reverse_angle_x(current_angle); if(mode == 0) { @@ -224,7 +225,7 @@ } if(ball.get_x() >= 308) { - ball.set_position(308, ball.get_y()); + ball.set_position(fix(308), ball.get_y()); current_angle = pick_reverse_angle_x(current_angle); if(mode == 0) { @@ -236,7 +237,7 @@ } if(ball.get_y() <= 18) { - ball.set_position(ball.get_x(), 18); + ball.set_position(ball.get_x(), fix(18)); current_angle = pick_reverse_angle_y(current_angle); ball.set_speed(ball_acc * cos(angle_chart[current_angle]), ball_acc * sin(angle_chart[current_angle])); if(mode == 0) @@ -246,7 +247,7 @@ } if(ball.get_y() >= 190) { - ball.set_position(ball.get_x(), 190); + ball.set_position(ball.get_x(), fix(190)); current_angle = pick_reverse_angle_y(current_angle); ball.set_speed(ball_acc * cos(angle_chart[current_angle]), ball_acc * sin(angle_chart[current_angle])); if(mode == 0) @@ -312,7 +313,7 @@ ncd_draw_number(astro_screen, &astro_font, 0, 0, p1_score, 2); ncd_draw_number(astro_screen, &astro_font, 286, 0, p2_score, 2); vsync(); - blit(astro_screen, screen, 0, 0, 1, 0, 320, 200); + stretch_blit(astro_screen, screen, 0, 0, 320, 200, 1*2, 0*2, 320*2, 480); } void pong_check_winner(void) @@ -327,7 +328,7 @@ ncd_draw_number(astro_screen, &astro_font, 286, 0, p2_score, 2); ncd_printf(astro_screen, &astro_font, 46, 100, "Player 1 Wins!"); vsync(); - blit(astro_screen, screen, 0, 0, 1, 0, 320, 200); + stretch_blit(astro_screen, screen, 0, 0, 320, 200, 1*2, 0*2, 320*2, 480); clear_keybuf(); while(!keypressed()); pong_over = 1; @@ -342,7 +343,7 @@ ncd_draw_number(astro_screen, &astro_font, 286, 0, p2_score, 2); ncd_printf(astro_screen, &astro_font, 47, 100, "Player 2 Wins!"); vsync(); - blit(astro_screen, screen, 0, 0, 1, 0, 320, 200); + stretch_blit(astro_screen, screen, 0, 0, 320, 200, 1*2, 0*2, 320*2, 480); clear_keybuf(); while(!keypressed()); pong_over = 1; --- NEW FILE smashteroid.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Smashteroid Comment=Astrosmash Remake Exec=smashteroid Icon=smashteroid.png Terminal=false StartupNotify=false Type=Application Categories=Application;Game;ArcadeGame; --- NEW FILE smashteroid.spec --- Name: smashteroid Version: 1.11 Release: 2%{?dist} Summary: Astrosmash Remake Group: Amusements/Games License: Freeware URL: http://www.t3-i.com/smashteroid.htm Source0: http://www.t3-i.com/ncdgames/astro111src.zip Source1: %{name}.desktop Source2: %{name}.png Patch0: astro-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: allegro-devel dumb-devel desktop-file-utils Requires: hicolor-icon-theme %description Smashteroid is a remake of the old Intellivision game Astrosmash. Your job is to defend Earth from the onslaught of asteroids. Features three game modes with exciting new twists. %prep %setup -q -c %patch0 -p1 -z .fixes sed -i 's/\r//' distro/readme.txt distro/history.txt source.txt %build pushd source make %{?_smp_mflags} -f Makefile.unix PREFIX=%{_prefix} \ CFLAGS="$RPM_OPT_FLAGS -fsigned-char -Wno-deprecated-declarations" popd %install rm -rf $RPM_BUILD_ROOT pushd source make -f Makefile.unix install PREFIX=$RPM_BUILD_ROOT%{_prefix} popd # below is the desktop file and icon stuff. mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE1} mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps install -p -m 644 %{SOURCE2} \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files %defattr(-,root,root,-) %doc distro/readme.txt distro/history.txt source.txt license-change.txt %{_bindir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/48x48/apps/%{name}.png %changelog * Wed Jan 31 2007 Hans de Goede 1.11-2 - Not only create but actually package license-change.txt - Add Requires: hicolor-icon-theme - Use: http://www.t3-i.com/smashteroid.htm as URL * Thu Jan 25 2007 Hans de Goede 1.11-1 - Initial Fedora Extras package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/smashteroid/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Feb 2007 08:51:29 -0000 1.1 +++ .cvsignore 1 Feb 2007 08:52:14 -0000 1.2 @@ -0,0 +1 @@ +astro111src.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/smashteroid/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Feb 2007 08:51:29 -0000 1.1 +++ sources 1 Feb 2007 08:52:14 -0000 1.2 @@ -0,0 +1 @@ +fbdd2aed12da3f2e4802c629fcdd7979 astro111src.zip From fedora-extras-commits at redhat.com Thu Feb 1 08:54:54 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 1 Feb 2007 03:54:54 -0500 Subject: owners owners.list,1.2301,1.2302 Message-ID: <200702010854.l118ssOh030657@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30641 Modified Files: owners.list Log Message: added smashteroid Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.2301 retrieving revision 1.2302 diff -u -r1.2301 -r1.2302 --- owners.list 31 Jan 2007 13:23:05 -0000 1.2301 +++ owners.list 1 Feb 2007 08:54:23 -0000 1.2302 @@ -701,9 +701,9 @@ Fedora Extras|gtk+extra|A library of gtk+ widgets|aportal at univ-montp2.fr|extras-qa at fedoraproject.org| Fedora Extras|gtk-gnutella|GUI based Gnutella Client|dmitry at butskoy.name|extras-qa at fedoraproject.org| Fedora Extras|gtk-murrine-engine|Murrine GTK2 engine|sdl.web at gmail.com|extras-qa at fedoraproject.org| -Fedora Extras|gtk-rezlooks-engine|Rezlooks GTK2 engine|maxx at krakoa.dk|extras-qa at fedoraproject.org| Fedora Extras|Gtk-Perl|Perl extensions for GTK+|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|gtk-qt-engine|a project allowing GTK to use Qt widget styles|rdieter at math.unl.edu|extras-qa at fedoraproject.org| +Fedora Extras|gtk-rezlooks-engine|Rezlooks GTK2 engine|maxx at krakoa.dk|extras-qa at fedoraproject.org| Fedora Extras|gtk-sharp|gtk 1.2 bindings for mono|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org| Fedora Extras|gtk-xfce-engine|Port of Xfce engine to GTK+-2.0|kevin at tummy.com|extras-qa at fedoraproject.org| Fedora Extras|gtk2hs|A Haskell binding of Gtk+|petersen at redhat.com|extras-qa at fedoraproject.org| @@ -1153,8 +1153,8 @@ Fedora Extras|Maelstrom|A space combat game.|notting at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|magicor|Push ice blocks around to extenguish all fires|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|MagicPoint|X based presentation software|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|rms at 1407.org,byte at fedoraproject.org -Fedora Extras|mailgraph|A RRDtool frontend for Mail statistics|bjohnson at symetrix.com|extras-qa at fedoraproject.org| Fedora Extras|mail-notification|Mail Notification is a status icon that informs you if you have new mail|fedora at leemhuis.info|extras-qa at fedoraproject.org| +Fedora Extras|mailgraph|A RRDtool frontend for Mail statistics|bjohnson at symetrix.com|extras-qa at fedoraproject.org| Fedora Extras|makebootfat|Utility for creation bootable FAT disk|dmitry at butskoy.name|extras-qa at fedoraproject.org| Fedora Extras|man-pages-uk|Ukrainian man pages from the Linux Documentation Project|andy at smile.org.ua|extras-qa at fedoraproject.org| Fedora Extras|manaworld|2D mmorpg game|wart at kobold.org|extras-qa at fedoraproject.org| @@ -2261,9 +2261,9 @@ Fedora Extras|rasqal|Rasqal RDF Query Library|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|ratpoison|Simplified window manager with no mouse support|jwb at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|rawstudio|Digital camera raw-image converter|giallu at gmail.com|extras-qa at fedoraproject.org| +Fedora Extras|rb_libtorrent|A C++ BitTorrent library aiming to be the best alternative|peter at thecodergeek.com|extras-qa at fedoraproject.org| Fedora Extras|rblcheck|A command-line interface to RBL-style listings|jima at beer.tclug.org|extras-qa at fedoraproject.org|oliver at linux-kernel.at Fedora Extras|rbldnsd|Small, fast daemon to serve DNSBLs|paul at city-fan.org|extras-qa at fedoraproject.org| -Fedora Extras|rb_libtorrent|A C++ BitTorrent library aiming to be the best alternative|peter at thecodergeek.com|extras-qa at fedoraproject.org| Fedora Extras|rdiff-backup|Convenient and transparent local/remote incremental mirror/backup|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|kevin at tummy.com Fedora Extras|recode|Conversion between character sets and surfaces|z.kota at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|regexxer|A nifty GUI search/replace tool|fedora at christoph-wickert.de|extras-qa at fedoraproject.org| @@ -2388,6 +2388,7 @@ Fedora Extras|sloccount|Measures source lines of code (SLOC) in programs|bnocera at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|smart|Next generation package handling tool|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org| Fedora Extras|smarteiffel|The GNU Eiffel Compiler and Libraries|gemi at bluewin.ch|extras-qa at fedoraproject.org| +Fedora Extras|smashteroid|Astrosmash Remake|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org Fedora Extras|smb4k|The SMB/CIFS Share Browser for KDE|mgarski at post.pl|extras-qa at fedoraproject.org| Fedora Extras|smbldap-tools|User and group administration tools for Samba/OpenLDAP|paul at city-fan.org|extras-qa at fedoraproject.org| Fedora Extras|smeg|Simple menu editor for GNOME|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at guezz.net From fedora-extras-commits at redhat.com Thu Feb 1 09:38:28 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 1 Feb 2007 04:38:28 -0500 Subject: comps comps-fe7.xml.in,1.96,1.97 Message-ID: <200702010938.l119cSqt002095@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2080 Modified Files: comps-fe7.xml.in Log Message: add smashteroid Index: comps-fe7.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe7.xml.in,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- comps-fe7.xml.in 29 Jan 2007 03:58:03 -0000 1.96 +++ comps-fe7.xml.in 1 Feb 2007 09:37:58 -0000 1.97 @@ -462,6 +462,7 @@ scorched3d scummvm shippy + smashteroid sopwith starfighter sturmbahnfahrer From fedora-extras-commits at redhat.com Thu Feb 1 10:56:01 2007 From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr)) Date: Thu, 1 Feb 2007 05:56:01 -0500 Subject: rpms/CCfits/devel CCfits-1.6-includecfitsiopath.patch, NONE, 1.1 CCfits.spec, 1.8, 1.9 Message-ID: <200702011056.l11Au1Vp005928@cvs-int.fedora.redhat.com> Author: sergiopr Update of /cvs/extras/rpms/CCfits/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5907 Modified Files: CCfits.spec Added Files: CCfits-1.6-includecfitsiopath.patch Log Message: * Thu Feb 01 2007 Sergio Pascual 1.6-2 - Patch to fix the include directives of cfitsio in header files. * Mon Dec 11 2006 Sergio Pascual 1.6-1 - New upstream version 1.6. Only compiles with cfitsio >= 3.020. * Tue Sep 12 2006 Sergio Pascual 1.5-3 - Rebuild for FC6. * Fri Jul 28 2006 Sergio Pascual 1.5-2 - Removed perl files in the documentation (bug #200517). * Thu Jul 27 2006 Sergio Pascual 1.5-1 - New upstream source 1.5. - Removed patch CCfits-1.4-g++4.patch (integrated in the source) - Perl files in docs removed in the source. * Wed Mar 08 2006 Sergio Pascual 1.4-4 - Removed explicit Buildrequires gcc-c++. * Tue Mar 07 2006 Sergio Pascual 1.4-3 - Rebuilt with new upstream source. * Mon Mar 06 2006 Sergio Pascual 1.4-2 - Removed Source with license file License.txt. * Mon Feb 20 2006 Sergio Pascual 1.4-1 - Removed perl files in documentation. - Changed license type to BSD. - Main summary changed and trailing dots removed. - Removed -rpath in the shared library. * Thu Feb 16 2006 Sergio Pascual 1.4-0 - Initial spec file. CCfits-1.6-includecfitsiopath.patch: --- NEW FILE CCfits-1.6-includecfitsiopath.patch --- diff -ur CCfits.old/CCfits.h CCfits/CCfits.h --- CCfits.old/CCfits.h 2006-11-03 23:07:28.000000000 +0100 +++ CCfits/CCfits.h 2007-02-01 11:33:56.000000000 +0100 @@ -13,7 +13,7 @@ // string #include // fitsio -#include "fitsio.h" +#include namespace CCfits { class ExtHDU; @@ -21,7 +21,7 @@ } // namespace CCfits #include #include -#include "longnam.h" +#include #include "float.h" diff -ur CCfits.old/FITSBase.h CCfits/FITSBase.h --- CCfits.old/FITSBase.h 2006-11-03 23:07:28.000000000 +0100 +++ CCfits/FITSBase.h 2007-02-01 11:34:25.000000000 +0100 @@ -13,7 +13,7 @@ // string #include // fitsio -#include "fitsio.h" +#include // map #include // CCfitsHeader Index: CCfits.spec =================================================================== RCS file: /cvs/extras/rpms/CCfits/devel/CCfits.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- CCfits.spec 11 Dec 2006 17:50:24 -0000 1.8 +++ CCfits.spec 1 Feb 2007 10:55:30 -0000 1.9 @@ -1,6 +1,6 @@ Name: CCfits Version: 1.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A C++ interface for cfitsio Group: Development/Libraries @@ -8,6 +8,7 @@ URL: http://heasarc.gsfc.nasa.gov/docs/software/fitsio/ccfits Source0: http://heasarc.gsfc.nasa.gov/docs/software/fitsio/ccfits/%{name}-%{version}.tar.gz Patch0: CCfits-1.6-removerpath.patch +Patch1: CCfits-1.6-includecfitsiopath.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cfitsio-devel >= 3.020 @@ -39,6 +40,7 @@ %prep %setup -q -n CCfits %patch0 -p1 +%patch1 -p1 # Remove perl files in html docs rm -rf %{_builddir}/%{name}/html/*.pl @@ -75,6 +77,8 @@ %doc html %changelog +* Thu Feb 01 2007 Sergio Pascual 1.6-2 +- Patch to fix the include directives of cfitsio in header files. * Mon Dec 11 2006 Sergio Pascual 1.6-1 - New upstream version 1.6. Only compiles with cfitsio >= 3.020. * Tue Sep 12 2006 Sergio Pascual 1.5-3 From fedora-extras-commits at redhat.com Thu Feb 1 11:13:39 2007 From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr)) Date: Thu, 1 Feb 2007 06:13:39 -0500 Subject: rpms/CCfits/FC-6 CCfits-1.6-includecfitsiopath.patch, NONE, 1.1 CCfits.spec, 1.7, 1.8 Message-ID: <200702011113.l11BDdR3009401@cvs-int.fedora.redhat.com> Author: sergiopr Update of /cvs/extras/rpms/CCfits/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9383 Modified Files: CCfits.spec Added Files: CCfits-1.6-includecfitsiopath.patch Log Message: * Thu Feb 01 2007 Sergio Pascual 1.6-2 - Patch to fix the include directives of cfitsio in header files. * Mon Dec 11 2006 Sergio Pascual 1.6-1 - New upstream version 1.6. Only compiles with cfitsio >= 3.020. * Tue Sep 12 2006 Sergio Pascual 1.5-3 - Rebuild for FC6. * Fri Jul 28 2006 Sergio Pascual 1.5-2 - Removed perl files in the documentation (bug #200517). * Thu Jul 27 2006 Sergio Pascual 1.5-1 - New upstream source 1.5. - Removed patch CCfits-1.4-g++4.patch (integrated in the source) - Perl files in docs removed in the source. * Wed Mar 08 2006 Sergio Pascual 1.4-4 - Removed explicit Buildrequires gcc-c++. * Tue Mar 07 2006 Sergio Pascual 1.4-3 - Rebuilt with new upstream source. * Mon Mar 06 2006 Sergio Pascual 1.4-2 - Removed Source with license file License.txt. * Mon Feb 20 2006 Sergio Pascual 1.4-1 - Removed perl files in documentation. - Changed license type to BSD. - Main summary changed and trailing dots removed. - Removed -rpath in the shared library. * Thu Feb 16 2006 Sergio Pascual 1.4-0 - Initial spec file. CCfits-1.6-includecfitsiopath.patch: --- NEW FILE CCfits-1.6-includecfitsiopath.patch --- diff -ur CCfits.old/CCfits.h CCfits/CCfits.h --- CCfits.old/CCfits.h 2006-11-03 23:07:28.000000000 +0100 +++ CCfits/CCfits.h 2007-02-01 11:33:56.000000000 +0100 @@ -13,7 +13,7 @@ // string #include // fitsio -#include "fitsio.h" +#include namespace CCfits { class ExtHDU; @@ -21,7 +21,7 @@ } // namespace CCfits #include #include -#include "longnam.h" +#include #include "float.h" diff -ur CCfits.old/FITSBase.h CCfits/FITSBase.h --- CCfits.old/FITSBase.h 2006-11-03 23:07:28.000000000 +0100 +++ CCfits/FITSBase.h 2007-02-01 11:34:25.000000000 +0100 @@ -13,7 +13,7 @@ // string #include // fitsio -#include "fitsio.h" +#include // map #include // CCfitsHeader Index: CCfits.spec =================================================================== RCS file: /cvs/extras/rpms/CCfits/FC-6/CCfits.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- CCfits.spec 11 Dec 2006 18:32:48 -0000 1.7 +++ CCfits.spec 1 Feb 2007 11:13:09 -0000 1.8 @@ -1,6 +1,6 @@ Name: CCfits Version: 1.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A C++ interface for cfitsio Group: Development/Libraries @@ -8,6 +8,7 @@ URL: http://heasarc.gsfc.nasa.gov/docs/software/fitsio/ccfits Source0: http://heasarc.gsfc.nasa.gov/docs/software/fitsio/ccfits/%{name}-%{version}.tar.gz Patch0: CCfits-1.6-removerpath.patch +Patch1: CCfits-1.6-includecfitsiopath.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cfitsio-devel >= 3.020 @@ -39,6 +40,7 @@ %prep %setup -q -n CCfits %patch0 -p1 +%patch1 -p1 # Remove perl files in html docs rm -rf %{_builddir}/%{name}/html/*.pl @@ -75,6 +77,8 @@ %doc html %changelog +* Thu Feb 01 2007 Sergio Pascual 1.6-2 +- Patch to fix the include directives of cfitsio in header files. * Mon Dec 11 2006 Sergio Pascual 1.6-1 - New upstream version 1.6. Only compiles with cfitsio >= 3.020. * Tue Sep 12 2006 Sergio Pascual 1.5-3 From fedora-extras-commits at redhat.com Thu Feb 1 11:17:07 2007 From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr)) Date: Thu, 1 Feb 2007 06:17:07 -0500 Subject: rpms/CCfits/FC-5 CCfits-1.6-includecfitsiopath.patch, NONE, 1.1 CCfits.spec, 1.5, 1.6 Message-ID: <200702011117.l11BH7Ia009490@cvs-int.fedora.redhat.com> Author: sergiopr Update of /cvs/extras/rpms/CCfits/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9470 Modified Files: CCfits.spec Added Files: CCfits-1.6-includecfitsiopath.patch Log Message: * Thu Feb 01 2007 Sergio Pascual 1.6-2 - Patch to fix the include directives of cfitsio in header files. * Mon Dec 11 2006 Sergio Pascual 1.6-1 - New upstream version 1.6. Only compiles with cfitsio >= 3.020. * Tue Sep 12 2006 Sergio Pascual 1.5-3 - Rebuild for FC6. * Fri Jul 28 2006 Sergio Pascual 1.5-2 - Removed perl files in the documentation (bug #200517). * Thu Jul 27 2006 Sergio Pascual 1.5-1 - New upstream source 1.5. - Removed patch CCfits-1.4-g++4.patch (integrated in the source) - Perl files in docs removed in the source. * Wed Mar 08 2006 Sergio Pascual 1.4-4 - Removed explicit Buildrequires gcc-c++. * Tue Mar 07 2006 Sergio Pascual 1.4-3 - Rebuilt with new upstream source. * Mon Mar 06 2006 Sergio Pascual 1.4-2 - Removed Source with license file License.txt. * Mon Feb 20 2006 Sergio Pascual 1.4-1 - Removed perl files in documentation. - Changed license type to BSD. - Main summary changed and trailing dots removed. - Removed -rpath in the shared library. * Thu Feb 16 2006 Sergio Pascual 1.4-0 - Initial spec file. CCfits-1.6-includecfitsiopath.patch: --- NEW FILE CCfits-1.6-includecfitsiopath.patch --- diff -ur CCfits.old/CCfits.h CCfits/CCfits.h --- CCfits.old/CCfits.h 2006-11-03 23:07:28.000000000 +0100 +++ CCfits/CCfits.h 2007-02-01 11:33:56.000000000 +0100 @@ -13,7 +13,7 @@ // string #include // fitsio -#include "fitsio.h" +#include namespace CCfits { class ExtHDU; @@ -21,7 +21,7 @@ } // namespace CCfits #include #include -#include "longnam.h" +#include #include "float.h" diff -ur CCfits.old/FITSBase.h CCfits/FITSBase.h --- CCfits.old/FITSBase.h 2006-11-03 23:07:28.000000000 +0100 +++ CCfits/FITSBase.h 2007-02-01 11:34:25.000000000 +0100 @@ -13,7 +13,7 @@ // string #include // fitsio -#include "fitsio.h" +#include // map #include // CCfitsHeader Index: CCfits.spec =================================================================== RCS file: /cvs/extras/rpms/CCfits/FC-5/CCfits.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- CCfits.spec 11 Dec 2006 18:34:42 -0000 1.5 +++ CCfits.spec 1 Feb 2007 11:16:37 -0000 1.6 @@ -1,6 +1,6 @@ Name: CCfits Version: 1.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A C++ interface for cfitsio Group: Development/Libraries @@ -8,6 +8,7 @@ URL: http://heasarc.gsfc.nasa.gov/docs/software/fitsio/ccfits Source0: http://heasarc.gsfc.nasa.gov/docs/software/fitsio/ccfits/%{name}-%{version}.tar.gz Patch0: CCfits-1.6-removerpath.patch +Patch1: CCfits-1.6-includecfitsiopath.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cfitsio-devel >= 3.020 @@ -39,6 +40,7 @@ %prep %setup -q -n CCfits %patch0 -p1 +%patch1 -p1 # Remove perl files in html docs rm -rf %{_builddir}/%{name}/html/*.pl @@ -75,6 +77,8 @@ %doc html %changelog +* Thu Feb 01 2007 Sergio Pascual 1.6-2 +- Patch to fix the include directives of cfitsio in header files. * Mon Dec 11 2006 Sergio Pascual 1.6-1 - New upstream version 1.6. Only compiles with cfitsio >= 3.020. * Tue Sep 12 2006 Sergio Pascual 1.5-3 From fedora-extras-commits at redhat.com Thu Feb 1 11:38:31 2007 From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu)) Date: Thu, 1 Feb 2007 06:38:31 -0500 Subject: rpms/sysprof-kmod/devel sysprof-kmod.spec,1.29,1.30 Message-ID: <200702011138.l11BcVOL009768@cvs-int.fedora.redhat.com> Author: giallu Update of /cvs/extras/rpms/sysprof-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9749 Modified Files: sysprof-kmod.spec Log Message: Rebuild for kernel 2.6.19-1.2917.fc7 Index: sysprof-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/sysprof-kmod/devel/sysprof-kmod.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sysprof-kmod.spec 1 Feb 2007 08:11:39 -0000 1.29 +++ sysprof-kmod.spec 1 Feb 2007 11:38:01 -0000 1.30 @@ -4,7 +4,7 @@ # end stuff to be ... # hardcode for now: -%{!?kversion: %define kversion 2.6.19-1.2916.fc7} +%{!?kversion: %define kversion 2.6.19-1.2917.fc7} # hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g. # --define "kversion 2.6.16-1.2096_FC5" From fedora-extras-commits at redhat.com Thu Feb 1 12:19:34 2007 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Thu, 1 Feb 2007 07:19:34 -0500 Subject: rpms/chmlib import.log,1.5,1.6 Message-ID: <200702011219.l11CJYnf013333@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/chmlib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13295 Modified Files: import.log Log Message: auto-import chmlib-0.39-1 on branch FC-4 from chmlib-0.39-1.src.rpm ver. 0.39 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/chmlib/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 28 Jun 2006 20:05:18 -0000 1.5 +++ import.log 1 Feb 2007 12:19:03 -0000 1.6 @@ -2,3 +2,4 @@ chmlib-0_38-1:HEAD:chmlib-0.38-1.src.rpm:1151524439 chmlib-0_38-1:FC-5:chmlib-0.38-1.src.rpm:1151524717 chmlib-0_38-1:FC-4:chmlib-0.38-1.src.rpm:1151525060 +chmlib-0_39-1:FC-4:chmlib-0.39-1.src.rpm:1170332330 From fedora-extras-commits at redhat.com Thu Feb 1 12:19:34 2007 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Thu, 1 Feb 2007 07:19:34 -0500 Subject: rpms/chmlib/FC-4 .cvsignore, 1.3, 1.4 chmlib.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200702011219.l11CJYHd013340@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/chmlib/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13295/FC-4 Modified Files: .cvsignore chmlib.spec sources Log Message: auto-import chmlib-0.39-1 on branch FC-4 from chmlib-0.39-1.src.rpm ver. 0.39 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/chmlib/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Jun 2006 20:05:19 -0000 1.3 +++ .cvsignore 1 Feb 2007 12:19:04 -0000 1.4 @@ -1 +1 @@ -chmlib-0.38.tar.bz2 +chmlib-0.39.tar.bz2 Index: chmlib.spec =================================================================== RCS file: /cvs/extras/rpms/chmlib/FC-4/chmlib.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- chmlib.spec 28 Jun 2006 20:05:19 -0000 1.8 +++ chmlib.spec 1 Feb 2007 12:19:04 -0000 1.9 @@ -1,6 +1,6 @@ Name: chmlib Summary: Library for dealing with ITSS/CHM format files -Version: 0.38 +Version: 0.39 Release: 1%{?dist} License: LGPL Group: Development/Libraries @@ -56,6 +56,12 @@ %changelog +* Thu Feb 1 2007 Peter Lemenkov 0.39-1 +- Ver. 0.39 + +* Tue Sep 12 2006 Peter Lemenkov 0.38-2%{?dist} +- rebuild for FC6 + * Wed Jun 28 2006 Peter Lemenkov 0.38-1%{?dist} - Version 0.38 Index: sources =================================================================== RCS file: /cvs/extras/rpms/chmlib/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Jun 2006 20:05:19 -0000 1.3 +++ sources 1 Feb 2007 12:19:04 -0000 1.4 @@ -1 +1 @@ -d72661526aaea377ed30e9f58a086964 chmlib-0.38.tar.bz2 +debed1a0bdded7a12d3d967e497cea9c chmlib-0.39.tar.bz2 From fedora-extras-commits at redhat.com Thu Feb 1 12:21:14 2007 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Thu, 1 Feb 2007 07:21:14 -0500 Subject: rpms/chmlib import.log,1.6,1.7 Message-ID: <200702011221.l11CLEdH013446@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/chmlib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13409 Modified Files: import.log Log Message: auto-import chmlib-0.39-1 on branch FC-5 from chmlib-0.39-1.src.rpm ver. 0.39 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/chmlib/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 1 Feb 2007 12:19:03 -0000 1.6 +++ import.log 1 Feb 2007 12:20:44 -0000 1.7 @@ -3,3 +3,4 @@ chmlib-0_38-1:FC-5:chmlib-0.38-1.src.rpm:1151524717 chmlib-0_38-1:FC-4:chmlib-0.38-1.src.rpm:1151525060 chmlib-0_39-1:FC-4:chmlib-0.39-1.src.rpm:1170332330 +chmlib-0_39-1:FC-5:chmlib-0.39-1.src.rpm:1170332429 From fedora-extras-commits at redhat.com Thu Feb 1 12:21:14 2007 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Thu, 1 Feb 2007 07:21:14 -0500 Subject: rpms/chmlib/FC-5 .cvsignore, 1.3, 1.4 chmlib.spec, 1.12, 1.13 sources, 1.3, 1.4 Message-ID: <200702011221.l11CLE3m013451@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/chmlib/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13409/FC-5 Modified Files: .cvsignore chmlib.spec sources Log Message: auto-import chmlib-0.39-1 on branch FC-5 from chmlib-0.39-1.src.rpm ver. 0.39 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/chmlib/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Jun 2006 19:59:02 -0000 1.3 +++ .cvsignore 1 Feb 2007 12:20:44 -0000 1.4 @@ -1 +1 @@ -chmlib-0.38.tar.bz2 +chmlib-0.39.tar.bz2 Index: chmlib.spec =================================================================== RCS file: /cvs/extras/rpms/chmlib/FC-5/chmlib.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- chmlib.spec 28 Jun 2006 19:59:02 -0000 1.12 +++ chmlib.spec 1 Feb 2007 12:20:44 -0000 1.13 @@ -1,6 +1,6 @@ Name: chmlib Summary: Library for dealing with ITSS/CHM format files -Version: 0.38 +Version: 0.39 Release: 1%{?dist} License: LGPL Group: Development/Libraries @@ -56,6 +56,12 @@ %changelog +* Thu Feb 1 2007 Peter Lemenkov 0.39-1 +- Ver. 0.39 + +* Tue Sep 12 2006 Peter Lemenkov 0.38-2%{?dist} +- rebuild for FC6 + * Wed Jun 28 2006 Peter Lemenkov 0.38-1%{?dist} - Version 0.38 Index: sources =================================================================== RCS file: /cvs/extras/rpms/chmlib/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Jun 2006 19:59:02 -0000 1.3 +++ sources 1 Feb 2007 12:20:44 -0000 1.4 @@ -1 +1 @@ -d72661526aaea377ed30e9f58a086964 chmlib-0.38.tar.bz2 +debed1a0bdded7a12d3d967e497cea9c chmlib-0.39.tar.bz2 From fedora-extras-commits at redhat.com Thu Feb 1 12:23:01 2007 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Thu, 1 Feb 2007 07:23:01 -0500 Subject: rpms/chmlib/FC-6 .cvsignore, 1.3, 1.4 chmlib.spec, 1.11, 1.12 sources, 1.3, 1.4 Message-ID: <200702011223.l11CN1hr013570@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/chmlib/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13529/FC-6 Modified Files: .cvsignore chmlib.spec sources Log Message: auto-import chmlib-0.39-1 on branch FC-6 from chmlib-0.39-1.src.rpm ver. 0.39 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/chmlib/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Jun 2006 19:54:19 -0000 1.3 +++ .cvsignore 1 Feb 2007 12:22:31 -0000 1.4 @@ -1 +1 @@ -chmlib-0.38.tar.bz2 +chmlib-0.39.tar.bz2 Index: chmlib.spec =================================================================== RCS file: /cvs/extras/rpms/chmlib/FC-6/chmlib.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- chmlib.spec 12 Sep 2006 05:06:11 -0000 1.11 +++ chmlib.spec 1 Feb 2007 12:22:31 -0000 1.12 @@ -1,7 +1,7 @@ Name: chmlib Summary: Library for dealing with ITSS/CHM format files -Version: 0.38 -Release: 2%{?dist} +Version: 0.39 +Release: 1%{?dist} License: LGPL Group: Development/Libraries Url: http://66.93.236.84/~jedwin/projects/chmlib/ @@ -56,6 +56,9 @@ %changelog +* Thu Feb 1 2007 Peter Lemenkov 0.39-1 +- Ver. 0.39 + * Tue Sep 12 2006 Peter Lemenkov 0.38-2%{?dist} - rebuild for FC6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/chmlib/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Jun 2006 19:54:19 -0000 1.3 +++ sources 1 Feb 2007 12:22:31 -0000 1.4 @@ -1 +1 @@ -d72661526aaea377ed30e9f58a086964 chmlib-0.38.tar.bz2 +debed1a0bdded7a12d3d967e497cea9c chmlib-0.39.tar.bz2 From fedora-extras-commits at redhat.com Thu Feb 1 12:23:00 2007 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Thu, 1 Feb 2007 07:23:00 -0500 Subject: rpms/chmlib import.log,1.7,1.8 Message-ID: <200702011223.l11CN0TO013565@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/chmlib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13529 Modified Files: import.log Log Message: auto-import chmlib-0.39-1 on branch FC-6 from chmlib-0.39-1.src.rpm ver. 0.39 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/chmlib/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 1 Feb 2007 12:20:44 -0000 1.7 +++ import.log 1 Feb 2007 12:22:30 -0000 1.8 @@ -4,3 +4,4 @@ chmlib-0_38-1:FC-4:chmlib-0.38-1.src.rpm:1151525060 chmlib-0_39-1:FC-4:chmlib-0.39-1.src.rpm:1170332330 chmlib-0_39-1:FC-5:chmlib-0.39-1.src.rpm:1170332429 +chmlib-0_39-1:FC-6:chmlib-0.39-1.src.rpm:1170332536 From fedora-extras-commits at redhat.com Thu Feb 1 12:25:23 2007 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Thu, 1 Feb 2007 07:25:23 -0500 Subject: rpms/chmlib import.log,1.8,1.9 Message-ID: <200702011225.l11CPNxE013683@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/chmlib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13643 Modified Files: import.log Log Message: auto-import chmlib-0.39-1 on branch devel from chmlib-0.39-1.src.rpm ver. 0.39 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/chmlib/import.log,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- import.log 1 Feb 2007 12:22:30 -0000 1.8 +++ import.log 1 Feb 2007 12:24:53 -0000 1.9 @@ -5,3 +5,4 @@ chmlib-0_39-1:FC-4:chmlib-0.39-1.src.rpm:1170332330 chmlib-0_39-1:FC-5:chmlib-0.39-1.src.rpm:1170332429 chmlib-0_39-1:FC-6:chmlib-0.39-1.src.rpm:1170332536 +chmlib-0_39-1:HEAD:chmlib-0.39-1.src.rpm:1170332678 From fedora-extras-commits at redhat.com Thu Feb 1 12:25:24 2007 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Thu, 1 Feb 2007 07:25:24 -0500 Subject: rpms/chmlib/devel .cvsignore, 1.3, 1.4 chmlib.spec, 1.11, 1.12 sources, 1.3, 1.4 Message-ID: <200702011225.l11CPOgp013688@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/chmlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13643/devel Modified Files: .cvsignore chmlib.spec sources Log Message: auto-import chmlib-0.39-1 on branch devel from chmlib-0.39-1.src.rpm ver. 0.39 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/chmlib/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Jun 2006 19:54:19 -0000 1.3 +++ .cvsignore 1 Feb 2007 12:24:54 -0000 1.4 @@ -1 +1 @@ -chmlib-0.38.tar.bz2 +chmlib-0.39.tar.bz2 Index: chmlib.spec =================================================================== RCS file: /cvs/extras/rpms/chmlib/devel/chmlib.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- chmlib.spec 12 Sep 2006 05:06:11 -0000 1.11 +++ chmlib.spec 1 Feb 2007 12:24:54 -0000 1.12 @@ -1,7 +1,7 @@ Name: chmlib Summary: Library for dealing with ITSS/CHM format files -Version: 0.38 -Release: 2%{?dist} +Version: 0.39 +Release: 1%{?dist} License: LGPL Group: Development/Libraries Url: http://66.93.236.84/~jedwin/projects/chmlib/ @@ -56,6 +56,9 @@ %changelog +* Thu Feb 1 2007 Peter Lemenkov 0.39-1 +- Ver. 0.39 + * Tue Sep 12 2006 Peter Lemenkov 0.38-2%{?dist} - rebuild for FC6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/chmlib/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Jun 2006 19:54:19 -0000 1.3 +++ sources 1 Feb 2007 12:24:54 -0000 1.4 @@ -1 +1 @@ -d72661526aaea377ed30e9f58a086964 chmlib-0.38.tar.bz2 +debed1a0bdded7a12d3d967e497cea9c chmlib-0.39.tar.bz2 From fedora-extras-commits at redhat.com Thu Feb 1 15:46:22 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Thu, 1 Feb 2007 10:46:22 -0500 Subject: rpms/zabbix/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 zabbix.spec, 1.4, 1.5 Message-ID: <200702011546.l11FkMvV025558@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/zabbix/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25539 Modified Files: .cvsignore sources zabbix.spec Log Message: New upstream release, v1.1.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/zabbix/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 Nov 2006 18:56:31 -0000 1.2 +++ .cvsignore 1 Feb 2007 15:45:52 -0000 1.3 @@ -1 +1,2 @@ zabbix-1.1.4.tar.gz +zabbix-1.1.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/zabbix/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Nov 2006 18:56:31 -0000 1.2 +++ sources 1 Feb 2007 15:45:52 -0000 1.3 @@ -1 +1 @@ -8e733e41506dd34759daba01deeeefd9 zabbix-1.1.4.tar.gz +8f47fc38b26a7c04fdcb0354e66dab37 zabbix-1.1.5.tar.gz Index: zabbix.spec =================================================================== RCS file: /cvs/extras/rpms/zabbix/devel/zabbix.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- zabbix.spec 2 Jan 2007 18:30:57 -0000 1.4 +++ zabbix.spec 1 Feb 2007 15:45:52 -0000 1.5 @@ -1,6 +1,6 @@ Name: zabbix -Version: 1.1.4 -Release: 5%{?dist} +Version: 1.1.5 +Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure Group: Applications/Internet @@ -11,7 +11,6 @@ Source2: zabbix-server.init Source3: zabbix-agent.init Source4: zabbix-logrotate.in -Patch0: zabbix-1.1.4-snmp-poll-overflow.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %define database mysql @@ -77,7 +76,6 @@ %prep %setup -q -%patch0 -p1 -b .overflow # fix up some lib64 issues %{__perl} -pi.orig -e 's|_LIBDIR=/usr/lib|_LIBDIR=%{_libdir}|g' \ @@ -215,6 +213,9 @@ %{_datadir}/%{name} %changelog +* Thu Feb 01 2007 Jarod Wilson 1.1.5-1 +- New upstream release + * Tue Jan 02 2007 Jarod Wilson 1.1.4-5 - Add explicit R:php to zabbix-web (#220676) From fedora-extras-commits at redhat.com Thu Feb 1 15:53:40 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Thu, 1 Feb 2007 10:53:40 -0500 Subject: rpms/zabbix/FC-6 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 zabbix.spec, 1.2, 1.3 Message-ID: <200702011553.l11Frevr025661@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/zabbix/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25639 Modified Files: .cvsignore sources zabbix.spec Log Message: New upstream release, v1.1.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/zabbix/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 Nov 2006 18:56:31 -0000 1.2 +++ .cvsignore 1 Feb 2007 15:53:10 -0000 1.3 @@ -1 +1,2 @@ zabbix-1.1.4.tar.gz +zabbix-1.1.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/zabbix/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Nov 2006 18:56:31 -0000 1.2 +++ sources 1 Feb 2007 15:53:10 -0000 1.3 @@ -1 +1 @@ -8e733e41506dd34759daba01deeeefd9 zabbix-1.1.4.tar.gz +8f47fc38b26a7c04fdcb0354e66dab37 zabbix-1.1.5.tar.gz Index: zabbix.spec =================================================================== RCS file: /cvs/extras/rpms/zabbix/FC-6/zabbix.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- zabbix.spec 13 Dec 2006 20:32:26 -0000 1.2 +++ zabbix.spec 1 Feb 2007 15:53:10 -0000 1.3 @@ -1,6 +1,6 @@ Name: zabbix -Version: 1.1.4 -Release: 4%{?dist} +Version: 1.1.5 +Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure Group: Applications/Internet @@ -11,7 +11,6 @@ Source2: zabbix-server.init Source3: zabbix-agent.init Source4: zabbix-logrotate.in -Patch0: zabbix-1.1.4-snmp-poll-overflow.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %define database mysql @@ -70,14 +69,13 @@ %package web Summary: Zabbix Web Frontend Group: Applications/Internet -Requires: php-%{zdb}, php-gd +Requires: php-%{zdb}, php-gd, php %description web The php frontend to display the zabbix web interface. %prep %setup -q -%patch0 -p1 -b .overflow # fix up some lib64 issues %{__perl} -pi.orig -e 's|_LIBDIR=/usr/lib|_LIBDIR=%{_libdir}|g' \ @@ -215,6 +213,12 @@ %{_datadir}/%{name} %changelog +* Thu Feb 01 2007 Jarod Wilson 1.1.5-1 +- New upstream release + +* Tue Jan 02 2007 Jarod Wilson 1.1.4-5 +- Add explicit R:php to zabbix-web (#220676) + * Wed Dec 13 2006 Jarod Wilson 1.1.4-4 - Fix snmp polling buffer overflow (#218065) From fedora-extras-commits at redhat.com Thu Feb 1 15:55:21 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Thu, 1 Feb 2007 10:55:21 -0500 Subject: rpms/zabbix/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 zabbix.spec, 1.2, 1.3 Message-ID: <200702011555.l11FtLlZ025749@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/zabbix/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25725 Modified Files: .cvsignore sources zabbix.spec Log Message: New upstream release, v1.1.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/zabbix/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 Nov 2006 18:56:31 -0000 1.2 +++ .cvsignore 1 Feb 2007 15:54:51 -0000 1.3 @@ -1 +1,2 @@ zabbix-1.1.4.tar.gz +zabbix-1.1.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/zabbix/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Nov 2006 18:56:31 -0000 1.2 +++ sources 1 Feb 2007 15:54:51 -0000 1.3 @@ -1 +1 @@ -8e733e41506dd34759daba01deeeefd9 zabbix-1.1.4.tar.gz +8f47fc38b26a7c04fdcb0354e66dab37 zabbix-1.1.5.tar.gz Index: zabbix.spec =================================================================== RCS file: /cvs/extras/rpms/zabbix/FC-5/zabbix.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- zabbix.spec 13 Dec 2006 20:35:11 -0000 1.2 +++ zabbix.spec 1 Feb 2007 15:54:51 -0000 1.3 @@ -1,6 +1,6 @@ Name: zabbix -Version: 1.1.4 -Release: 4%{?dist} +Version: 1.1.5 +Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure Group: Applications/Internet @@ -11,7 +11,6 @@ Source2: zabbix-server.init Source3: zabbix-agent.init Source4: zabbix-logrotate.in -Patch0: zabbix-1.1.4-snmp-poll-overflow.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %define database mysql @@ -70,14 +69,13 @@ %package web Summary: Zabbix Web Frontend Group: Applications/Internet -Requires: php-%{zdb}, php-gd +Requires: php-%{zdb}, php-gd, php %description web The php frontend to display the zabbix web interface. %prep %setup -q -%patch0 -p1 -b .overflow # fix up some lib64 issues %{__perl} -pi.orig -e 's|_LIBDIR=/usr/lib|_LIBDIR=%{_libdir}|g' \ @@ -215,6 +213,12 @@ %{_datadir}/%{name} %changelog +* Thu Feb 01 2007 Jarod Wilson 1.1.5-1 +- New upstream release + +* Tue Jan 02 2007 Jarod Wilson 1.1.4-5 +- Add explicit R:php to zabbix-web (#220676) + * Wed Dec 13 2006 Jarod Wilson 1.1.4-4 - Fix snmp polling buffer overflow (#218065) From fedora-extras-commits at redhat.com Thu Feb 1 15:57:37 2007 From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr)) Date: Thu, 1 Feb 2007 10:57:37 -0500 Subject: rpms/xpa/devel xpa.spec,1.6,1.7 Message-ID: <200702011557.l11FvbPJ025841@cvs-int.fedora.redhat.com> Author: sergiopr Update of /cvs/extras/rpms/xpa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25819 Modified Files: xpa.spec Log Message: * Thu Feb 01 2007 Sergio Pascual 2.1.6-8 - Rebuilt for devel (out of sync with tcl). * Tue Sep 12 2006 Sergio Pascual 2.1.6-7 - Rebuilt for FC6 (tag problem). * Tue Sep 12 2006 Sergio Pascual 2.1.6-6 - Rebuilt for FC6 (mass rebuild). * Thu Jul 18 2006 Sergio Pascual 2.1.6-5 - Changed BuildRequires to make common spec for FC-4 and up * Thu Jun 22 2006 Sergio Pascual 2.1.6-4 - Patch0 is modified so Makefile installs in $(libdir) instead of $(prefix)/lib * Mon Jun 19 2006 Sergio Pascual 2.1.6-3 - Added some space between package devel and description devel and between install and clean to improve the flow and readability of the file. * Tue Jun 13 2006 Sergio Pascual 2.1.6-2 - Specfile polished, minor fixes. * Wed Feb 22 2006 Sergio Pascual 2.1.6-1 - Initial spec file. Index: xpa.spec =================================================================== RCS file: /cvs/extras/rpms/xpa/devel/xpa.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- xpa.spec 12 Sep 2006 22:19:10 -0000 1.6 +++ xpa.spec 1 Feb 2007 15:57:07 -0000 1.7 @@ -1,6 +1,6 @@ Name: xpa Version: 2.1.6 -Release: 7%{?dist} +Release: 8%{?dist} Summary: The XPA messaging system Group: Development/Libraries @@ -85,6 +85,8 @@ %{_mandir}/mann/* %changelog +* Thu Feb 01 2007 Sergio Pascual 2.1.6-8 +- Rebuilt for devel (out of sync with tcl). * Tue Sep 12 2006 Sergio Pascual 2.1.6-7 - Rebuilt for FC6 (tag problem). * Tue Sep 12 2006 Sergio Pascual 2.1.6-6 From fedora-extras-commits at redhat.com Thu Feb 1 15:59:22 2007 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 1 Feb 2007 10:59:22 -0500 Subject: rpms/grads/devel grads.spec,1.19,1.20 Message-ID: <200702011559.l11FxMoT025915@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/grads/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25898 Modified Files: grads.spec Log Message: * Thu Feb 1 2007 Patrice Dumas 1.9b4-20 - rebuild to link against ncurses instead termcap (#226759) Index: grads.spec =================================================================== RCS file: /cvs/extras/rpms/grads/devel/grads.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- grads.spec 15 Nov 2006 23:43:41 -0000 1.19 +++ grads.spec 1 Feb 2007 15:58:52 -0000 1.20 @@ -1,6 +1,6 @@ Name: grads Version: 1.9b4 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Tool for easy acces, manipulation, and visualization of data Group: Applications/Engineering @@ -113,6 +113,9 @@ %changelog +* Thu Feb 1 2007 Patrice Dumas 1.9b4-20 +- rebuild to link against ncurses instead termcap (#226759) + * Thu Nov 16 2006 Patrice Dumas 1.9b4-19 - don't ship wgrib but depend on it From fedora-extras-commits at redhat.com Thu Feb 1 16:01:26 2007 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Thu, 1 Feb 2007 11:01:26 -0500 Subject: rpms/graphviz/devel graphviz.spec,1.31,1.32 Message-ID: <200702011601.l11G1QeL029238@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/graphviz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25928 Modified Files: graphviz.spec Log Message: * Thu Feb 01 2007 Patrick "Jima" Laughton 2.12-4 - Bump-n-build due to tk upgrade Index: graphviz.spec =================================================================== RCS file: /cvs/extras/rpms/graphviz/devel/graphviz.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- graphviz.spec 24 Jan 2007 20:00:02 -0000 1.31 +++ graphviz.spec 1 Feb 2007 16:00:56 -0000 1.32 @@ -7,7 +7,7 @@ #-- graphviz src.rpm -------------------------------------------------------- Name: graphviz Version: 2.12 -Release: 3%{?dist} +Release: 4%{?dist} License: CPL URL: http://www.graphviz.org/ @@ -433,6 +433,9 @@ #-- changelog -------------------------------------------------- %changelog +* Thu Feb 01 2007 Patrick "Jima" Laughton 2.12-4 +- Bump-n-build due to tk upgrade + * Wed Jan 24 2007 Patrick "Jima" Laughton 2.12-3 - Added running of /sbin/ldconfig in post/postun (and Reqs) - Minor edit to -gd summary From fedora-extras-commits at redhat.com Thu Feb 1 16:17:40 2007 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Thu, 1 Feb 2007 11:17:40 -0500 Subject: rpms/lash/devel lash.spec,1.7,1.8 Message-ID: <200702011617.l11GHetc029406@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/lash/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29382 Modified Files: lash.spec Log Message: Revision -11. Drop libtermcap dependency. Index: lash.spec =================================================================== RCS file: /cvs/extras/rpms/lash/devel/lash.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- lash.spec 4 Oct 2006 22:18:11 -0000 1.7 +++ lash.spec 1 Feb 2007 16:17:10 -0000 1.8 @@ -1,7 +1,7 @@ Summary: LASH Audio Session Handler Name: lash Version: 0.5.1 -Release: 10%{?dist} +Release: 11%{?dist} License: GPL Group: System Environment/Libraries URL: http://www.nongnu.org/lash/ @@ -135,6 +135,9 @@ %{_libdir}/pkgconfig/lash* %changelog +* Thu Feb 01 2007 Anthony Green 0.5.1-11 +- Rebuild to drop libtermcap dependency as per bugzilla #226761. + * Thu Oct 05 2006 Christian Iseli 0.5.1-10 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 From fedora-extras-commits at redhat.com Thu Feb 1 16:24:31 2007 From: fedora-extras-commits at redhat.com (Matej Cepl (mcepl)) Date: Thu, 1 Feb 2007 11:24:31 -0500 Subject: rpms/cycle - New directory Message-ID: <200702011624.l11GOVQh029530@cvs-int.fedora.redhat.com> Author: mcepl Update of /cvs/extras/rpms/cycle In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29525/cycle Log Message: Directory /cvs/extras/rpms/cycle added to the repository From fedora-extras-commits at redhat.com Thu Feb 1 16:24:36 2007 From: fedora-extras-commits at redhat.com (Matej Cepl (mcepl)) Date: Thu, 1 Feb 2007 11:24:36 -0500 Subject: rpms/cycle/devel - New directory Message-ID: <200702011624.l11GOa9Y029547@cvs-int.fedora.redhat.com> Author: mcepl Update of /cvs/extras/rpms/cycle/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29525/cycle/devel Log Message: Directory /cvs/extras/rpms/cycle/devel added to the repository From fedora-extras-commits at redhat.com Thu Feb 1 16:24:54 2007 From: fedora-extras-commits at redhat.com (Matej Cepl (mcepl)) Date: Thu, 1 Feb 2007 11:24:54 -0500 Subject: rpms/cycle Makefile,NONE,1.1 import.log,NONE,1.1 pkg.acl,NONE,1.1 Message-ID: <200702011624.l11GOsoO029591@cvs-int.fedora.redhat.com> Author: mcepl Update of /cvs/extras/rpms/cycle In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29585 Added Files: Makefile import.log pkg.acl Log Message: Setup of module cycle --- NEW FILE Makefile --- # Top level Makefile for module cycle all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Thu Feb 1 16:24:59 2007 From: fedora-extras-commits at redhat.com (Matej Cepl (mcepl)) Date: Thu, 1 Feb 2007 11:24:59 -0500 Subject: rpms/cycle/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702011624.l11GOxuU029607@cvs-int.fedora.redhat.com> Author: mcepl Update of /cvs/extras/rpms/cycle/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29585/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module cycle --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Feb 1 16:25:12 2007 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Thu, 1 Feb 2007 11:25:12 -0500 Subject: rpms/vkeybd/devel vkeybd.spec,1.1,1.2 Message-ID: <200702011625.l11GPCG1029628@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/vkeybd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29535 Modified Files: vkeybd.spec Log Message: Upgrade tcl/tk dependency. Index: vkeybd.spec =================================================================== RCS file: /cvs/extras/rpms/vkeybd/devel/vkeybd.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vkeybd.spec 21 Oct 2006 17:05:04 -0000 1.1 +++ vkeybd.spec 1 Feb 2007 16:24:41 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Virtual MIDI keyboard Name: vkeybd Version: 0.1.17a -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Multimedia URL: http://www.alsa-project.org/~iwai/alsa.html @@ -13,12 +13,12 @@ Patch2: vkeybd-lash-2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: tk-devel >= 8.4, tk-devel < 8.5 +BuildRequires: tk-devel >= 8.5, tk-devel < 8.6 BuildRequires: lash-devel BuildRequires: desktop-file-utils -Requires: tk >= 8.4, tk < 8.5, lash +Requires: tk >= 8.5, tk < 8.6, lash Requires: hicolor-icon-theme %description @@ -33,7 +33,7 @@ %patch2 -p0 %build -make %{?_smp_mflags} USE_LADCCA=1 TCL_VERSION=8.4 PREFIX=%{_prefix} +make %{?_smp_mflags} USE_LADCCA=1 TCL_VERSION=8.5 PREFIX=%{_prefix} %install rm -rf $RPM_BUILD_ROOT @@ -75,6 +75,9 @@ %{_datadir}/icons/hicolor/64x64/apps/vkeybd.png %changelog +* Thu Feb 01 2007 Anthony Green 0.1.17a-2 +- Update tcl/tk dependency to 8.5. + * Thu Oct 19 2006 Anthony Green 0.1.17a-1 - Update sources. - Remove jack-audio-connection-kit dependency, which is implied by From fedora-extras-commits at redhat.com Thu Feb 1 16:26:18 2007 From: fedora-extras-commits at redhat.com (Matej Cepl (mcepl)) Date: Thu, 1 Feb 2007 11:26:18 -0500 Subject: rpms/cycle/devel cycle-export.png, NONE, 1.1 cycle.desktop, NONE, 1.1 cycle.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702011626.l11GQITm029745@cvs-int.fedora.redhat.com> Author: mcepl Update of /cvs/extras/rpms/cycle/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29709/devel Modified Files: .cvsignore sources Added Files: cycle-export.png cycle.desktop cycle.spec Log Message: auto-import cycle-0.3.1-3 on branch devel from cycle-0.3.1-3.src.rpm --- NEW FILE cycle.desktop --- [Desktop Entry] Encoding=UTF-8 Name=cycle Type=Application Exec=/usr/bin/cycle Icon=/usr/share/cycle/icons/cycle.xpm Terminal=false StartupNotify=true Categories=GNOME;Utility;Calendar;MedicalSoftware; --- NEW FILE cycle.spec --- Name: cycle Version: 0.3.1 Release: 3%{?dist} Summary: Calendar program for women Group: Applications/Productivity License: GPL URL: http://cycle.sourceforge.net Source0: http://prdownloads.sourceforge.net/cycle/cycle-%{version}.tar.bz2 # the below file collects additions from the Debian package Source1: cycle-msg.tar.bz2 Source2: cycle-export.png Source3: cycle.desktop Patch: cycle-build.patch.bz2 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: wxPython BuildRequires: python-devel >= 2.3, gettext,desktop-file-utils %description Cycle is a calendar for women. Given a cycle length or statistics for several periods, it can calculate the days until menstruation, the days of "safe" sex, the fertile period, and the days to ovulations, and define the d.o.b. of a child. It allows the user to write notes and helps to supervise the administration of hormonal contraceptive tablets. Multiple users allowed. Data is protected by a password for every user. NOTE: This program is not a reliable contraceptive method. It does neither help to prevent sexual transmision diseases like AIDS. It is just an electronic means of keeping track of some of your medical data and extract some statistical conclusions from them. You cannot consider this program as a substitute for your gynecologist in any way. %description -l ru_RU.UTF-8 ?????????????????????? ??????????????????: - ???? ???????????????? ?????????????????????????????????? ?????????? ?????? ???? ?????????????????? ???????????????????? ???? ?????????????????? ???????????????? ?????????????????????????????? ?????? ???????????? ?????????????????????? - ???????????????????? ?????? "??????????????????????" ??????????, ???????????????????? ???????????? ?? ???????? ???????????????? - ???????????????????? ???????? ???????????????? ?????????????? - ?????????????????? ?????????? ?????????????? - ???????????????? ???????????????????????????? ?????????? ?????????????????????????????????? ???????????????????????? ???????????????? %prep %setup0 -q %setup -D -a 1 -q %patch -p1 -b .MC-build rm README.Debian %build python setup.py build make -C msg #---- set_dir.py ---- cat >set_dir.py < 0.3.1-3 - don't gzip manpage -- rpmbuild does it automagically - category should be Application/Productivity (or non-Productivity in this case, but that's not included into RH standards :-)) - generate set_dir.py (according to the upstream .spec file) - fixed cs.po * Wed Jan 31 2007 Mat??j Cepl 0.3.1-2 - fixed missing files in %%doc - fixed Description - added manpage - fixed .desktop file * Sat Jan 6 2007 Mat??j Cepl 0.3.1-1 - Initial build based on Debian package cycle_0.3.1-6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cycle/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Feb 2007 16:24:59 -0000 1.1 +++ .cvsignore 1 Feb 2007 16:25:48 -0000 1.2 @@ -0,0 +1,3 @@ +cycle-0.3.1.tar.bz2 +cycle-build.patch.bz2 +cycle-msg.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cycle/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Feb 2007 16:24:59 -0000 1.1 +++ sources 1 Feb 2007 16:25:48 -0000 1.2 @@ -0,0 +1,3 @@ +8bd5c2f78e7b1a7ac7910de8b9420d93 cycle-0.3.1.tar.bz2 +20e8ea403e6510b77f5501eb944164f7 cycle-build.patch.bz2 +58f4a960f13119eef30b5402d6de2b8c cycle-msg.tar.bz2 From fedora-extras-commits at redhat.com Thu Feb 1 16:26:18 2007 From: fedora-extras-commits at redhat.com (Matej Cepl (mcepl)) Date: Thu, 1 Feb 2007 11:26:18 -0500 Subject: rpms/cycle import.log,1.1,1.2 Message-ID: <200702011626.l11GQISv029741@cvs-int.fedora.redhat.com> Author: mcepl Update of /cvs/extras/rpms/cycle In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29709 Modified Files: import.log Log Message: auto-import cycle-0.3.1-3 on branch devel from cycle-0.3.1-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/cycle/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Feb 2007 16:24:54 -0000 1.1 +++ import.log 1 Feb 2007 16:25:48 -0000 1.2 @@ -0,0 +1 @@ +cycle-0_3_1-3:HEAD:cycle-0.3.1-3.src.rpm:1170347140 From fedora-extras-commits at redhat.com Thu Feb 1 16:41:39 2007 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Thu, 1 Feb 2007 11:41:39 -0500 Subject: rpms/php-extras/devel .cvsignore, 1.4, 1.5 php-extras.spec, 1.8, 1.9 sources, 1.4, 1.5 php-extras-5.1.2-readline.patch, 1.1, NONE Message-ID: <200702011641.l11GfdaY029962@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/php-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29936 Modified Files: .cvsignore php-extras.spec sources Removed Files: php-extras-5.1.2-readline.patch Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-extras/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 1 Sep 2006 15:15:59 -0000 1.4 +++ .cvsignore 1 Feb 2007 16:41:08 -0000 1.5 @@ -1 +1 @@ -php-5.1.6.tar.gz +php-5.2.0.tar.gz Index: php-extras.spec =================================================================== RCS file: /cvs/extras/rpms/php-extras/devel/php-extras.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- php-extras.spec 1 Sep 2006 15:15:59 -0000 1.8 +++ php-extras.spec 1 Feb 2007 16:41:08 -0000 1.9 @@ -3,7 +3,6 @@ %define def() %%{!?_without_default:%%{!?_without_%1: %%global _with_%1 --with-%1}} %{expand:%def dbase} -%{expand:%def readline} # recode %{expand:%def mcrypt} %{expand:%def mhash} @@ -11,7 +10,7 @@ # mssql -%define list %{?_with_dbase:dbase} %{?_with_readline:readline} %{?_with_recode:recode} %{?_with_mcrypt:mcrypt} %{?_with_mhash:mhash} %{?_with_tidy:tidy} %{?_with_mssql:mssql} +%define list %{?_with_dbase:dbase} %{?_with_recode:recode} %{?_with_mcrypt:mcrypt} %{?_with_mhash:mhash} %{?_with_tidy:tidy} %{?_with_mssql:mssql} %global extdir %(php-config --extension-dir 2>/dev/null || echo "undefined") @@ -21,7 +20,7 @@ Name: php-extras Summary: Additional PHP modules from the standard PHP distribution #Version: %(php-config --version 2>/dev/null || echo 0) -Version: 5.1.6 +Version: 5.2.0 Release: 1%{?dist} Group: Development/Languages License: The PHP License @@ -30,7 +29,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: php-devel = %{version} -Patch1: php-extras-5.1.2-readline.patch %description @@ -49,16 +47,6 @@ Standard dBase module for PHP applications -%package -n php-readline -Summary: Standard PHP module provides readline library support -Group: Development/Languages -Requires: php >= %{version}, php-api = %{apiver} -%{?_with_readline:BuildRequires: readline-devel} - -%description -n php-readline -Standard PHP module provides readline library support - - %package -n php-recode Summary: Standard PHP module provides GNU recode support Group: Development/Languages @@ -112,7 +100,6 @@ %prep %setup -q -n php-%{version} -%patch1 -p1 %build @@ -241,7 +228,6 @@ #%%files %define fil() %%{?_with_%1:%%files -n php-%1 -f files.%1} %{expand:%fil dbase} -%{expand:%fil readline} %{expand:%fil recode} %{expand:%fil mcrypt} %{expand:%fil mhash} @@ -251,6 +237,10 @@ %changelog +* Thu Feb 1 2007 Dmitry Butskoy - 5.2.0-1 +- upgrade to 5.2.0 +- drop readline support (now in the main php package) + * Fri Sep 1 2006 Dmitry Butskoy - 5.1.6-1 - update to 5.1.6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-extras/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 Sep 2006 15:15:59 -0000 1.4 +++ sources 1 Feb 2007 16:41:08 -0000 1.5 @@ -1 +1 @@ -04d6166552289eaeff771f5ec953b065 php-5.1.6.tar.gz +52d7e8b3d8d7573e75c97340f131f988 php-5.2.0.tar.gz --- php-extras-5.1.2-readline.patch DELETED --- From fedora-extras-commits at redhat.com Thu Feb 1 16:51:23 2007 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 1 Feb 2007 11:51:23 -0500 Subject: fedora-security/audit fe5,1.148,1.149 fe6,1.62,1.63 Message-ID: <200702011651.l11GpNTn030191@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30172 Modified Files: fe5 fe6 Log Message: Note chmlib, wordpress updates. Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.148 retrieving revision 1.149 diff -u -r1.148 -r1.149 --- fe5 31 Jan 2007 19:09:10 -0000 1.148 +++ fe5 1 Feb 2007 16:51:21 -0000 1.149 @@ -2,24 +2,24 @@ ** are items that need attention -CVE-2007-0619 VULNERABLE (chmlib, fixed 0.3.9) #225919 -CVE-2007-0541 VULNERABLE (wordpress) #225469 -CVE-2007-0540 VULNERABLE (wordpress) #225469 -CVE-2007-0539 VULNERABLE (wordpress) #225469 +CVE-2007-0619 version (chmlib, fixed 0.3.9) #225919 +CVE-2007-0541 version (wordpress, fixed 2.1-0) #225469 +CVE-2007-0540 version (wordpress, fixed 2.1-0) #225469 +CVE-2007-0539 version (wordpress, fixed 2.1-0) #225469 CVE-2007-0469 version (rubygems, fixed 0.9.1) CVE-2007-0405 version (Django, fixed 0.95.1) CVE-2007-0404 version (Django, fixed 0.95.1) CVE-2007-0341 ignore (phpMyAdmin, 2.8.x only) -CVE-2007-0262 VULNERABLE (wordpress) #223101 +CVE-2007-0262 version (wordpress, fixed 2.1-0) #223101 CVE-2007-0177 version (mediawiki, fixed 1.8.3) #221958 -CVE-2007-0109 VULNERABLE (wordpress) #223101 -CVE-2007-0107 VULNERABLE (wordpress) #223101 -CVE-2007-0106 VULNERABLE (wordpress) #223101 +CVE-2007-0109 version (wordpress, fixed 2.1-0) #223101 +CVE-2007-0107 version (wordpress, fixed 2.1-0) #223101 +CVE-2007-0106 version (wordpress, fixed 2.1-0) #223101 CVE-2007-0095 VULNERABLE (phpMyAdmin) #221694 CVE-2006-6944 version (phpMyAdmin, fixed 2.9.1.1) CVE-2006-6943 version (phpMyAdmin, fixed 2.9.1.1) CVE-2006-6942 version (phpMyAdmin, fixed 2.9.1.1) -CVE-2006-6808 VULNERABLE (wordpress) #221023 +CVE-2006-6808 version (wordpress, fixed 2.1-0) #221023 CVE-2006-6799 patch (cacti, fixed 0.8.6i-5) #222410 CVE-2006-6693 ignore (zabbix, fixed 1.1.3, < 1.1.4 not shipped) CVE-2006-6692 ignore (zabbix, fixed 1.1.3, < 1.1.4 not shipped) Index: fe6 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe6,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- fe6 31 Jan 2007 19:09:10 -0000 1.62 +++ fe6 1 Feb 2007 16:51:21 -0000 1.63 @@ -2,24 +2,24 @@ ** are items that need attention -CVE-2007-0619 VULNERABLE (chmlib, fixed 0.3.9) #225919 -CVE-2007-0541 VULNERABLE (wordpress) #225469 -CVE-2007-0540 VULNERABLE (wordpress) #225469 -CVE-2007-0539 VULNERABLE (wordpress) #225469 +CVE-2007-0619 version (chmlib, fixed 0.3.9) #225919 +CVE-2007-0541 version (wordpress, fixed 2.1-0) #225469 +CVE-2007-0540 version (wordpress, fixed 2.1-0) #225469 +CVE-2007-0539 version (wordpress, fixed 2.1-0) #225469 CVE-2007-0469 version (rubygems, fixed 0.9.1) CVE-2007-0405 version (Django, fixed 0.95.1) CVE-2007-0404 version (Django, fixed 0.95.1) CVE-2007-0341 ignore (phpMyAdmin, 2.8.x only) -CVE-2007-0262 VULNERABLE (wordpress) #223101 +CVE-2007-0262 version (wordpress, fixed 2.1-0) #223101 CVE-2007-0177 version (mediawiki, fixed 1.8.3) #221958 -CVE-2007-0109 VULNERABLE (wordpress) #223101 -CVE-2007-0107 VULNERABLE (wordpress) #223101 -CVE-2007-0106 VULNERABLE (wordpress) #223101 +CVE-2007-0109 version (wordpress, fixed 2.1-0) #223101 +CVE-2007-0107 version (wordpress, fixed 2.1-0) #223101 +CVE-2007-0106 version (wordpress, fixed 2.1-0) #223101 CVE-2007-0095 VULNERABLE (phpMyAdmin) #221694 CVE-2006-6944 version (phpMyAdmin, fixed 2.9.1.1) CVE-2006-6943 version (phpMyAdmin, fixed 2.9.1.1) CVE-2006-6942 version (phpMyAdmin, fixed 2.9.1.1) -CVE-2006-6808 VULNERABLE (wordpress) #221023 +CVE-2006-6808 version (wordpress, fixed 2.1-0) #221023 CVE-2006-6799 patch (cacti, fixed 0.8.6i-5) #222410 CVE-2006-6693 ignore (zabbix, fixed 1.1.3, < 1.1.4 not shipped) CVE-2006-6692 ignore (zabbix, fixed 1.1.3, < 1.1.4 not shipped) From fedora-extras-commits at redhat.com Thu Feb 1 17:02:22 2007 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Thu, 1 Feb 2007 12:02:22 -0500 Subject: rpms/php-pear-Structures-DataGrid-DataSource-MDB2/FC-5 .cvsignore, 1.5, 1.6 php-pear-Structures-DataGrid-DataSource-MDB2.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200702011702.l11H2Mo1001325@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-DataSource-MDB2/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1270/FC-5 Modified Files: .cvsignore php-pear-Structures-DataGrid-DataSource-MDB2.spec sources Log Message: upstream sync Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-pear-Structures-DataGrid-DataSource-MDB2/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 25 Jan 2007 03:43:03 -0000 1.5 +++ .cvsignore 1 Feb 2007 17:01:49 -0000 1.6 @@ -1 +1 @@ -Structures_DataGrid_DataSource_MDB2-0.1.6.tgz +Structures_DataGrid_DataSource_MDB2-0.1.7.tgz Index: php-pear-Structures-DataGrid-DataSource-MDB2.spec =================================================================== RCS file: /cvs/extras/rpms/php-pear-Structures-DataGrid-DataSource-MDB2/FC-5/php-pear-Structures-DataGrid-DataSource-MDB2.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- php-pear-Structures-DataGrid-DataSource-MDB2.spec 25 Jan 2007 03:43:03 -0000 1.5 +++ php-pear-Structures-DataGrid-DataSource-MDB2.spec 1 Feb 2007 17:01:49 -0000 1.6 @@ -2,7 +2,7 @@ %define pear_name Structures_DataGrid_DataSource_MDB2 Name: php-pear-Structures-DataGrid-DataSource-MDB2 -Version: 0.1.6 +Version: 0.1.7 Release: 1%{?dist} Summary: DataSource driver using PEAR::MDB2 and an SQL query @@ -73,6 +73,9 @@ %changelog +* Thu Feb 1 2007 Christopher Stone 0.1.7-1 +- Upstream sync + * Wed Jan 24 2007 Christopher Stone 0.1.6-1 - Upstream sync Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pear-Structures-DataGrid-DataSource-MDB2/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 25 Jan 2007 03:43:03 -0000 1.5 +++ sources 1 Feb 2007 17:01:49 -0000 1.6 @@ -1 +1 @@ -cc68d1986b60be4602eebfe17eb7e6fc Structures_DataGrid_DataSource_MDB2-0.1.6.tgz +bbfce17ca8dabfe97657d5123d0f6574 Structures_DataGrid_DataSource_MDB2-0.1.7.tgz From fedora-extras-commits at redhat.com Thu Feb 1 17:02:24 2007 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Thu, 1 Feb 2007 12:02:24 -0500 Subject: rpms/php-pear-Structures-DataGrid-DataSource-MDB2/FC-6 .cvsignore, 1.5, 1.6 php-pear-Structures-DataGrid-DataSource-MDB2.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200702011702.l11H2OHv001330@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-DataSource-MDB2/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1270/FC-6 Modified Files: .cvsignore php-pear-Structures-DataGrid-DataSource-MDB2.spec sources Log Message: upstream sync Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-pear-Structures-DataGrid-DataSource-MDB2/FC-6/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 25 Jan 2007 03:43:03 -0000 1.5 +++ .cvsignore 1 Feb 2007 17:01:52 -0000 1.6 @@ -1 +1 @@ -Structures_DataGrid_DataSource_MDB2-0.1.6.tgz +Structures_DataGrid_DataSource_MDB2-0.1.7.tgz Index: php-pear-Structures-DataGrid-DataSource-MDB2.spec =================================================================== RCS file: /cvs/extras/rpms/php-pear-Structures-DataGrid-DataSource-MDB2/FC-6/php-pear-Structures-DataGrid-DataSource-MDB2.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- php-pear-Structures-DataGrid-DataSource-MDB2.spec 25 Jan 2007 03:43:03 -0000 1.5 +++ php-pear-Structures-DataGrid-DataSource-MDB2.spec 1 Feb 2007 17:01:52 -0000 1.6 @@ -2,7 +2,7 @@ %define pear_name Structures_DataGrid_DataSource_MDB2 Name: php-pear-Structures-DataGrid-DataSource-MDB2 -Version: 0.1.6 +Version: 0.1.7 Release: 1%{?dist} Summary: DataSource driver using PEAR::MDB2 and an SQL query @@ -73,6 +73,9 @@ %changelog +* Thu Feb 1 2007 Christopher Stone 0.1.7-1 +- Upstream sync + * Wed Jan 24 2007 Christopher Stone 0.1.6-1 - Upstream sync Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pear-Structures-DataGrid-DataSource-MDB2/FC-6/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 25 Jan 2007 03:43:03 -0000 1.5 +++ sources 1 Feb 2007 17:01:52 -0000 1.6 @@ -1 +1 @@ -cc68d1986b60be4602eebfe17eb7e6fc Structures_DataGrid_DataSource_MDB2-0.1.6.tgz +bbfce17ca8dabfe97657d5123d0f6574 Structures_DataGrid_DataSource_MDB2-0.1.7.tgz From fedora-extras-commits at redhat.com Thu Feb 1 17:02:26 2007 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Thu, 1 Feb 2007 12:02:26 -0500 Subject: rpms/php-pear-Structures-DataGrid-DataSource-MDB2/devel .cvsignore, 1.5, 1.6 php-pear-Structures-DataGrid-DataSource-MDB2.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200702011702.l11H2Q9c001335@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-DataSource-MDB2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1270/devel Modified Files: .cvsignore php-pear-Structures-DataGrid-DataSource-MDB2.spec sources Log Message: upstream sync Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-pear-Structures-DataGrid-DataSource-MDB2/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 25 Jan 2007 03:43:09 -0000 1.5 +++ .cvsignore 1 Feb 2007 17:01:54 -0000 1.6 @@ -1 +1 @@ -Structures_DataGrid_DataSource_MDB2-0.1.6.tgz +Structures_DataGrid_DataSource_MDB2-0.1.7.tgz Index: php-pear-Structures-DataGrid-DataSource-MDB2.spec =================================================================== RCS file: /cvs/extras/rpms/php-pear-Structures-DataGrid-DataSource-MDB2/devel/php-pear-Structures-DataGrid-DataSource-MDB2.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- php-pear-Structures-DataGrid-DataSource-MDB2.spec 25 Jan 2007 03:43:09 -0000 1.5 +++ php-pear-Structures-DataGrid-DataSource-MDB2.spec 1 Feb 2007 17:01:54 -0000 1.6 @@ -2,7 +2,7 @@ %define pear_name Structures_DataGrid_DataSource_MDB2 Name: php-pear-Structures-DataGrid-DataSource-MDB2 -Version: 0.1.6 +Version: 0.1.7 Release: 1%{?dist} Summary: DataSource driver using PEAR::MDB2 and an SQL query @@ -73,6 +73,9 @@ %changelog +* Thu Feb 1 2007 Christopher Stone 0.1.7-1 +- Upstream sync + * Wed Jan 24 2007 Christopher Stone 0.1.6-1 - Upstream sync Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pear-Structures-DataGrid-DataSource-MDB2/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 25 Jan 2007 03:43:09 -0000 1.5 +++ sources 1 Feb 2007 17:01:54 -0000 1.6 @@ -1 +1 @@ -cc68d1986b60be4602eebfe17eb7e6fc Structures_DataGrid_DataSource_MDB2-0.1.6.tgz +bbfce17ca8dabfe97657d5123d0f6574 Structures_DataGrid_DataSource_MDB2-0.1.7.tgz From fedora-extras-commits at redhat.com Thu Feb 1 17:24:53 2007 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Thu, 1 Feb 2007 12:24:53 -0500 Subject: rpms/yafc/devel yafc.spec,1.1,1.2 Message-ID: <200702011724.l11HOrcZ001695@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/yafc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1675 Modified Files: yafc.spec Log Message: add ncurses BR to compensate for termcap deprecation. see https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=226764 for more details Index: yafc.spec =================================================================== RCS file: /cvs/extras/rpms/yafc/devel/yafc.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- yafc.spec 13 Sep 2006 06:19:39 -0000 1.1 +++ yafc.spec 1 Feb 2007 17:24:21 -0000 1.2 @@ -5,7 +5,7 @@ Name: yafc Version: 1.1.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Yet Another FTP/SFTP Client Group: Applications/Internet @@ -24,6 +24,7 @@ BuildRequires: readline-devel >= 4.2 BuildRequires: krb5-devel +BuildRequires: ncurses-devel BuildRequires: /usr/bin/makeinfo Requires: openssh-clients @@ -108,6 +109,9 @@ %changelog +* Thu Feb 1 2007 Chris Petersen 1.1.1-6 +- Add ncurses BR so that yafc won't link against the deprecated termcap lib + * Tue Sep 12 2006 Chris Petersen 1.1.1-5 - Slight tweak to the defattr to add the fourth parameter From fedora-extras-commits at redhat.com Thu Feb 1 18:13:32 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Thu, 1 Feb 2007 13:13:32 -0500 Subject: rpms/Maelstrom/devel Maelstrom.spec,1.11,1.12 Message-ID: <200702011813.l11IDWnS013715@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/Maelstrom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13553 Modified Files: Maelstrom.spec Log Message: commitspam testing Index: Maelstrom.spec =================================================================== RCS file: /cvs/extras/rpms/Maelstrom/devel/Maelstrom.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Maelstrom.spec 11 Sep 2006 14:27:22 -0000 1.11 +++ Maelstrom.spec 1 Feb 2007 18:12:59 -0000 1.12 @@ -15,6 +15,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_net-devel, desktop-file-utils + %description Maelstrom is a space combat game, originally ported from the Macintosh platform. Brave pilots get to dodge asteroids and fight off other From fedora-extras-commits at redhat.com Thu Feb 1 18:27:30 2007 From: fedora-extras-commits at redhat.com (Josef Whiter (josef)) Date: Thu, 1 Feb 2007 13:27:30 -0500 Subject: rpms/tilda - New directory Message-ID: <200702011827.l11IRUWa016573@cvs-int.fedora.redhat.com> Author: josef Update of /cvs/extras/rpms/tilda In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16558/tilda Log Message: Directory /cvs/extras/rpms/tilda added to the repository From fedora-extras-commits at redhat.com Thu Feb 1 18:27:38 2007 From: fedora-extras-commits at redhat.com (Josef Whiter (josef)) Date: Thu, 1 Feb 2007 13:27:38 -0500 Subject: rpms/tilda/devel - New directory Message-ID: <200702011827.l11IRclw016612@cvs-int.fedora.redhat.com> Author: josef Update of /cvs/extras/rpms/tilda/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16558/tilda/devel Log Message: Directory /cvs/extras/rpms/tilda/devel added to the repository From fedora-extras-commits at redhat.com Thu Feb 1 18:58:07 2007 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Thu, 1 Feb 2007 13:58:07 -0500 Subject: rpms/tcllib/devel tcllib.spec,1.8,1.9 Message-ID: <200702011858.l11Iw7Db017901@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tcllib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17882 Modified Files: tcllib.spec Log Message: Rebuild for tcl 8.5 (new install directory) Index: tcllib.spec =================================================================== RCS file: /cvs/extras/rpms/tcllib/devel/tcllib.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- tcllib.spec 19 Oct 2006 18:30:52 -0000 1.8 +++ tcllib.spec 1 Feb 2007 18:57:35 -0000 1.9 @@ -1,7 +1,7 @@ Summary: The standard Tcl library Name: tcllib Version: 1.9 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD-like Group: Development/Libraries Source: http://download.sourceforge.net/tcllib/tcllib-1.9.tar.gz @@ -20,6 +20,9 @@ %setup -q chmod -x modules/doctools/mpformats/fr.msg +%build +# Nothing to build! + %install rm -rf $RPM_BUILD_ROOT echo 'not available' > modules/imap4/imap4.n @@ -54,6 +57,9 @@ %{_mandir}/mann/* %changelog +* Thu Feb 1 2007 Wart 1.9-2 +- Rebuild for tcl8.5 (changes tcllib's install directory) + * Thu Oct 19 2006 Wart 1.9-1 - Update to 1.9 From fedora-extras-commits at redhat.com Thu Feb 1 23:06:26 2007 From: fedora-extras-commits at redhat.com (Till Maas (till)) Date: Thu, 1 Feb 2007 18:06:26 -0500 Subject: rpms/fatsort/FC-5 .cvsignore, 1.2, 1.3 fatsort.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200702012306.l11N6QPt003931@cvs-int.fedora.redhat.com> Author: till Update of /cvs/extras/rpms/fatsort/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3868/FC-5 Modified Files: .cvsignore fatsort.spec sources Log Message: version bump, some spec cleanup Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fatsort/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Aug 2006 16:42:29 -0000 1.2 +++ .cvsignore 1 Feb 2007 23:05:54 -0000 1.3 @@ -1 +1 @@ -fatsort-0.9.6.1.tar.gz +fatsort-0.9.7.tar.gz Index: fatsort.spec =================================================================== RCS file: /cvs/extras/rpms/fatsort/FC-5/fatsort.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fatsort.spec 23 Aug 2006 16:42:29 -0000 1.1 +++ fatsort.spec 1 Feb 2007 23:05:54 -0000 1.2 @@ -1,6 +1,6 @@ Name: fatsort -Version: 0.9.6.1 -Release: 3%{?dist} +Version: 0.9.7 +Release: 1%{?dist} Summary: Fatsort sorts the FAT of FAT16 and FAT32 filesystems Group: Applications/System @@ -42,11 +42,35 @@ %changelog -* Fri Jul 28 2006 Till Maas - 0.9.6.1-3 +* Thu Feb 01 2007 Till Maas - 0.9.7-1 +- version bump +- added some linebreaks in changelog +- changed e-mail address obfuscation +- corrected time of changelog entries + +* Thu Oct 05 2006 Christian Iseli 0.9.6.1-8 + - rebuilt for unwind info generation, broken in gcc-4.1.1-21 + +* Mon Sep 18 2006 Till Maas - 0.9.6.1-7 +- Fixed typos in changelog + +* Sat Sep 02 2006 Till Maas - 0.9.6.1-6 +- Bumped release to build again because of yum failure on ppc + +* Sat Sep 02 2006 Till Maas - 0.9.6.1-5 +- Bumped release to make "make tag" work + +* Sat Sep 02 2006 Till Maas - 0.9.6.1-4 +- Bumped release for mass rebuild + +* Fri Jul 28 2006 Till Maas - 0.9.6.1-3 - Use $RPM_OPT_FLAGS instead of %%{optflags} -* Tue Jul 04 2006 Till Maas - 0.9.6.1-2 + +* Tue Jul 04 2006 Till Maas - 0.9.6.1-2 - made Source0 to valid URL -* Sat Jul 01 2006 Till Maas - 0.9.6.1-1 + +* Sat Jul 01 2006 Till Maas - 0.9.6.1-1 - new version -* Fri Jun 30 2006 Till Maas - 0.9.6-1 + +* Fri Jun 30 2006 Till Maas - 0.9.6-1 - Created from scratch for fedora extras Index: sources =================================================================== RCS file: /cvs/extras/rpms/fatsort/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Aug 2006 16:42:29 -0000 1.2 +++ sources 1 Feb 2007 23:05:54 -0000 1.3 @@ -1 +1 @@ -ddf8e98b27455da104e8cca13d29d0cc fatsort-0.9.6.1.tar.gz +79e36f592f50edc76dfc78b7639c37cb fatsort-0.9.7.tar.gz From fedora-extras-commits at redhat.com Thu Feb 1 23:06:31 2007 From: fedora-extras-commits at redhat.com (Till Maas (till)) Date: Thu, 1 Feb 2007 18:06:31 -0500 Subject: rpms/fatsort/devel .cvsignore, 1.2, 1.3 fatsort.spec, 1.7, 1.8 sources, 1.2, 1.3 Message-ID: <200702012306.l11N6VPv003941@cvs-int.fedora.redhat.com> Author: till Update of /cvs/extras/rpms/fatsort/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3868/devel Modified Files: .cvsignore fatsort.spec sources Log Message: version bump, some spec cleanup Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fatsort/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Aug 2006 16:42:29 -0000 1.2 +++ .cvsignore 1 Feb 2007 23:05:59 -0000 1.3 @@ -1 +1 @@ -fatsort-0.9.6.1.tar.gz +fatsort-0.9.7.tar.gz Index: fatsort.spec =================================================================== RCS file: /cvs/extras/rpms/fatsort/devel/fatsort.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- fatsort.spec 4 Oct 2006 22:57:08 -0000 1.7 +++ fatsort.spec 1 Feb 2007 23:05:59 -0000 1.8 @@ -1,6 +1,6 @@ Name: fatsort -Version: 0.9.6.1 -Release: 8%{?dist} +Version: 0.9.7 +Release: 1%{?dist} Summary: Fatsort sorts the FAT of FAT16 and FAT32 filesystems Group: Applications/System @@ -42,22 +42,35 @@ %changelog +* Thu Feb 01 2007 Till Maas - 0.9.7-1 +- version bump +- added some linebreaks in changelog +- changed e-mail address obfuscation +- corrected time of changelog entries + * Thu Oct 05 2006 Christian Iseli 0.9.6.1-8 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 -* Mon Sep 18 2006 Till Maas - 0.9.6.1-7 -- Fixing typos in changelog -* Sat Sep 02 2006 Till Maas - 0.9.6.1-6 -- Bumping release to build again because of yum failure on ppc -* Sat Sep 02 2006 Till Maas - 0.9.6.1-5 -- Bumping release to make "make tag" work -* Sat Sep 02 2006 Till Maas - 0.9.6.1-4 -- Bumping release for mass rebuild -* Fri Jul 28 2006 Till Maas - 0.9.6.1-3 +* Mon Sep 18 2006 Till Maas - 0.9.6.1-7 +- Fixed typos in changelog + +* Sat Sep 02 2006 Till Maas - 0.9.6.1-6 +- Bumped release to build again because of yum failure on ppc + +* Sat Sep 02 2006 Till Maas - 0.9.6.1-5 +- Bumped release to make "make tag" work + +* Sat Sep 02 2006 Till Maas - 0.9.6.1-4 +- Bumped release for mass rebuild + +* Fri Jul 28 2006 Till Maas - 0.9.6.1-3 - Use $RPM_OPT_FLAGS instead of %%{optflags} -* Tue Jul 04 2006 Till Maas - 0.9.6.1-2 + +* Tue Jul 04 2006 Till Maas - 0.9.6.1-2 - made Source0 to valid URL -* Sat Jul 01 2006 Till Maas - 0.9.6.1-1 + +* Sat Jul 01 2006 Till Maas - 0.9.6.1-1 - new version -* Fri Jun 30 2006 Till Maas - 0.9.6-1 + +* Fri Jun 30 2006 Till Maas - 0.9.6-1 - Created from scratch for fedora extras Index: sources =================================================================== RCS file: /cvs/extras/rpms/fatsort/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Aug 2006 16:42:29 -0000 1.2 +++ sources 1 Feb 2007 23:05:59 -0000 1.3 @@ -1 +1 @@ -ddf8e98b27455da104e8cca13d29d0cc fatsort-0.9.6.1.tar.gz +79e36f592f50edc76dfc78b7639c37cb fatsort-0.9.7.tar.gz From fedora-extras-commits at redhat.com Thu Feb 1 23:06:29 2007 From: fedora-extras-commits at redhat.com (Till Maas (till)) Date: Thu, 1 Feb 2007 18:06:29 -0500 Subject: rpms/fatsort/FC-6 .cvsignore, 1.2, 1.3 fatsort.spec, 1.7, 1.8 sources, 1.2, 1.3 Message-ID: <200702012306.l11N6TI7003936@cvs-int.fedora.redhat.com> Author: till Update of /cvs/extras/rpms/fatsort/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3868/FC-6 Modified Files: .cvsignore fatsort.spec sources Log Message: version bump, some spec cleanup Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fatsort/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Aug 2006 16:42:29 -0000 1.2 +++ .cvsignore 1 Feb 2007 23:05:56 -0000 1.3 @@ -1 +1 @@ -fatsort-0.9.6.1.tar.gz +fatsort-0.9.7.tar.gz Index: fatsort.spec =================================================================== RCS file: /cvs/extras/rpms/fatsort/FC-6/fatsort.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- fatsort.spec 4 Oct 2006 22:57:08 -0000 1.7 +++ fatsort.spec 1 Feb 2007 23:05:56 -0000 1.8 @@ -1,6 +1,6 @@ Name: fatsort -Version: 0.9.6.1 -Release: 8%{?dist} +Version: 0.9.7 +Release: 1%{?dist} Summary: Fatsort sorts the FAT of FAT16 and FAT32 filesystems Group: Applications/System @@ -42,22 +42,35 @@ %changelog +* Thu Feb 01 2007 Till Maas - 0.9.7-1 +- version bump +- added some linebreaks in changelog +- changed e-mail address obfuscation +- corrected time of changelog entries + * Thu Oct 05 2006 Christian Iseli 0.9.6.1-8 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 -* Mon Sep 18 2006 Till Maas - 0.9.6.1-7 -- Fixing typos in changelog -* Sat Sep 02 2006 Till Maas - 0.9.6.1-6 -- Bumping release to build again because of yum failure on ppc -* Sat Sep 02 2006 Till Maas - 0.9.6.1-5 -- Bumping release to make "make tag" work -* Sat Sep 02 2006 Till Maas - 0.9.6.1-4 -- Bumping release for mass rebuild -* Fri Jul 28 2006 Till Maas - 0.9.6.1-3 +* Mon Sep 18 2006 Till Maas - 0.9.6.1-7 +- Fixed typos in changelog + +* Sat Sep 02 2006 Till Maas - 0.9.6.1-6 +- Bumped release to build again because of yum failure on ppc + +* Sat Sep 02 2006 Till Maas - 0.9.6.1-5 +- Bumped release to make "make tag" work + +* Sat Sep 02 2006 Till Maas - 0.9.6.1-4 +- Bumped release for mass rebuild + +* Fri Jul 28 2006 Till Maas - 0.9.6.1-3 - Use $RPM_OPT_FLAGS instead of %%{optflags} -* Tue Jul 04 2006 Till Maas - 0.9.6.1-2 + +* Tue Jul 04 2006 Till Maas - 0.9.6.1-2 - made Source0 to valid URL -* Sat Jul 01 2006 Till Maas - 0.9.6.1-1 + +* Sat Jul 01 2006 Till Maas - 0.9.6.1-1 - new version -* Fri Jun 30 2006 Till Maas - 0.9.6-1 + +* Fri Jun 30 2006 Till Maas - 0.9.6-1 - Created from scratch for fedora extras Index: sources =================================================================== RCS file: /cvs/extras/rpms/fatsort/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Aug 2006 16:42:29 -0000 1.2 +++ sources 1 Feb 2007 23:05:56 -0000 1.3 @@ -1 +1 @@ -ddf8e98b27455da104e8cca13d29d0cc fatsort-0.9.6.1.tar.gz +79e36f592f50edc76dfc78b7639c37cb fatsort-0.9.7.tar.gz From fedora-extras-commits at redhat.com Fri Feb 2 00:49:21 2007 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 1 Feb 2007 19:49:21 -0500 Subject: rpms/darcs/devel darcs.spec,1.14,1.15 Message-ID: <200702020049.l120nL12010020@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9953 Modified Files: darcs.spec Log Message: rebuild for ncurses replacing termcap (#226754) Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/devel/darcs.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- darcs.spec 1 Nov 2006 00:14:20 -0000 1.14 +++ darcs.spec 2 Feb 2007 00:48:48 -0000 1.15 @@ -1,6 +1,6 @@ Name: darcs Version: 1.0.8 -Release: 4%{?dist} +Release: 5%{?dist} Summary: David's advanced revision control system Group: Development/Tools @@ -89,6 +89,9 @@ %changelog +* Fri Feb 2 2007 Jens Petersen - 1.0.8-5 +- rebuild for ncurses replacing termcap (#226754) + * Wed Nov 1 2006 Jens Petersen - 1.0.8-4 - rebuild for new libcurl From fedora-extras-commits at redhat.com Fri Feb 2 00:50:57 2007 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Thu, 1 Feb 2007 19:50:57 -0500 Subject: rpms/yafc/FC-6 yafc.spec,1.1,1.2 Message-ID: <200702020050.l120ovQG010128@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/yafc/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10107 Modified Files: yafc.spec Log Message: Add ncurses BR so that yafc won't link against the deprecated termcap lib Index: yafc.spec =================================================================== RCS file: /cvs/extras/rpms/yafc/FC-6/yafc.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- yafc.spec 13 Sep 2006 06:19:39 -0000 1.1 +++ yafc.spec 2 Feb 2007 00:50:24 -0000 1.2 @@ -5,7 +5,7 @@ Name: yafc Version: 1.1.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Yet Another FTP/SFTP Client Group: Applications/Internet @@ -24,6 +24,7 @@ BuildRequires: readline-devel >= 4.2 BuildRequires: krb5-devel +BuildRequires: ncurses-devel BuildRequires: /usr/bin/makeinfo Requires: openssh-clients @@ -108,6 +109,9 @@ %changelog +* Thu Feb 1 2007 Chris Petersen 1.1.1-6 +- Add ncurses BR so that yafc won't link against the deprecated termcap lib + * Tue Sep 12 2006 Chris Petersen 1.1.1-5 - Slight tweak to the defattr to add the fourth parameter From fedora-extras-commits at redhat.com Fri Feb 2 10:39:23 2007 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Fri, 2 Feb 2007 05:39:23 -0500 Subject: rpms/abiword/devel abiword.spec,1.40,1.41 Message-ID: <200702021039.l12AdNMj017433@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17414 Modified Files: abiword.spec Log Message: rebuild Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- abiword.spec 5 Nov 2006 19:09:55 -0000 1.40 +++ abiword.spec 2 Feb 2007 10:38:51 -0000 1.41 @@ -3,7 +3,7 @@ Summary: The AbiWord word processor Name: abiword Version: 2.4.6 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Group: Applications/Editors License: GPL @@ -135,6 +135,9 @@ %{_datadir}/icons/*png %changelog +* Fri Feb 02 2007 Marc Maurer - 1:2.4.6-2.fc7 +- Rebuild + * Sun Nov 05 2006 Marc Maurer - 1:2.4.6-1.fc7 - Update to 2.4.6 From fedora-extras-commits at redhat.com Fri Feb 2 12:21:16 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 2 Feb 2007 07:21:16 -0500 Subject: rpms/plib16/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE plib16.spec, 1.9, NONE sources, 1.2, NONE Message-ID: <200702021221.l12CLGtL025040@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/plib16/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25033 Added Files: dead.package Removed Files: .cvsignore plib16.spec sources Log Message: Retire plib16 (#222111). --- NEW FILE dead.package --- This compatibility library is no longer required by any Fedora package as of Fedora 7, so it is now retired. All projects have moved to plib 1.8.x. The plib16-devel package conflited with the main plib-devel package (#222111), which is yet another good reason to have it removed. --- .cvsignore DELETED --- --- plib16.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Fri Feb 2 12:27:13 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 2 Feb 2007 07:27:13 -0500 Subject: rpms/js/devel js-1.60-ncurses.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 js.spec, 1.13, 1.14 sources, 1.3, 1.4 Message-ID: <200702021227.l12CRD4o025110@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/js/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25082 Modified Files: .cvsignore js.spec sources Added Files: js-1.60-ncurses.patch Log Message: Update to 1.60, link against ncurses (#226773), fix perl file modes (#224603). js-1.60-ncurses.patch: --- NEW FILE js-1.60-ncurses.patch --- diff -Naupr js.orig/src/Makefile.ref js/src/Makefile.ref --- js.orig/src/Makefile.ref 2006-08-21 20:58:45.000000000 +0200 +++ js/src/Makefile.ref 2007-02-02 12:59:06.000000000 +0100 @@ -132,7 +132,7 @@ endif ifdef JS_READLINE # For those platforms with the readline library installed. DEFINES += -DEDITLINE -PROG_LIBS += -lreadline -ltermcap +PROG_LIBS += -lreadline -lncurses else ifdef JS_EDITLINE # Use the editline library, built locally. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/js/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 26 Jan 2006 15:42:51 -0000 1.3 +++ .cvsignore 2 Feb 2007 12:26:40 -0000 1.4 @@ -1 +1 @@ -js-1.5.tar.gz +js-1.60.tar.gz Index: js.spec =================================================================== RCS file: /cvs/extras/rpms/js/devel/js.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- js.spec 28 Aug 2006 08:36:50 -0000 1.13 +++ js.spec 2 Feb 2007 12:26:41 -0000 1.14 @@ -2,8 +2,8 @@ Summary: JavaScript interpreter and libraries Name: js -Version: 1.5 -Release: 6%{?dist} +Version: 1.60 +Release: 1%{?dist} %if 0%{?_without_readline:1} License: MPL/GPL/LGPL %else @@ -17,9 +17,12 @@ Patch2: js-1.5-va_copy.patch Patch3: js-ldflags.patch Patch4: js-1.5-threadsafe.patch +Patch5: js-1.60-ncurses.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -BuildRequires: perl >= 1:5.6.1, readline-devel, nspr-devel +BuildRequires: perl >= 1:5.6.1, readline-devel, ncurses-devel, nspr-devel +# Temporary fix (#226970 - nspr-devel should require pkgconfig) +Buildrequires: pkgconfig Provides: libjs = %{version}-%{release} %description @@ -47,6 +50,7 @@ %patch2 -p1 -b .vacopy %patch3 -p0 -b .ldflags %patch4 -p1 -b .threadsafe +%patch5 -p1 -b .ncurses %{__cp} src/perlconnect/README.html src/README.perlconnect.html # Create pkgconfig file @@ -98,8 +102,11 @@ %{__install} -m 0644 libjs.pc \ %{buildroot}%{_libdir}/pkgconfig/ %{__make} -C src/perlconnect pure_install PERL_INSTALL_ROOT=%{buildroot} +# Remove unwanted perl related files find %{buildroot} -type f -name .packlist -o -name jsperlbuild.pl | xargs -r rm find %{buildroot} -type f -name '*.bs' -a -size 0 | xargs -r rm +# For some reason, the pure_install above doesn't set u+w :-( +find %{buildroot}%{perl_vendorarch} -type f -exec %{__chmod} u+w {} \; %clean @@ -134,6 +141,12 @@ %changelog +* Fri Feb 2 2007 Matthias Saou 1.60-1 +- Update to 1.60. +- Rebuild in order to link against ncurses instead of termcap (#226773). +- Add ncurses-devel build requirement and patch s/termcap/ncurses/ in. +- Change mode of perl library from 555 to 755 (#224603). + * Mon Aug 28 2006 Matthias Saou 1.5-6 - Fix pkgconfig file (#204232 & dupe #204236). Index: sources =================================================================== RCS file: /cvs/extras/rpms/js/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 26 Jan 2006 15:42:51 -0000 1.3 +++ sources 2 Feb 2007 12:26:41 -0000 1.4 @@ -1 +1 @@ -863bb6462f4ce535399a7c6276ae6776 js-1.5.tar.gz +bd8f021e43a8fbbec55ac2cd3d483243 js-1.60.tar.gz From fedora-extras-commits at redhat.com Fri Feb 2 12:40:21 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Fri, 2 Feb 2007 07:40:21 -0500 Subject: rpms/dbus-qt/devel .cvsignore, 1.3, 1.4 dbus-qt.spec, 1.4, 1.5 sources, 1.3, 1.4 dead.package, 1.1, NONE Message-ID: <200702021240.l12CeLxJ025300@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/dbus-qt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25274 Modified Files: .cvsignore dbus-qt.spec sources Removed Files: dead.package Log Message: take over and update to 0.70 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dbus-qt/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 14 Jun 2006 14:14:37 -0000 1.3 +++ .cvsignore 2 Feb 2007 12:39:40 -0000 1.4 @@ -1 +1 @@ -dbus-0.62.tar.gz +dbus-qt3-0.70.tar.bz2 Index: dbus-qt.spec =================================================================== RCS file: /cvs/extras/rpms/dbus-qt/devel/dbus-qt.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dbus-qt.spec 20 Jun 2006 18:28:58 -0000 1.4 +++ dbus-qt.spec 2 Feb 2007 12:39:40 -0000 1.5 @@ -1,25 +1,19 @@ - Summary: Qt-based library for using D-BUS Name: dbus-qt -Version: 0.62 -Release: 2%{?dist} +Version: 0.70 +Release: 1%{?dist} License: AFL/GPL URL: http://www.freedesktop.org/software/dbus/ -Source0: http://dbus.freedesktop.org/releases/dbus-%{version}.tar.gz +Source0: http://ranger.befunk.com/fink/dbus-qt3-%{version}.tar.bz2 Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext BuildRequires: libxml2-devel -# qt(3) bindings BuildRequires: qt-devel -# qt(4) bindings -BuildRequires: qt4-devel - -Provides: dbus-qt3 = %{version}-%{release} +BuildRequires: dbus-devel -Requires: dbus = %{version} %description D-BUS add-on library to integrate the standard D-BUS library with @@ -28,58 +22,28 @@ %package devel Summary: Libraries and headers for %{name} Group: Development/Libraries -Provides: dbus-qt3-devel = %{version}-%{release} Requires: %{name} = %{version}-%{release} Requires: dbus-devel Requires: qt-devel %description devel %{summary}. -%package -n dbus-qt4 -Summary: Qt4-based library for using DBus -Group: System Environment/Libraries -Requires: dbus = %{version} -%description -n dbus-qt4 -%{summary}. - -%package -n dbus-qt4-devel -Summary: Libraries and headers for dbus-qt4 -Group: Development/Libraries -Requires: dbus-qt4 = %{version}-%{release} -Requires: dbus-devel -Requires: qt4-devel -%description -n dbus-qt4-devel -%{summary}. - - %prep -%setup -q -n dbus-%{version} +%setup -q -n dbus-qt3-%{version} %build unset QTDIR || : ; . /etc/profile.d/qt.sh -export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include -%configure \ - --disable-tests --disable-verbose-mode --disable-asserts \ - --disable-static \ - --enable-qt3 \ - --enable-qt \ - --disable-libaudit --enable-selinux=no \ - --disable-glib --disable-gtk - -make %{?_smp_mflags} -C dbus -make %{?_smp_mflags} -C qt3 -make %{?_smp_mflags} -C qt +%configure --disable-static + +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make -C dbus install DESTDIR=$RPM_BUILD_ROOT -make -C qt3 install DESTDIR=$RPM_BUILD_ROOT -make -C qt install DESTDIR=$RPM_BUILD_ROOT -make -C dbus uninstall DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT # Unpackaged files rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la @@ -107,22 +71,10 @@ %{_includedir}/dbus-1.0/dbus/dbus-qt.h %{_libdir}/libdbus-qt-*.so -%files -n dbus-qt4 -%defattr(-,root,root,-) -%doc COPYING -%{_bindir}/dbus -%{_libdir}/libdbus-qt4-*.so.* - -%files -n dbus-qt4-devel -%defattr(-,root,root,-) -%{_bindir}/dbusidl2cpp -%{_bindir}/dbuscpp2xml -%{_includedir}/dbus-1.0/dbus/qdbus*.h -%{_libdir}/libdbus-qt4-*.so - - - %changelog +* Tue Jan 30 2007 Rex Dieter 0.70-1 +- dbus-qt + * Tue Jun 20 2006 Rex Dieter 0.62-2 - enable qt4 bindings - BR: gettext Index: sources =================================================================== RCS file: /cvs/extras/rpms/dbus-qt/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 14 Jun 2006 14:14:37 -0000 1.3 +++ sources 2 Feb 2007 12:39:40 -0000 1.4 @@ -1 +1 @@ -ba7692f63d0e9f1ef06703dff56cb650 dbus-0.62.tar.gz +9a8d4a4d560b49fb5ad034abfd3e3db5 dbus-qt3-0.70.tar.bz2 --- dead.package DELETED --- From fedora-extras-commits at redhat.com Fri Feb 2 12:45:50 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 2 Feb 2007 07:45:50 -0500 Subject: rpms/viruskiller/devel viruskiller.spec,1.11,1.12 Message-ID: <200702021245.l12CjoYX025492@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/viruskiller/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25472 Modified Files: viruskiller.spec Log Message: Make in-game help display the proper location for the manual.html (#220404). Index: viruskiller.spec =================================================================== RCS file: /cvs/extras/rpms/viruskiller/devel/viruskiller.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- viruskiller.spec 29 Aug 2006 08:49:41 -0000 1.11 +++ viruskiller.spec 2 Feb 2007 12:45:16 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Frantic shooting game where viruses invade your computer Name: viruskiller Version: 1.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Amusements/Games URL: http://www.parallelrealities.co.uk/virusKiller.php @@ -25,6 +25,8 @@ %prep %setup %patch0 -p1 -b .makefile +# Replace the displayed location of the help (in-game) to the proper one +%{__perl} -pi -e 's|/usr/share/doc/viruskiller/manual.html|%{_docdir}/%{name}-%{version}/manual.html|g' data/titleWidgets %build @@ -72,6 +74,9 @@ %changelog +* Fri Feb 2 2007 Matthias Saou 1.0-3 +- Make in-game help display the proper location for the manual.html (#220404). + * Mon Aug 28 2006 Matthias Saou 1.0-2 - FC6 rebuild. - Add -lz to LIBS in the makefile patch (no longer in SDL libs?). From fedora-extras-commits at redhat.com Fri Feb 2 13:07:21 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 2 Feb 2007 08:07:21 -0500 Subject: rpms/lighttpd/devel lighttpd-1.4.13-defaultconf.patch, NONE, 1.1 lighttpd.spec, 1.31, 1.32 lighttpd-1.3.10-defaultconf.patch, 1.1, NONE Message-ID: <200702021307.l12D7Le2031207@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/lighttpd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31110 Modified Files: lighttpd.spec Added Files: lighttpd-1.4.13-defaultconf.patch Removed Files: lighttpd-1.3.10-defaultconf.patch Log Message: Update default configuration (php-cgi path, #219723). lighttpd-1.4.13-defaultconf.patch: --- NEW FILE lighttpd-1.4.13-defaultconf.patch --- diff -Naupr lighttpd-1.4.13.orig/doc/lighttpd.conf lighttpd-1.4.13/doc/lighttpd.conf --- lighttpd-1.4.13.orig/doc/lighttpd.conf 2006-10-04 15:29:19.000000000 +0200 +++ lighttpd-1.4.13/doc/lighttpd.conf 2007-02-02 13:49:05.000000000 +0100 @@ -37,10 +37,10 @@ server.modules = ( ## a static document-root, for virtual-hosting take look at the ## server.virtual-* options -server.document-root = "/www/pages/" +server.document-root = "/srv/www/lighttpd/" ## where to send error-messages to -server.errorlog = "/www/logs/lighttpd.error.log" +server.errorlog = "/var/log/lighttpd/error_log" # files to check for if .../ is requested index-file.names = ( "index.php", "index.html", @@ -51,6 +51,7 @@ index-file.names = ( "index.p # mimetype mapping mimetype.assign = ( + ".rpm" => "application/x-rpm", ".pdf" => "application/pdf", ".sig" => "application/pgp-signature", ".spl" => "application/futuresplash", @@ -113,7 +114,7 @@ mimetype.assign = ( # server.tag = "lighttpd" #### accesslog module -accesslog.filename = "/www/logs/access.log" +accesslog.filename = "/var/log/lighttpd/access_log" ## deny access the file-extensions # @@ -145,7 +146,7 @@ static-file.exclude-extensions = ( ".php #server.error-handler-404 = "/error-handler.php" ## to help the rc.scripts -#server.pid-file = "/var/run/lighttpd.pid" +server.pid-file = "/var/run/lighttpd.pid" ###### virtual hosts @@ -183,10 +184,10 @@ static-file.exclude-extensions = ( ".php #server.chroot = "/" ## change uid to (default: don't care) -#server.username = "wwwrun" +server.username = "lighttpd" ## change uid to (default: don't care) -#server.groupname = "wwwrun" +server.groupname = "lighttpd" #### compress module #compress.cache-dir = "/tmp/lighttpd/cache/compress/" @@ -210,7 +211,7 @@ static-file.exclude-extensions = ( ".php # ( "localhost" => # ( # "socket" => "/tmp/php-fastcgi.socket", -# "bin-path" => "/usr/local/bin/php" +# "bin-path" => "/usr/bin/php-cgi" # ) # ) # ) Index: lighttpd.spec =================================================================== RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- lighttpd.spec 29 Jan 2007 13:33:37 -0000 1.31 +++ lighttpd.spec 2 Feb 2007 13:06:45 -0000 1.32 @@ -3,7 +3,7 @@ Summary: Lightning fast webserver with light system requirements Name: lighttpd Version: 1.4.13 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD Group: System Environment/Daemons URL: http://www.lighttpd.net/ @@ -15,7 +15,7 @@ Source12: powered_by_fedora.png Source13: http://www.lighttpd.net/light_button.png Source14: http://www.lighttpd.net/light_logo.png -Patch0: lighttpd-1.3.10-defaultconf.patch +Patch0: lighttpd-1.4.13-defaultconf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires(pre): /usr/sbin/useradd Requires(post): /sbin/chkconfig @@ -80,7 +80,7 @@ %{?_with_memcache:--with-memcache} \ %{?!_without_lua:--with-lua} \ %{?_with_webdavprops:--with-webdav-props} -%{__make} +%{__make} %{?_smp_mflags} %install @@ -173,6 +173,10 @@ %changelog +* Fri Feb 2 2007 Matthias Saou 1.4.13-5 +- Update defaultconf patch to change php binary to /usr/bin/php-cgi (#219723). +- Noticed %%{?_smp_mflags} was missing, so add it as it works fine. + * Mon Jan 29 2007 Matthias Saou 1.4.13-4 - Remove readline-devel build req, added by lua but since fixed (#213895). --- lighttpd-1.3.10-defaultconf.patch DELETED --- From fedora-extras-commits at redhat.com Fri Feb 2 13:26:23 2007 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 2 Feb 2007 08:26:23 -0500 Subject: extras-repoclosure PackageOwnersTests.py, 1.4, 1.5 PackageOwners.py, 1.9, 1.10 Message-ID: <200702021326.l12DQN7X031618@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-repoclosure In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31594 Modified Files: PackageOwnersTests.py PackageOwners.py Log Message: * Support comma-separated email addresses in "initialowner" field. First address becomes primary package owner. Index: PackageOwnersTests.py =================================================================== RCS file: /cvs/fedora/extras-repoclosure/PackageOwnersTests.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- PackageOwnersTests.py 9 Jan 2007 12:00:47 -0000 1.4 +++ PackageOwnersTests.py 2 Feb 2007 13:26:21 -0000 1.5 @@ -32,6 +32,17 @@ b.sort() self.assertEqual(a,b) + def testownersmultiple(self): + po._parse(['Test|testpkg|test desc|owner at localhost,co-owner at localhost|qa at localhost|observer at localhost,upstream at localhost']) + self.assertEqual( po.GetOwner('testpkg'), 'owner at localhost') + + def testownersmultiple2(self): + a = po.GetOwners('testpkg') + a.sort() + b = ['owner at localhost','co-owner at localhost','observer at localhost','upstream at localhost'] + b.sort() + self.assertEqual(a,b) + def testwrongpackage(self): self.assertEqual( po.GetOwner('thisPkgDoesNotExist'), '' ) Index: PackageOwners.py =================================================================== RCS file: /cvs/fedora/extras-repoclosure/PackageOwners.py,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- PackageOwners.py 9 Jan 2007 12:08:50 -0000 1.9 +++ PackageOwners.py 2 Feb 2007 13:26:21 -0000 1.10 @@ -102,18 +102,28 @@ if line.startswith('#') or line.isspace(): continue try: - (repo,pkgname,summary,email,qacontact,cc) = line.rstrip().split('|') - if len(cc): - (ccowners) = cc.split(',') - else: - ccowners = [] - if email.find('@') < 0: # owners.list is broken + (repo,pkgname,summary,emails,qacontact,cc) = line.rstrip().split('|') + addrs = [] + mailto = '' # primary pkg owner + if len(emails): + if emails.find(',')>=0: + (addrs) = emails.split(',') + mailto = addrs[0] + addrs = addrs[1:] + else: + mailto = emails + if mailto.find('@') < 0: # owners.list is broken raise Exception + + ccaddrs = [] + if len(cc): + (ccaddrs) = cc.split(',') + addrs += ccaddrs + self.dict[pkgname] = { - 'mailto' : email, - 'cc' : ccowners + 'mailto' : mailto, + 'cc' : addrs } - #print '%s -> %s' % (pkgname, self.dict[pkgname]['mailto']) except: print 'ERROR: owners.list is broken' print line From fedora-extras-commits at redhat.com Fri Feb 2 13:57:22 2007 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 2 Feb 2007 08:57:22 -0500 Subject: rpms/perl-String-Ediff/devel perl-String-Ediff.spec,1.15,1.16 Message-ID: <200702021357.l12DvMea031966@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/perl-String-Ediff/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31877/perl-String-Ediff/devel Modified Files: perl-String-Ediff.spec Log Message: disable orphans Index: perl-String-Ediff.spec =================================================================== RCS file: /cvs/extras/rpms/perl-String-Ediff/devel/perl-String-Ediff.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- perl-String-Ediff.spec 14 Jan 2007 15:29:04 -0000 1.15 +++ perl-String-Ediff.spec 2 Feb 2007 13:56:49 -0000 1.16 @@ -26,6 +26,13 @@ EOT exit 1 +cat< Author: mschwendt Update of /cvs/extras/rpms/gdome2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31877/gdome2/devel Modified Files: gdome2.spec Log Message: disable orphans Index: gdome2.spec =================================================================== RCS file: /cvs/extras/rpms/gdome2/devel/gdome2.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gdome2.spec 14 Jan 2007 15:28:59 -0000 1.8 +++ gdome2.spec 2 Feb 2007 13:56:03 -0000 1.9 @@ -45,6 +45,13 @@ EOT exit 1 +cat< Author: mschwendt Update of /cvs/extras/rpms/python-htmltmpl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31877/python-htmltmpl/devel Modified Files: python-htmltmpl.spec Log Message: disable orphans Index: python-htmltmpl.spec =================================================================== RCS file: /cvs/extras/rpms/python-htmltmpl/devel/python-htmltmpl.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-htmltmpl.spec 14 Jan 2007 15:29:04 -0000 1.3 +++ python-htmltmpl.spec 2 Feb 2007 13:56:52 -0000 1.4 @@ -37,6 +37,13 @@ EOT exit 1 +cat< Author: mschwendt Update of /cvs/extras/rpms/python-id3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31877/python-id3/devel Modified Files: python-id3.spec Log Message: disable orphans Index: python-id3.spec =================================================================== RCS file: /cvs/extras/rpms/python-id3/devel/python-id3.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-id3.spec 14 Jan 2007 15:29:10 -0000 1.3 +++ python-id3.spec 2 Feb 2007 13:56:56 -0000 1.4 @@ -31,6 +31,13 @@ EOT exit 1 +cat< Author: nphilipp Update of /cvs/extras/rpms/ppracer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2888 Modified Files: ppracer.spec Log Message: rebuild Index: ppracer.spec =================================================================== RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ppracer.spec 23 Nov 2006 20:26:05 -0000 1.17 +++ ppracer.spec 2 Feb 2007 14:08:24 -0000 1.18 @@ -7,7 +7,7 @@ Summary: 3D racing game featuring Tux Name: ppracer Version: 0.3.1 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL Group: Amusements/Games URL: http://racer.planetpenguin.de @@ -94,6 +94,9 @@ %{_datadir}/applications/%{desktop_vendor}-%{name}.desktop %changelog +* Fri Feb 02 2007 Nils Philippsen 0.3.1-9 +- rebuild + * Thu Nov 23 2006 Nils Philippsen 0.3.1-8 - install 256px x 256px tree.png as a temporary workaround for libGLU deficiencies (#199011, image supplied by Hans de Goede) From fedora-extras-commits at redhat.com Fri Feb 2 14:09:48 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 2 Feb 2007 09:09:48 -0500 Subject: rpms/directfb/devel .cvsignore, 1.6, 1.7 directfb.spec, 1.15, 1.16 sources, 1.6, 1.7 Message-ID: <200702021409.l12E9m5g002945@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/directfb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2920 Modified Files: .cvsignore directfb.spec sources Log Message: Update to 1.0.0-rc3. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/directfb/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 17 Jan 2007 11:41:33 -0000 1.6 +++ .cvsignore 2 Feb 2007 14:09:15 -0000 1.7 @@ -1 +1 @@ -DirectFB-1.0.0-rc2.tar.gz +DirectFB-1.0.0-rc3.tar.gz Index: directfb.spec =================================================================== RCS file: /cvs/extras/rpms/directfb/devel/directfb.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- directfb.spec 17 Jan 2007 11:41:33 -0000 1.15 +++ directfb.spec 2 Feb 2007 14:09:15 -0000 1.16 @@ -1,4 +1,4 @@ -%define prever rc2 +%define prever rc3 Summary: Graphics abstraction library for the Linux Framebuffer Device Name: directfb @@ -106,7 +106,7 @@ #%{_datadir}/%{name}-%{version} # Naming is brain dead here... %{_libdir}/directfb-1.0-0/ -%{_datadir}/directfb-1.0.0-rc2/ +%{_datadir}/directfb-1.0.0-%{prever}/ %{_mandir}/man1/dfbg.1* %{_mandir}/man5/directfbrc.5* @@ -129,6 +129,9 @@ %changelog +* Fri Feb 2 2007 Matthias Saou 1.0.0-0.1.rc3 +- Update to 1.0.0-rc3. + * Wed Jan 17 2007 Matthias Saou 1.0.0-0.1.rc2 - Update to 1.0.0-rc2. - Include sysfs patch from Eric Moret (#204568). Index: sources =================================================================== RCS file: /cvs/extras/rpms/directfb/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 17 Jan 2007 11:41:33 -0000 1.6 +++ sources 2 Feb 2007 14:09:15 -0000 1.7 @@ -1 +1 @@ -1996c8e90075b1177b847cd594122401 DirectFB-1.0.0-rc2.tar.gz +d957d3bb2478f95d96638c1a3215608c DirectFB-1.0.0-rc3.tar.gz From fedora-extras-commits at redhat.com Fri Feb 2 14:13:45 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 2 Feb 2007 09:13:45 -0500 Subject: rpms/hackedbox/devel hackedbox-0.8.5-noblackbox.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 hackedbox.spec, 1.8, 1.9 sources, 1.3, 1.4 blackbox-0.65.0-gcc34.patch, 1.1, NONE Message-ID: <200702021413.l12EDjkU003084@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/hackedbox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3060 Modified Files: .cvsignore hackedbox.spec sources Added Files: hackedbox-0.8.5-noblackbox.patch Removed Files: blackbox-0.65.0-gcc34.patch Log Message: Update to 0.8.5 and make hackedbox parallel installable to blackbox. hackedbox-0.8.5-noblackbox.patch: --- NEW FILE hackedbox-0.8.5-noblackbox.patch --- diff -Naupr hackedbox-0.8.5.orig/configure.in hackedbox-0.8.5/configure.in --- hackedbox-0.8.5.orig/configure.in 2007-01-20 06:55:21.000000000 +0100 +++ hackedbox-0.8.5/configure.in 2007-02-02 14:56:01.000000000 +0100 @@ -103,10 +103,10 @@ AC_SUBST(SHAPE) LIBS="$LIBS $Xext_lib" dnl Check for enable utils. -AC_MSG_CHECKING([whether to build utils bsetroot and bsetbg]) +AC_MSG_CHECKING([whether to build utils hsetroot and hsetbg]) AC_ARG_ENABLE( - bg-utils, - [ --enable-bg-utils enable build utils bsetroot and bsetbg [default=no]], + hg-utils, + [ --enable-hg-utils enable build utils hsetroot and hsetbg [default=no]], if test x$enableval = "xyes"; then AC_MSG_RESULT([yes]) UTILS="util" @@ -242,7 +242,7 @@ src/Makefile src/inithack src/blackbox.cc util/Makefile -util/bgmenu.mk +util/hgmenu.mk data/Makefile data/menu data/styles/Makefile diff -Naupr hackedbox-0.8.5.orig/doc/hackedbox.1 hackedbox-0.8.5/doc/hackedbox.1 --- hackedbox-0.8.5.orig/doc/hackedbox.1 2007-01-20 07:05:38.000000000 +0100 +++ hackedbox-0.8.5/doc/hackedbox.1 2007-02-02 14:46:09.000000000 +0100 @@ -565,7 +565,7 @@ frameWidth: a number of pixels >= 0 ! This command is executed whenever this style is selected. ! Typically it sets the root window to a nice picture. -rootCommand: Shell command, e.g. \fIbsetroot \-mod 4 4 \-fg rgb: 5/6/6 \-bg grey20\fR +rootCommand: Shell command, e.g. \fIhsetroot \-mod 4 4 \-fg rgb: 5/6/6 \-bg grey20\fR ! Some of the bbtools read these old 0.51 resources. menuFont: Font diff -Naupr hackedbox-0.8.5.orig/doc/hackedbox.1.in hackedbox-0.8.5/doc/hackedbox.1.in --- hackedbox-0.8.5.orig/doc/hackedbox.1.in 2003-04-28 14:25:15.000000000 +0200 +++ hackedbox-0.8.5/doc/hackedbox.1.in 2007-02-02 14:46:02.000000000 +0100 @@ -565,7 +565,7 @@ frameWidth: a number of pixels >= 0 ! This command is executed whenever this style is selected. ! Typically it sets the root window to a nice picture. -rootCommand: Shell command, e.g. \fIbsetroot \-mod 4 4 \-fg rgb: 5/6/6 \-bg grey20\fR +rootCommand: Shell command, e.g. \fIhsetroot \-mod 4 4 \-fg rgb: 5/6/6 \-bg grey20\fR ! Some of the bbtools read these old 0.51 resources. menuFont: Font diff -Naupr hackedbox-0.8.5.orig/doc/Makefile.am hackedbox-0.8.5/doc/Makefile.am --- hackedbox-0.8.5.orig/doc/Makefile.am 2004-05-06 05:46:44.000000000 +0200 +++ hackedbox-0.8.5/doc/Makefile.am 2007-02-02 14:45:37.000000000 +0100 @@ -3,7 +3,6 @@ CLEANFILES = hackedbox.1 MAINTAINERCLEANFILES = Makefile.in man_MANS = hackedbox.1 -SUBDIRS = fr_FR ja_JP nl_NL sl_SI DEFAULT_MENU=$(pkgdatadir)/menu diff -Naupr hackedbox-0.8.5.orig/util/Makefile.am hackedbox-0.8.5/util/Makefile.am --- hackedbox-0.8.5.orig/util/Makefile.am 2004-05-06 04:27:22.000000000 +0200 +++ hackedbox-0.8.5/util/Makefile.am 2007-02-02 14:54:04.000000000 +0100 @@ -2,23 +2,23 @@ AM_CPPFLAGS= @DEBUG@ @NLS@ @TIMEDCACHE@ @ORDEREDPSEUDO@ -bin_SCRIPTS = bsetbg -bin_PROGRAMS = bsetroot +bin_SCRIPTS = hsetbg +bin_PROGRAMS = hsetroot -bgmenudir = $(pkgdatadir) -bgmenu_DATA = bgmenu.mk +hgmenudir = $(pkgdatadir) +hgmenu_DATA = hgmenu.mk -bsetroot_SOURCES = bsetroot.cc -bsetroot_LDADD = ../src/BaseDisplay.o ../src/Color.o ../src/GCCache.o ../src/Texture.o ../src/Timer.o ../src/Image.o ../src/ImageControl.o ../src/i18n.o ../src/Util.o +hsetroot_SOURCES = bsetroot.cc +hsetroot_LDADD = ../src/BaseDisplay.o ../src/Color.o ../src/GCCache.o ../src/Texture.o ../src/Timer.o ../src/Image.o ../src/ImageControl.o ../src/i18n.o ../src/Util.o MAINTAINERCLEANFILES = Makefile.in distclean-local: - rm -f *\~ .\#* bgmenu.mk + rm -f *\~ .\#* hgmenu.mk # local dependencies -bsetroot.o: bsetroot.cc ../config.h ../src/i18n.hh \ +hsetroot.o: bsetroot.cc ../config.h ../src/i18n.hh \ ../src/../nls/blackbox-nls.hh ../src/GCCache.hh ../src/BaseDisplay.hh \ ../src/Timer.hh ../src/Color.hh ../src/Texture.hh ../src/Util.hh \ bsetroot.hh ../src/Image.hh Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hackedbox/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 Nov 2004 02:46:57 -0000 1.3 +++ .cvsignore 2 Feb 2007 14:13:11 -0000 1.4 @@ -1 +1 @@ -hackedbox-0.8.4.tar.gz +hackedbox-0.8.5.tar.gz Index: hackedbox.spec =================================================================== RCS file: /cvs/extras/rpms/hackedbox/devel/hackedbox.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- hackedbox.spec 28 Aug 2006 10:03:02 -0000 1.8 +++ hackedbox.spec 2 Feb 2007 14:13:11 -0000 1.9 @@ -1,16 +1,13 @@ -# $Id$ -# Authority: matthias - Summary: The bastard son of Blackbox, a small and fast Window Manager Name: hackedbox -Version: 0.8.4 -Release: 7%{?dist} +Version: 0.8.5 +Release: 1%{?dist} License: GPL Group: User Interface/Desktops URL: http://scrudgeware.org/projects/Hackedbox Source: http://scrudgeware.org/downloads/hackedbox/hackedbox-%{version}.tar.gz Source1: hackedbox.desktop -Patch: blackbox-0.65.0-gcc34.patch +Patch0: hackedbox-0.8.5-noblackbox.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root # Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora %if %{!?fedora:6}%{?fedora} >= 5 @@ -18,6 +15,8 @@ %else BuildRequires: xorg-x11-devel %endif +# We heavily patch *.in files... +BuildRequires: autoconf, automake, libtool %description Hackedbox is a stripped down version of Blackbox - The X11 Window Manager. @@ -28,10 +27,17 @@ %prep %setup -%patch -p1 -b .gcc34 +%patch0 -p1 -b .noblackbox +# Remove included binary files! and *.mk supposed to be built from *.mk.in +%{__rm} -f util/bsetroot util/bsetroot.o +%{__rm} -f util/bgmenu.mk +# Rename files, completes the noblackbox patch (avoids bloating the patch) +%{__mv} util/bsetbg util/hsetbg +%{__mv} util/bgmenu.mk.in util/hgmenu.mk.in %build +sh bootstrap %configure %{__make} %{?_smp_mflags} @@ -44,15 +50,15 @@ %{__mkdir_p} %{buildroot}/etc/X11/gdm/Sessions %{__cat} > %{buildroot}/etc/X11/gdm/Sessions/Hackedbox << EOF #!/bin/sh -exec /etc/X11/xdm/Xsession %{name} +exec /etc/X11/xdm/Xsession hackedbox EOF # Replace the /usr/local stuff -%{__perl} -pi -e 's|/local||g' %{buildroot}%{_datadir}/%{name}/menu +%{__perl} -pi -e 's|/local||g' %{buildroot}%{_datadir}/hackedbox/menu # Install the desktop entry %{__install} -D -p -m 644 %{SOURCE1} \ - %{buildroot}%{_datadir}/xsessions/%{name}.desktop + %{buildroot}%{_datadir}/xsessions/hackedbox.desktop %clean @@ -63,22 +69,27 @@ %defattr(-, root, root, 0755) %doc AUTHORS ChangeLog README TODO %attr(755, root, root) /etc/X11/gdm/Sessions/Hackedbox -%{_bindir}/* -%dir %{_datadir}/%{name}/ -%config(noreplace) %{_datadir}/%{name}/bgmenu.mk -%config(noreplace) %{_datadir}/%{name}/menu -%{_datadir}/%{name}/backgrounds -%{_datadir}/%{name}/nls -%{_datadir}/%{name}/styles -%{_datadir}/xsessions/%{name}.desktop +%{_bindir}/hackedbox +%{_bindir}/hsetbg +%{_bindir}/hsetroot +%{_bindir}/inithack +%dir %{_datadir}/hackedbox/ +%config(noreplace) %{_datadir}/hackedbox/hgmenu.mk +%config(noreplace) %{_datadir}/hackedbox/menu +%{_datadir}/hackedbox/backgrounds +%{_datadir}/hackedbox/nls +%{_datadir}/hackedbox/styles +%{_datadir}/xsessions/hackedbox.desktop %{_mandir}/man1/* -%lang(fr_FR) %{_mandir}/fr_FR/man1/* -%lang(ja JP) %{_mandir}/ja_JP/man1/* -%lang(nl_NL) %{_mandir}/nl_NL/man1/* -%lang(sl_SI) %{_mandir}/sl_SI/man1/* %changelog +* Fri Feb 2 2007 Matthias Saou 0.8.5-1 +- Update to 0.8.5. +- Heavily patch to rename b* files (blackbox) to h* (hackedbox), to make both + parallel installable (#212318). +- Remove non-english man pages, they're from blackbox... + * Mon Aug 28 2006 Matthias Saou 0.8.4-7 - FC6 rebuild. - Remove gcc-c++ and perl buil requirements, they are defaults. Index: sources =================================================================== RCS file: /cvs/extras/rpms/hackedbox/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Nov 2004 02:46:57 -0000 1.3 +++ sources 2 Feb 2007 14:13:11 -0000 1.4 @@ -1 +1 @@ -ed15699fb4a7565e71b2fbb002ad8795 hackedbox-0.8.4.tar.gz +7de3d0c76598f2e3d7e59cceb058c201 hackedbox-0.8.5.tar.gz --- blackbox-0.65.0-gcc34.patch DELETED --- From fedora-extras-commits at redhat.com Fri Feb 2 14:32:23 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Fri, 2 Feb 2007 09:32:23 -0500 Subject: rpms/knetworkmanager/FC-6 knetworkmanager.spec,1.6,1.7 Message-ID: <200702021432.l12EWNWW003351@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/knetworkmanager/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3320 Modified Files: knetworkmanager.spec Log Message: rebuild against dbus-qt Index: knetworkmanager.spec =================================================================== RCS file: /cvs/extras/rpms/knetworkmanager/FC-6/knetworkmanager.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- knetworkmanager.spec 14 Nov 2006 13:04:55 -0000 1.6 +++ knetworkmanager.spec 2 Feb 2007 14:31:50 -0000 1.7 @@ -2,7 +2,7 @@ Name: knetworkmanager Version: 0.1 -Release: 0.5.%{svn}%{?dist} +Release: 0.6.%{svn}%{?dist} Summary: KDE applet for Network Manager Group: Applications/Internet @@ -11,13 +11,14 @@ Source0: knetworkmanager-%{svn}.tar.bz2 #script to make svn tarball Source1: knetworkmanager-svn_checkout.sh -# Patch adds dbus support as dbusqt3 is no longer in extras -Patch0: knetworkmanager-dbus.patch +# Patch adds kpp dialup support +Patch0: knetworkmanager-kpp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: NetworkManager-devel >= 0.6.2 dbus-devel autoconf automake BuildRequires: desktop-file-utils kdebase-devel hal-devel wireless-tools-devel +BuildRequires: dbus-qt-devel %description KNetworkManager is a system tray applet for controlling network @@ -25,11 +26,9 @@ %prep %setup -q -n knetworkmanager -%patch0 -p1 -b .dbus +%patch0 -p1 -b .kppp %build -unset QTDIR || : ; . /etc/profile.d/qt.sh -export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include make -f Makefile.cvs %configure --disable-rpath make %{?_smp_mflags} @@ -84,6 +83,9 @@ %changelog +* Fri Jan 26 2007 Dennis Gilmore - 0.1-0.6.svn20061113 +- build against dbus-qt package + * Tue Nov 14 2006 Dennis Gilmore - 0.1-0.5.svn20061113 - messed up check in :( From fedora-extras-commits at redhat.com Fri Feb 2 14:33:10 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Fri, 2 Feb 2007 09:33:10 -0500 Subject: rpms/knetworkmanager/FC-6 knetworkmanager-kpp.patch, NONE, 1.1 knetworkmanager-dbus.patch, 1.2, NONE Message-ID: <200702021433.l12EXA1f003376@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/knetworkmanager/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3367 Added Files: knetworkmanager-kpp.patch Removed Files: knetworkmanager-dbus.patch Log Message: fix patches knetworkmanager-kpp.patch: --- NEW FILE knetworkmanager-kpp.patch --- --- knetworkmanager-orig/knetworkmanager/configure.in.in 2007-01-23 07:56:04.000000000 -0600 +++ knetworkmanager/knetworkmanager/configure.in.in 2007-01-27 00:16:57.000000000 -0600 @@ -48,9 +48,10 @@ AC_LANG_RESTORE -AC_ARG_WITH(distro, AC_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: suse])) +AC_ARG_WITH(distro, AC_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: suse, fedora])) if test "x$with_distro" = "x"; then AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse") + AC_CHECK_FILE(/etc/redhat-release,with_distro="fedora") if test "x$with_distro" = "x"; then with_distro=`lsb_release -is` fi @@ -65,6 +66,9 @@ suse) AC_DEFINE_UNQUOTED(KNETWORKMANAGER_DIALUP_CONFIG, "kdesu --nonewdcop /sbin/yast2 modem", [Command to launch dial up configuration tool]) ;; + fedora) + AC_DEFINE_UNQUOTED(KNETWORKMANAGER_DIALUP_CONFIG, "kdesu --nonewdcop /usr/bin/kppp", [Command to launch dial up configuration tool]) + ;; *) echo "Your distribution (${with_distro}) is not yet supported (e.g. you will not be able to launch a tool to configure dial-up connections.)" ;; --- knetworkmanager-dbus.patch DELETED --- From fedora-extras-commits at redhat.com Fri Feb 2 14:36:13 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Fri, 2 Feb 2007 09:36:13 -0500 Subject: rpms/knetworkmanager/devel knetworkmanager-kpp.patch, NONE, 1.1 knetworkmanager-svn_checkout.sh, 1.1, 1.2 knetworkmanager.spec, 1.5, 1.6 knetworkmanager-dbus.patch, 1.2, NONE Message-ID: <200702021436.l12EaDP5003484@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/knetworkmanager/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3451 Modified Files: knetworkmanager-svn_checkout.sh knetworkmanager.spec Added Files: knetworkmanager-kpp.patch Removed Files: knetworkmanager-dbus.patch Log Message: rebuild against dbus-qt knetworkmanager-kpp.patch: --- NEW FILE knetworkmanager-kpp.patch --- --- knetworkmanager-orig/knetworkmanager/configure.in.in 2007-01-23 07:56:04.000000000 -0600 +++ knetworkmanager/knetworkmanager/configure.in.in 2007-01-27 00:16:57.000000000 -0600 @@ -48,9 +48,10 @@ AC_LANG_RESTORE -AC_ARG_WITH(distro, AC_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: suse])) +AC_ARG_WITH(distro, AC_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: suse, fedora])) if test "x$with_distro" = "x"; then AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse") + AC_CHECK_FILE(/etc/redhat-release,with_distro="fedora") if test "x$with_distro" = "x"; then with_distro=`lsb_release -is` fi @@ -65,6 +66,9 @@ suse) AC_DEFINE_UNQUOTED(KNETWORKMANAGER_DIALUP_CONFIG, "kdesu --nonewdcop /sbin/yast2 modem", [Command to launch dial up configuration tool]) ;; + fedora) + AC_DEFINE_UNQUOTED(KNETWORKMANAGER_DIALUP_CONFIG, "kdesu --nonewdcop /usr/bin/kppp", [Command to launch dial up configuration tool]) + ;; *) echo "Your distribution (${with_distro}) is not yet supported (e.g. you will not be able to launch a tool to configure dial-up connections.)" ;; Index: knetworkmanager-svn_checkout.sh =================================================================== RCS file: /cvs/extras/rpms/knetworkmanager/devel/knetworkmanager-svn_checkout.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- knetworkmanager-svn_checkout.sh 26 Jun 2006 17:30:11 -0000 1.1 +++ knetworkmanager-svn_checkout.sh 2 Feb 2007 14:35:40 -0000 1.2 @@ -4,17 +4,18 @@ EXPORT_DIR=knetworkmanager set -x -rm -rf $EXPORT_DIR +rm -rf $EXPORT_DIR svn --non-recursive export svn://anonsvn.kde.org/home/kde/trunk/kdereview/ $EXPORT_DIR # app -svn export svn://anonsvn.kde.org/home/kde/trunk/kdereview/knetworkmanager/ $EXPORT_DIR/knetworkmanager +#svn export svn://anonsvn.kde.org/home/kde/trunk/kdereview/knetworkmanager/ $EXPORT_DIR/knetworkmanager +svn export svn://websvn.kde.org/home/kde/trunk/extragear/network/knetworkmanager $EXPORT_DIR/knetworkmanager # docs #svn export svn://anonsvn.kde.org/home/kde/trunk/kdereview/doc/knetworkmanager $EXPORT_DIR/doc/ # auto*/configure bits svn export svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kde-common/admin $EXPORT_DIR/admin/ -tar cjf knetworkmanager-svn${DATE}.tar.bz2 $EXPORT_DIR +tar cjf knetworkmanager-svn${DATE}.tar.bz2 $EXPORT_DIR # cleanup -rm -rf $EXPORT_DIR +rm -rf $EXPORT_DIR Index: knetworkmanager.spec =================================================================== RCS file: /cvs/extras/rpms/knetworkmanager/devel/knetworkmanager.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- knetworkmanager.spec 14 Nov 2006 13:08:52 -0000 1.5 +++ knetworkmanager.spec 2 Feb 2007 14:35:40 -0000 1.6 @@ -2,7 +2,7 @@ Name: knetworkmanager Version: 0.1 -Release: 0.5.%{svn}%{?dist} +Release: 0.6.%{svn}%{?dist} Summary: KDE applet for Network Manager Group: Applications/Internet @@ -11,13 +11,14 @@ Source0: knetworkmanager-%{svn}.tar.bz2 #script to make svn tarball Source1: knetworkmanager-svn_checkout.sh -# Patch adds dbus support as dbusqt3 is no longer in extras -Patch0: knetworkmanager-dbus.patch +# Patch adds kpp dialup support +Patch0: knetworkmanager-kpp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: NetworkManager-devel >= 0.6.2 dbus-devel autoconf automake BuildRequires: desktop-file-utils kdebase-devel hal-devel wireless-tools-devel +BuildRequires: dbus-qt-devel %description KNetworkManager is a system tray applet for controlling network @@ -25,11 +26,9 @@ %prep %setup -q -n knetworkmanager -%patch0 -p1 -b .dbus +%patch0 -p1 -b .kppp %build -unset QTDIR || : ; . /etc/profile.d/qt.sh -export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include make -f Makefile.cvs %configure --disable-rpath make %{?_smp_mflags} @@ -84,6 +83,9 @@ %changelog +* Fri Jan 26 2007 Dennis Gilmore - 0.1-0.6.svn20061113 +- build against dbus-qt package + * Tue Nov 14 2006 Dennis Gilmore - 0.1-0.5.svn20061113 - messed up check in :( --- knetworkmanager-dbus.patch DELETED --- From fedora-extras-commits at redhat.com Fri Feb 2 14:20:47 2007 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 2 Feb 2007 09:20:47 -0500 Subject: rpms/mhash/devel mhash.spec,1.13,1.14 Message-ID: <200702021420.l12EKlLv003200@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/mhash/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3179 Modified Files: mhash.spec Log Message: * Fri Feb 2 2007 Michael Schwendt - 0.9.7.1-2 - Add check section. Index: mhash.spec =================================================================== RCS file: /cvs/extras/rpms/mhash/devel/mhash.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- mhash.spec 25 Nov 2006 12:41:36 -0000 1.13 +++ mhash.spec 2 Feb 2007 14:20:12 -0000 1.14 @@ -1,7 +1,7 @@ Summary: Thread-safe hash algorithms library Name: mhash Version: 0.9.7.1 -Release: 1 +Release: 2 URL: http://mhash.sourceforge.net/ License: LGPL Group: System Environment/Libraries @@ -52,6 +52,10 @@ sed -i 's!\(#define \(PACKAGE\|VERSION \).*\)!/* \1 */!g' ${RPM_BUILD_ROOT}%{_includedir}/mutils/mhash_config.h +%check +make check + + %post -n %{name} -p /sbin/ldconfig @@ -80,6 +84,9 @@ %changelog +* Fri Feb 2 2007 Michael Schwendt - 0.9.7.1-2 +- Add check section. + * Sat Nov 25 2006 Michael Schwendt - 0.9.7.1-1 - Update to 0.9.7.1. From fedora-extras-commits at redhat.com Fri Feb 2 15:21:47 2007 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 2 Feb 2007 10:21:47 -0500 Subject: rpms/mhash/devel mhash.spec,1.14,1.15 Message-ID: <200702021521.l12FLlbk007456@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/mhash/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7435 Modified Files: mhash.spec Log Message: test Index: mhash.spec =================================================================== RCS file: /cvs/extras/rpms/mhash/devel/mhash.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- mhash.spec 2 Feb 2007 14:20:12 -0000 1.14 +++ mhash.spec 2 Feb 2007 15:21:15 -0000 1.15 @@ -1,11 +1,12 @@ Summary: Thread-safe hash algorithms library Name: mhash Version: 0.9.7.1 -Release: 2 +Release: 2.1 URL: http://mhash.sourceforge.net/ License: LGPL Group: System Environment/Libraries Source: http://download.sourceforge.net/mhash/mhash-%{version}.tar.bz2 +Patch0: mhash-0.9.7.1-be-test.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) Provides: libmhash = %{version}-%{release} @@ -36,6 +37,7 @@ %prep %setup -q +%patch0 -p1 -b .be-test %build From fedora-extras-commits at redhat.com Fri Feb 2 15:22:31 2007 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 2 Feb 2007 10:22:31 -0500 Subject: rpms/mhash/devel mhash-0.9.7.1-be-test.patch,NONE,1.1 Message-ID: <200702021522.l12FMV7L007551@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/mhash/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7538 Added Files: mhash-0.9.7.1-be-test.patch Log Message: test mhash-0.9.7.1-be-test.patch: --- NEW FILE mhash-0.9.7.1-be-test.patch --- diff -Nur mhash-0.9.7.1-orig/lib/haval.c mhash-0.9.7.1/lib/haval.c --- mhash-0.9.7.1-orig/lib/haval.c 2006-06-24 08:07:56.000000000 +0200 +++ mhash-0.9.7.1/lib/haval.c 2007-02-02 16:27:01.000000000 +0100 @@ -831,10 +831,9 @@ ) >> 8) | ( (hcp->digest[7] & 0x000000FFUL) << 24); #if defined(WORDS_BIGENDIAN) - digest = mutils_word32nswap((mutils_word32 *) (hcp->digest), 128/32, MUTILS_FALSE); -#else - mutils_memcpy(digest, hcp->digest, 128/8); + mutils_word32nswap((mutils_word32 *) (hcp->digest), 128/32, MUTILS_TRUE); #endif + mutils_memcpy(digest, hcp->digest, 128/8); break; case 160: hcp->digest[4] += @@ -851,10 +850,9 @@ ((hcp->digest[7] & 0x0000003FUL) | (hcp->digest[6] & 0xFE000000UL) | (hcp->digest[5] & 0x01F80000UL), 19); #if defined(WORDS_BIGENDIAN) - digest = mutils_word32nswap((mutils_word32 *) (hcp->digest), 160/32, MUTILS_FALSE); -#else - mutils_memcpy (digest, hcp->digest, 160/8); + mutils_word32nswap((mutils_word32 *) (hcp->digest), 160/32, MUTILS_TRUE); #endif + mutils_memcpy (digest, hcp->digest, 160/8); break; case 192: @@ -873,10 +871,9 @@ ((hcp->digest[7] & 0x0000001FUL) | (hcp->digest[6] & 0xFC000000UL), 26); #if defined(WORDS_BIGENDIAN) - digest = mutils_word32nswap((mutils_word32 *) (hcp->digest), 192/32, MUTILS_FALSE); -#else - mutils_memcpy (digest, hcp->digest, 192/8); + mutils_word32nswap((mutils_word32 *) (hcp->digest), 192/32, MUTILS_TRUE); #endif + mutils_memcpy (digest, hcp->digest, 192/8); break; case 224: @@ -889,19 +886,17 @@ hcp->digest[0] += (hcp->digest[7] >> 27) & 0x0000001FUL; #if defined(WORDS_BIGENDIAN) - digest = mutils_word32nswap((mutils_word32 *) (hcp->digest), 224/32, MUTILS_FALSE); -#else - mutils_memcpy (digest, hcp->digest, 224/8); + mutils_word32nswap((mutils_word32 *) (hcp->digest), 224/32, MUTILS_TRUE); #endif + mutils_memcpy (digest, hcp->digest, 224/8); break; case 256: #if defined(WORDS_BIGENDIAN) - digest = mutils_word32nswap((mutils_word32 *) (hcp->digest), 256/32, MUTILS_FALSE); -#else - mutils_memcpy (digest, hcp->digest, 256/8); + mutils_word32nswap((mutils_word32 *) (hcp->digest), 256/32, MUTILS_TRUE); #endif + mutils_memcpy (digest, hcp->digest, 256/8); break; } From fedora-extras-commits at redhat.com Fri Feb 2 15:22:41 2007 From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun)) Date: Fri, 2 Feb 2007 10:22:41 -0500 Subject: rpms/amsn/devel amsn.spec,1.6,1.7 Message-ID: <200702021522.l12FMf0P007573@cvs-int.fedora.redhat.com> Author: tjikkun Update of /cvs/extras/rpms/amsn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7455 Modified Files: amsn.spec Log Message: bump for rebuild against tcl/tk 8.5 Index: amsn.spec =================================================================== RCS file: /cvs/extras/rpms/amsn/devel/amsn.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- amsn.spec 4 Nov 2006 12:58:42 -0000 1.6 +++ amsn.spec 2 Feb 2007 15:22:09 -0000 1.7 @@ -1,6 +1,6 @@ Name: amsn Version: 0.96 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MSN Messenger clone for Linux, Mac and Windows Group: Applications/Internet @@ -121,6 +121,9 @@ %changelog +* Thu Sep 4 2006 Sander Hoentjen - 0.96-3 +- rebuilt against tcl/tk 8.5 + * Thu Sep 4 2006 Sander Hoentjen - 0.96-2 - webcam now works (bug #206674) From fedora-extras-commits at redhat.com Fri Feb 2 15:27:35 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 2 Feb 2007 10:27:35 -0500 Subject: rpms/kazehakase - New directory Message-ID: <200702021527.l12FRZEN007760@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/kazehakase In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7755/kazehakase Log Message: Directory /cvs/extras/rpms/kazehakase added to the repository From fedora-extras-commits at redhat.com Fri Feb 2 15:27:43 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 2 Feb 2007 10:27:43 -0500 Subject: rpms/kazehakase/devel - New directory Message-ID: <200702021527.l12FRhwj007774@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/kazehakase/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7755/kazehakase/devel Log Message: Directory /cvs/extras/rpms/kazehakase/devel added to the repository From fedora-extras-commits at redhat.com Fri Feb 2 15:36:29 2007 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 2 Feb 2007 10:36:29 -0500 Subject: rpms/mhash/devel mhash.spec,1.15,1.16 Message-ID: <200702021536.l12FaT2p007908@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/mhash/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7875 Modified Files: mhash.spec Log Message: * Fri Feb 2 2007 Michael Schwendt - 0.9.7.1-3 - Patch is sufficient to pass test-suite. Fixes #226987. Index: mhash.spec =================================================================== RCS file: /cvs/extras/rpms/mhash/devel/mhash.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- mhash.spec 2 Feb 2007 15:21:15 -0000 1.15 +++ mhash.spec 2 Feb 2007 15:35:56 -0000 1.16 @@ -1,7 +1,7 @@ Summary: Thread-safe hash algorithms library Name: mhash Version: 0.9.7.1 -Release: 2.1 +Release: 3 URL: http://mhash.sourceforge.net/ License: LGPL Group: System Environment/Libraries @@ -86,6 +86,9 @@ %changelog +* Fri Feb 2 2007 Michael Schwendt - 0.9.7.1-3 +- Patch is sufficient to pass test-suite. Fixes #226987. + * Fri Feb 2 2007 Michael Schwendt - 0.9.7.1-2 - Add check section. From fedora-extras-commits at redhat.com Fri Feb 2 15:37:54 2007 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 2 Feb 2007 10:37:54 -0500 Subject: rpms/mhash/devel mhash.spec,1.16,1.17 Message-ID: <200702021537.l12FbsZN007998@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/mhash/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7972 Modified Files: mhash.spec Log Message: Index: mhash.spec =================================================================== RCS file: /cvs/extras/rpms/mhash/devel/mhash.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- mhash.spec 2 Feb 2007 15:35:56 -0000 1.16 +++ mhash.spec 2 Feb 2007 15:37:21 -0000 1.17 @@ -87,7 +87,7 @@ %changelog * Fri Feb 2 2007 Michael Schwendt - 0.9.7.1-3 -- Patch is sufficient to pass test-suite. Fixes #226987. +- Patch is sufficient to pass test-suite on ppc. Fixes #226987. * Fri Feb 2 2007 Michael Schwendt - 0.9.7.1-2 - Add check section. From fedora-extras-commits at redhat.com Fri Feb 2 15:47:59 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 2 Feb 2007 10:47:59 -0500 Subject: rpms/jd/devel .cvsignore, 1.59, 1.60 jd.spec, 1.69, 1.70 sources, 1.59, 1.60 Message-ID: <200702021547.l12Flxxr008177@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8143 Modified Files: .cvsignore jd.spec sources Log Message: * Fri Feb 2 2007 Mamoru Tasaka - 1.8.5-1 - 1.8.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- .cvsignore 30 Jan 2007 15:49:27 -0000 1.59 +++ .cvsignore 2 Feb 2007 15:47:27 -0000 1.60 @@ -1 +1 @@ -jd-1.8.5-cvs070130.tgz +jd-1.8.5-070203.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- jd.spec 30 Jan 2007 15:49:27 -0000 1.69 +++ jd.spec 2 Feb 2007 15:47:27 -0000 1.70 @@ -10,13 +10,13 @@ # Defined by upsteam # %define main_ver 1.8.5 -%define strtag cvs070130 -%define repoid 23674 +%define strtag 070203 +%define repoid 23816 # Defined by vendor # -%define vendor_rel 4 +%define vendor_rel 1 # Tag name changed from vendor to vendorname so as not to # overwrite Vendor entry in Summary %define vendorname fedora @@ -24,7 +24,7 @@ %define icondir %{_datadir}/icons/hicolor/96x96/apps/ # Define this if this is pre-version -%define pre_release 1 +%define pre_release 0 %if %{pre_release} %define rel 0.%{vendor_rel}.%{strtag}%{?dist} @@ -106,8 +106,8 @@ %{icondir}/%{name}.png %changelog -* Tue Jan 30 2007 Mamoru Tasaka - 1.8.5-0.4.cvs071130 -- cvs 070130 (20:50 JST) +* Fri Feb 2 2007 Mamoru Tasaka - 1.8.5-1 +- 1.8.5 * Sun Jan 21 2007 Mamoru Tasaka - 1.8.5-0.3.rc071121 - 1.8.5 rc 071121 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- sources 30 Jan 2007 15:49:27 -0000 1.59 +++ sources 2 Feb 2007 15:47:27 -0000 1.60 @@ -1 +1 @@ -971abd18cdda8d16eb3d507ab962d2b5 jd-1.8.5-cvs070130.tgz +8cc9aad86ea0458705c2937a7798a22a jd-1.8.5-070203.tgz From fedora-extras-commits at redhat.com Fri Feb 2 15:48:47 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 2 Feb 2007 10:48:47 -0500 Subject: rpms/jd/FC-6 .cvsignore, 1.16, 1.17 jd.spec, 1.19, 1.20 sources, 1.16, 1.17 jd-1.8.5-rc070121-mouse-one-click.patch, 1.1, NONE Message-ID: <200702021548.l12FmlVS008299@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8227 Modified Files: .cvsignore jd.spec sources Removed Files: jd-1.8.5-rc070121-mouse-one-click.patch Log Message: * Fri Feb 2 2007 Mamoru Tasaka - 1.8.5-1 - 1.8.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/FC-6/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 21 Jan 2007 14:32:00 -0000 1.16 +++ .cvsignore 2 Feb 2007 15:48:15 -0000 1.17 @@ -1 +1 @@ -jd-1.8.5-rc070121.tgz +jd-1.8.5-070203.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/FC-6/jd.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- jd.spec 23 Jan 2007 16:24:55 -0000 1.19 +++ jd.spec 2 Feb 2007 15:48:15 -0000 1.20 @@ -10,13 +10,13 @@ # Defined by upsteam # %define main_ver 1.8.5 -%define strtag rc070121 -%define repoid 23674 +%define strtag 070203 +%define repoid 23816 # Defined by vendor # -%define vendor_rel 3 +%define vendor_rel 1 # Tag name changed from vendor to vendorname so as not to # overwrite Vendor entry in Summary %define vendorname fedora @@ -24,10 +24,10 @@ %define icondir %{_datadir}/icons/hicolor/96x96/apps/ # Define this if this is pre-version -%define pre_release 1 +%define pre_release 0 %if %{pre_release} -%define rel 0.%{vendor_rel}.%{strtag}%{?dist}.1 +%define rel 0.%{vendor_rel}.%{strtag}%{?dist} %else %define rel %{vendor_rel}%{?dist} %endif @@ -45,7 +45,6 @@ URL: http://jd4linux.sourceforge.jp/ Source0: http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz #Source0: %{name}-%{main_ver}-%{strtag}.tgz -Patch0: jd-1.8.5-rc070121-mouse-one-click.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{gtkmmdevel} @@ -61,7 +60,6 @@ %prep %setup -q -n %{name}-%{main_ver}-%{strtag} -%patch0 -p1 -b .one_click find . -name CVS | sort -r | xargs %{__rm} -rf %build @@ -108,8 +106,8 @@ %{icondir}/%{name}.png %changelog -* Sun Jan 21 2007 Mamoru Tasaka - 1.8.5-0.3.rc071121.dist.1 -- Patch for one click behavior problem +* Fri Feb 2 2007 Mamoru Tasaka - 1.8.5-1 +- 1.8.5 * Sun Jan 21 2007 Mamoru Tasaka - 1.8.5-0.3.rc071121 - 1.8.5 rc 071121 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/FC-6/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 21 Jan 2007 14:32:00 -0000 1.16 +++ sources 2 Feb 2007 15:48:15 -0000 1.17 @@ -1 +1 @@ -6717c03875f6c29ed97fc0a174701ce7 jd-1.8.5-rc070121.tgz +8cc9aad86ea0458705c2937a7798a22a jd-1.8.5-070203.tgz --- jd-1.8.5-rc070121-mouse-one-click.patch DELETED --- From fedora-extras-commits at redhat.com Fri Feb 2 15:49:17 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 2 Feb 2007 10:49:17 -0500 Subject: rpms/jd/FC-5 .cvsignore, 1.15, 1.16 jd.spec, 1.18, 1.19 sources, 1.15, 1.16 jd-1.8.5-rc070121-mouse-one-click.patch, 1.1, NONE Message-ID: <200702021549.l12FnH8C008352@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8265 Modified Files: .cvsignore jd.spec sources Removed Files: jd-1.8.5-rc070121-mouse-one-click.patch Log Message: * Fri Feb 2 2007 Mamoru Tasaka - 1.8.5-1 - 1.8.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/FC-5/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 21 Jan 2007 14:32:05 -0000 1.15 +++ .cvsignore 2 Feb 2007 15:48:45 -0000 1.16 @@ -1 +1 @@ -jd-1.8.5-rc070121.tgz +jd-1.8.5-070203.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/FC-5/jd.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- jd.spec 23 Jan 2007 16:25:45 -0000 1.18 +++ jd.spec 2 Feb 2007 15:48:45 -0000 1.19 @@ -10,13 +10,13 @@ # Defined by upsteam # %define main_ver 1.8.5 -%define strtag rc070121 -%define repoid 23674 +%define strtag 070203 +%define repoid 23816 # Defined by vendor # -%define vendor_rel 3 +%define vendor_rel 1 # Tag name changed from vendor to vendorname so as not to # overwrite Vendor entry in Summary %define vendorname fedora @@ -24,10 +24,10 @@ %define icondir %{_datadir}/icons/hicolor/96x96/apps/ # Define this if this is pre-version -%define pre_release 1 +%define pre_release 0 %if %{pre_release} -%define rel 0.%{vendor_rel}.%{strtag}%{?dist}.1 +%define rel 0.%{vendor_rel}.%{strtag}%{?dist} %else %define rel %{vendor_rel}%{?dist} %endif @@ -45,7 +45,6 @@ URL: http://jd4linux.sourceforge.jp/ Source0: http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz #Source0: %{name}-%{main_ver}-%{strtag}.tgz -Patch0: jd-1.8.5-rc070121-mouse-one-click.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{gtkmmdevel} @@ -61,7 +60,6 @@ %prep %setup -q -n %{name}-%{main_ver}-%{strtag} -%patch0 -p1 -b .one_click find . -name CVS | sort -r | xargs %{__rm} -rf %build @@ -108,8 +106,8 @@ %{icondir}/%{name}.png %changelog -* Sun Jan 21 2007 Mamoru Tasaka - 1.8.5-0.3.rc071121.dist.1 -- Patch for one click behavior problem +* Fri Feb 2 2007 Mamoru Tasaka - 1.8.5-1 +- 1.8.5 * Sun Jan 21 2007 Mamoru Tasaka - 1.8.5-0.3.rc071121 - 1.8.5 rc 071121 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/FC-5/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 21 Jan 2007 14:32:05 -0000 1.15 +++ sources 2 Feb 2007 15:48:45 -0000 1.16 @@ -1 +1 @@ -6717c03875f6c29ed97fc0a174701ce7 jd-1.8.5-rc070121.tgz +8cc9aad86ea0458705c2937a7798a22a jd-1.8.5-070203.tgz --- jd-1.8.5-rc070121-mouse-one-click.patch DELETED --- From fedora-extras-commits at redhat.com Fri Feb 2 15:52:25 2007 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 2 Feb 2007 10:52:25 -0500 Subject: rpms/rpmlint/FC-5 .cvsignore, 1.14, 1.15 rpmlint.config, 1.2, 1.3 rpmlint.spec, 1.26, 1.27 sources, 1.14, 1.15 rpmlint-0.78-svn-fixes.patch, 1.1, NONE Message-ID: <200702021552.l12FqPiT008606@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/rpmlint/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8542/FC-5 Modified Files: .cvsignore rpmlint.config rpmlint.spec sources Removed Files: rpmlint-0.78-svn-fixes.patch Log Message: * Fri Feb 2 2007 Ville Skytt?? - 0.79-1 - 0.79, fixes #211417, #212491, #214605, #218250, #219068, #220061, #221116, #222585, and #226879. - Accept *.elX disttags in default config. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rpmlint/FC-5/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 23 Sep 2006 21:37:34 -0000 1.14 +++ .cvsignore 2 Feb 2007 15:51:53 -0000 1.15 @@ -1 +1 @@ -rpmlint-0.78.tar.bz2 +rpmlint-0.79.tar.bz2 Index: rpmlint.config =================================================================== RCS file: /cvs/extras/rpms/rpmlint/FC-5/rpmlint.config,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rpmlint.config 15 Oct 2006 08:22:26 -0000 1.2 +++ rpmlint.config 2 Feb 2007 15:51:53 -0000 1.3 @@ -5,7 +5,7 @@ from Config import * -setOption("DistRegex", '\.(fc|rhe?l)\d+(?=\.|$)') +setOption("DistRegex", '\.(fc|rhe?l|el)\d+(?=\.|$)') setOption("UseVersionInChangeLog", 1) setOption("UseBzip2", 0) setOption("UseDefaultRunlevels", 0) Index: rpmlint.spec =================================================================== RCS file: /cvs/extras/rpms/rpmlint/FC-5/rpmlint.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- rpmlint.spec 15 Oct 2006 08:22:26 -0000 1.26 +++ rpmlint.spec 2 Feb 2007 15:51:53 -0000 1.27 @@ -1,6 +1,6 @@ Name: rpmlint -Version: 0.78 -Release: 2%{?dist} +Version: 0.79 +Release: 1%{?dist} Summary: Tool for checking common errors in RPM packages Group: Development/Tools @@ -10,7 +10,6 @@ Source1: %{name}.config Patch0: %{name}-0.78-distregex.patch Patch1: %{name}-0.77-compile.patch -Patch2: %{name}-0.78-svn-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -32,7 +31,6 @@ %setup -q %patch0 %patch1 -%patch2 sed -i -e /MenuCheck/d Config.py @@ -67,6 +65,11 @@ %changelog +* Fri Feb 2 2007 Ville Skytt?? - 0.79-1 +- 0.79, fixes #211417, #212491, #214605, #218250, #219068, #220061, #221116, + #222585, and #226879. +- Accept *.elX disttags in default config. + * Sun Oct 15 2006 Ville Skytt?? - 0.78-2 - Accumulated bugfixes since 0.78: #209876, #209889, #210110, 210261. - Filter messages about gpg-pubkeys for now. Index: sources =================================================================== RCS file: /cvs/extras/rpms/rpmlint/FC-5/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 23 Sep 2006 21:37:34 -0000 1.14 +++ sources 2 Feb 2007 15:51:53 -0000 1.15 @@ -1 +1 @@ -73fd414976c4654c3007a55a762c7eed rpmlint-0.78.tar.bz2 +50ebdf88ede4b1265e9a69b20e356f44 rpmlint-0.79.tar.bz2 --- rpmlint-0.78-svn-fixes.patch DELETED --- From fedora-extras-commits at redhat.com Fri Feb 2 15:52:28 2007 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 2 Feb 2007 10:52:28 -0500 Subject: rpms/rpmlint/FC-6 .cvsignore, 1.14, 1.15 rpmlint.config, 1.4, 1.5 rpmlint.spec, 1.27, 1.28 sources, 1.14, 1.15 rpmlint-0.78-svn-fixes.patch, 1.1, NONE Message-ID: <200702021552.l12FqS1u008612@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/rpmlint/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8542/FC-6 Modified Files: .cvsignore rpmlint.config rpmlint.spec sources Removed Files: rpmlint-0.78-svn-fixes.patch Log Message: * Fri Feb 2 2007 Ville Skytt?? - 0.79-1 - 0.79, fixes #211417, #212491, #214605, #218250, #219068, #220061, #221116, #222585, and #226879. - Accept *.elX disttags in default config. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rpmlint/FC-6/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 23 Sep 2006 21:37:35 -0000 1.14 +++ .cvsignore 2 Feb 2007 15:51:55 -0000 1.15 @@ -1 +1 @@ -rpmlint-0.78.tar.bz2 +rpmlint-0.79.tar.bz2 Index: rpmlint.config =================================================================== RCS file: /cvs/extras/rpms/rpmlint/FC-6/rpmlint.config,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rpmlint.config 15 Oct 2006 08:22:26 -0000 1.4 +++ rpmlint.config 2 Feb 2007 15:51:55 -0000 1.5 @@ -5,7 +5,7 @@ from Config import * -setOption("DistRegex", '\.(fc|rhe?l)\d+(?=\.|$)') +setOption("DistRegex", '\.(fc|rhe?l|el)\d+(?=\.|$)') setOption("UseVersionInChangeLog", 1) setOption("UseBzip2", 0) setOption("UseDefaultRunlevels", 0) Index: rpmlint.spec =================================================================== RCS file: /cvs/extras/rpms/rpmlint/FC-6/rpmlint.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- rpmlint.spec 15 Oct 2006 08:22:26 -0000 1.27 +++ rpmlint.spec 2 Feb 2007 15:51:55 -0000 1.28 @@ -1,6 +1,6 @@ Name: rpmlint -Version: 0.78 -Release: 2%{?dist} +Version: 0.79 +Release: 1%{?dist} Summary: Tool for checking common errors in RPM packages Group: Development/Tools @@ -10,7 +10,6 @@ Source1: %{name}.config Patch0: %{name}-0.78-distregex.patch Patch1: %{name}-0.77-compile.patch -Patch2: %{name}-0.78-svn-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -32,7 +31,6 @@ %setup -q %patch0 %patch1 -%patch2 sed -i -e /MenuCheck/d Config.py @@ -67,6 +65,11 @@ %changelog +* Fri Feb 2 2007 Ville Skytt?? - 0.79-1 +- 0.79, fixes #211417, #212491, #214605, #218250, #219068, #220061, #221116, + #222585, and #226879. +- Accept *.elX disttags in default config. + * Sun Oct 15 2006 Ville Skytt?? - 0.78-2 - Accumulated bugfixes since 0.78: #209876, #209889, #210110, 210261. - Filter messages about gpg-pubkeys for now. Index: sources =================================================================== RCS file: /cvs/extras/rpms/rpmlint/FC-6/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 23 Sep 2006 21:37:35 -0000 1.14 +++ sources 2 Feb 2007 15:51:55 -0000 1.15 @@ -1 +1 @@ -73fd414976c4654c3007a55a762c7eed rpmlint-0.78.tar.bz2 +50ebdf88ede4b1265e9a69b20e356f44 rpmlint-0.79.tar.bz2 --- rpmlint-0.78-svn-fixes.patch DELETED --- From fedora-extras-commits at redhat.com Fri Feb 2 15:52:30 2007 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 2 Feb 2007 10:52:30 -0500 Subject: rpms/rpmlint/devel .cvsignore, 1.14, 1.15 rpmlint.config, 1.4, 1.5 rpmlint.spec, 1.27, 1.28 sources, 1.14, 1.15 rpmlint-0.78-svn-fixes.patch, 1.1, NONE Message-ID: <200702021552.l12FqUCI008618@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/rpmlint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8542/devel Modified Files: .cvsignore rpmlint.config rpmlint.spec sources Removed Files: rpmlint-0.78-svn-fixes.patch Log Message: * Fri Feb 2 2007 Ville Skytt?? - 0.79-1 - 0.79, fixes #211417, #212491, #214605, #218250, #219068, #220061, #221116, #222585, and #226879. - Accept *.elX disttags in default config. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rpmlint/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 23 Sep 2006 21:37:35 -0000 1.14 +++ .cvsignore 2 Feb 2007 15:51:58 -0000 1.15 @@ -1 +1 @@ -rpmlint-0.78.tar.bz2 +rpmlint-0.79.tar.bz2 Index: rpmlint.config =================================================================== RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.config,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rpmlint.config 15 Oct 2006 08:22:26 -0000 1.4 +++ rpmlint.config 2 Feb 2007 15:51:58 -0000 1.5 @@ -5,7 +5,7 @@ from Config import * -setOption("DistRegex", '\.(fc|rhe?l)\d+(?=\.|$)') +setOption("DistRegex", '\.(fc|rhe?l|el)\d+(?=\.|$)') setOption("UseVersionInChangeLog", 1) setOption("UseBzip2", 0) setOption("UseDefaultRunlevels", 0) Index: rpmlint.spec =================================================================== RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- rpmlint.spec 15 Oct 2006 08:22:26 -0000 1.27 +++ rpmlint.spec 2 Feb 2007 15:51:58 -0000 1.28 @@ -1,6 +1,6 @@ Name: rpmlint -Version: 0.78 -Release: 2%{?dist} +Version: 0.79 +Release: 1%{?dist} Summary: Tool for checking common errors in RPM packages Group: Development/Tools @@ -10,7 +10,6 @@ Source1: %{name}.config Patch0: %{name}-0.78-distregex.patch Patch1: %{name}-0.77-compile.patch -Patch2: %{name}-0.78-svn-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -32,7 +31,6 @@ %setup -q %patch0 %patch1 -%patch2 sed -i -e /MenuCheck/d Config.py @@ -67,6 +65,11 @@ %changelog +* Fri Feb 2 2007 Ville Skytt?? - 0.79-1 +- 0.79, fixes #211417, #212491, #214605, #218250, #219068, #220061, #221116, + #222585, and #226879. +- Accept *.elX disttags in default config. + * Sun Oct 15 2006 Ville Skytt?? - 0.78-2 - Accumulated bugfixes since 0.78: #209876, #209889, #210110, 210261. - Filter messages about gpg-pubkeys for now. Index: sources =================================================================== RCS file: /cvs/extras/rpms/rpmlint/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 23 Sep 2006 21:37:35 -0000 1.14 +++ sources 2 Feb 2007 15:51:58 -0000 1.15 @@ -1 +1 @@ -73fd414976c4654c3007a55a762c7eed rpmlint-0.78.tar.bz2 +50ebdf88ede4b1265e9a69b20e356f44 rpmlint-0.79.tar.bz2 --- rpmlint-0.78-svn-fixes.patch DELETED --- From fedora-extras-commits at redhat.com Fri Feb 2 15:55:00 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 2 Feb 2007 10:55:00 -0500 Subject: rpms/kazehakase/devel Makefile,NONE,1.1 Message-ID: <200702021555.l12Ft0o6008724@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/kazehakase/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8717 Added Files: Makefile Log Message: firstly add Makefile ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' From fedora-extras-commits at redhat.com Fri Feb 2 15:56:54 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 2 Feb 2007 10:56:54 -0500 Subject: rpms/kazehakase/devel .cvsignore, NONE, 1.1 kazehakase.spec, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702021556.l12FusBg008794@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/kazehakase/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8787 Added Files: .cvsignore kazehakase.spec sources Log Message: * Fri Feb 2 2007 Mamoru Tasaka - 0.4.4.1-1 - 0.4.4.1 --- NEW FILE .cvsignore --- kazehakase-0.4.4.1.tar.gz --- NEW FILE kazehakase.spec --- # FC5 has other dependency. # For now this spec file is for FC7/6. %if 0%{?fedora} == 7 %define FFver 2.0.0.1 %endif %if 0%{?fedora} == 6 %define FFver 1.5.0.9 %endif Name: kazehakase Version: 0.4.4.1 Release: 1%{?dist} Summary: Kazehakase browser Group: Applications/Internet License: GPL URL: http://kazehakase.sourceforge.jp/ Source0: http://osdn.dl.sourceforge.jp/kazehakase/23789/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: anthy-devel BuildRequires: expat-devel BuildRequires: firefox-devel %{?FFver:= %{FFver}} BuildRequires: gnutls-devel BuildRequires: gtk2-devel BuildRequires: libSM-devel BuildRequires: desktop-file-utils BuildRequires: gettext Requires: firefox %{?FFver:= %{FFver}} %description Kazehakase is a Web browser which aims to provide a user interface that is truly user-friendly & fully customizable. %prep %setup -q # -Werror causes configure option detection failure. %{__sed} -i -e '/^CPPFLAGS/s|-Werror||' configure %build %configure --with-gecko-engine=firefox # Removing -Werror ignores signedness difference echo "#undef MOZ_NSIHELPERAPPLAUNCHERDIALOG_NSPRBOOL_" >> config.h %{__make} %{?_smp_mflags} %install %{__rm} -rf $RPM_BUILD_ROOT %{__make} install DESTDIR=$RPM_BUILD_ROOT \ INSTALL="%{__install} -c -p" %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib*.{so,la} desktop-file-install \ --vendor fedora \ --remove-category Application \ --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop %{find_lang} %{name} for f in README.ja TODO.ja ; do iconv -f EUCJP -t UTF8 $f > ${f}.tmp && \ %{__mv} -f ${f}.tmp ${f} || \ %{__rm} -f ${f}.tmp done %clean %{__rm} -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING* README* TODO* %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/mozilla %config(noreplace) %{_sysconfdir}/%{name}/*.xml %config(noreplace) %{_sysconfdir}/%{name}/*rc %config(noreplace) %{_sysconfdir}/%{name}/mozilla/*.xml %{_bindir}/%{name} %{_libdir}/%{name}/ %{_datadir}/%{name}/ %{_datadir}/pixmaps/%{name}*.png %{_datadir}/applications/fedora-%{name}.desktop %{_mandir}/man1/%{name}.1* %changelog * Fri Feb 2 2007 Mamoru Tasaka - 0.4.4.1-1 - 0.4.4.1 * Fri Feb 2 2007 Mamoru Tasaka - 0.4.4-2 - Add more BuildRequires: anthy-devel, libSM-devel * Tue Jan 30 2007 Mamoru Tasaka - 0.4.4-1 - 0.4.4 * Thu Jan 18 2007 Mamoru Tasaka - 0.4.3-4 - Do not call autoconf, just fix configure. * Sat Dec 23 2006 Mamoru Tasaka - 0.4.3-3 - Add firefox version dependency for gecko engine * Wed Dec 13 2006 Mamoru Tasaka - 0.4.3-2 - Own %%{_libdir}/%%{name} correctly * Tue Dec 12 2006 Mamoru Tasaka - 0.4.3-1 - Initial packaging to import to Fedora Extras. --- NEW FILE sources --- 16eacff48f758bcdb3719679a1af597c kazehakase-0.4.4.1.tar.gz From fedora-extras-commits at redhat.com Fri Feb 2 15:58:54 2007 From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun)) Date: Fri, 2 Feb 2007 10:58:54 -0500 Subject: rpms/amsn/devel amsn.spec,1.7,1.8 Message-ID: <200702021558.l12FwsnA008855@cvs-int.fedora.redhat.com> Author: tjikkun Update of /cvs/extras/rpms/amsn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8831 Modified Files: amsn.spec Log Message: updated requires to tcl/tk 8.5 Index: amsn.spec =================================================================== RCS file: /cvs/extras/rpms/amsn/devel/amsn.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- amsn.spec 2 Feb 2007 15:22:09 -0000 1.7 +++ amsn.spec 2 Feb 2007 15:58:22 -0000 1.8 @@ -1,6 +1,6 @@ Name: amsn Version: 0.96 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MSN Messenger clone for Linux, Mac and Windows Group: Applications/Internet @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, desktop-file-utils, tk-devel, which, libpng-devel, libjpeg-devel -Requires: tcltls, tclsoap, tcllib, bwidget, tk >= 8.4.13, tkdnd, htmlview, sox +Requires: tcltls, tclsoap, tcllib, bwidget, tk >= 8.5, tkdnd, htmlview, sox Patch1: amsn-0.96-system-bwidget.patch %description @@ -121,7 +121,11 @@ %changelog -* Thu Sep 4 2006 Sander Hoentjen - 0.96-3 +* Fri Feb 2 2006 Sander Hoentjen - 0.96-4 +- updated requires to tcl/tk 8.5 since it will segfault with 8.4 if it is built against 8.5 and vice versa +- fixed previous changelog entry date + +* Fri Feb 2 2006 Sander Hoentjen - 0.96-3 - rebuilt against tcl/tk 8.5 * Thu Sep 4 2006 Sander Hoentjen - 0.96-2 From fedora-extras-commits at redhat.com Fri Feb 2 16:00:46 2007 From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun)) Date: Fri, 2 Feb 2007 11:00:46 -0500 Subject: rpms/amsn/devel amsn.spec,1.8,1.9 Message-ID: <200702021600.l12G0kHE008967@cvs-int.fedora.redhat.com> Author: tjikkun Update of /cvs/extras/rpms/amsn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8923 Modified Files: amsn.spec Log Message: 2007 already? Index: amsn.spec =================================================================== RCS file: /cvs/extras/rpms/amsn/devel/amsn.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- amsn.spec 2 Feb 2007 15:58:22 -0000 1.8 +++ amsn.spec 2 Feb 2007 16:00:14 -0000 1.9 @@ -121,11 +121,11 @@ %changelog -* Fri Feb 2 2006 Sander Hoentjen - 0.96-4 +* Fri Feb 2 2007 Sander Hoentjen - 0.96-4 - updated requires to tcl/tk 8.5 since it will segfault with 8.4 if it is built against 8.5 and vice versa - fixed previous changelog entry date -* Fri Feb 2 2006 Sander Hoentjen - 0.96-3 +* Fri Feb 2 2007 Sander Hoentjen - 0.96-3 - rebuilt against tcl/tk 8.5 * Thu Sep 4 2006 Sander Hoentjen - 0.96-2 From fedora-extras-commits at redhat.com Fri Feb 2 16:00:52 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 2 Feb 2007 11:00:52 -0500 Subject: rpms/kazehakase/devel Makefile,1.1,1.2 Message-ID: <200702021600.l12G0qxs008972@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/kazehakase/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8948 Modified Files: Makefile Log Message: fix Makefile Index: Makefile =================================================================== RCS file: /cvs/extras/rpms/kazehakase/devel/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile 2 Feb 2007 15:54:57 -0000 1.1 +++ Makefile 2 Feb 2007 16:00:20 -0000 1.2 @@ -1,6 +1,6 @@ -# Makefile for source rpm: comix +# Makefile for source rpm: kazehakase # $Id$ -NAME := comix +NAME := kazehakase SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common From fedora-extras-commits at redhat.com Fri Feb 2 16:03:22 2007 From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun)) Date: Fri, 2 Feb 2007 11:03:22 -0500 Subject: rpms/amsn/devel amsn.spec,1.9,1.10 Message-ID: <200702021603.l12G3M2d012399@cvs-int.fedora.redhat.com> Author: tjikkun Update of /cvs/extras/rpms/amsn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12349 Modified Files: amsn.spec Log Message: bump because i messed up tagging Index: amsn.spec =================================================================== RCS file: /cvs/extras/rpms/amsn/devel/amsn.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- amsn.spec 2 Feb 2007 16:00:14 -0000 1.9 +++ amsn.spec 2 Feb 2007 16:02:50 -0000 1.10 @@ -1,6 +1,6 @@ Name: amsn Version: 0.96 -Release: 4%{?dist} +Release: 5%{?dist} Summary: MSN Messenger clone for Linux, Mac and Windows Group: Applications/Internet @@ -121,6 +121,9 @@ %changelog +* Fri Feb 2 2007 Sander Hoentjen - 0.96-5 +- Bump because i messed up tagging + * Fri Feb 2 2007 Sander Hoentjen - 0.96-4 - updated requires to tcl/tk 8.5 since it will segfault with 8.4 if it is built against 8.5 and vice versa - fixed previous changelog entry date From fedora-extras-commits at redhat.com Fri Feb 2 16:14:50 2007 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 2 Feb 2007 11:14:50 -0500 Subject: fedora-security/audit fe5,1.149,1.150 fe6,1.63,1.64 Message-ID: <200702021614.l12GEowb012807@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12788 Modified Files: fe5 fe6 Log Message: +CVE-2007-0657 ignore (nexuiz, 2.2.2 only (not shipped), fixed 2.2.3) Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.149 retrieving revision 1.150 diff -u -r1.149 -r1.150 --- fe5 1 Feb 2007 16:51:21 -0000 1.149 +++ fe5 2 Feb 2007 16:14:48 -0000 1.150 @@ -2,6 +2,7 @@ ** are items that need attention +CVE-2007-0657 ignore (nexuiz, 2.2.2 only (not shipped), fixed 2.2.3) CVE-2007-0619 version (chmlib, fixed 0.3.9) #225919 CVE-2007-0541 version (wordpress, fixed 2.1-0) #225469 CVE-2007-0540 version (wordpress, fixed 2.1-0) #225469 Index: fe6 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe6,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- fe6 1 Feb 2007 16:51:21 -0000 1.63 +++ fe6 2 Feb 2007 16:14:48 -0000 1.64 @@ -2,6 +2,7 @@ ** are items that need attention +CVE-2007-0657 ignore (nexuiz, 2.2.2 only (not shipped), fixed 2.2.3) CVE-2007-0619 version (chmlib, fixed 0.3.9) #225919 CVE-2007-0541 version (wordpress, fixed 2.1-0) #225469 CVE-2007-0540 version (wordpress, fixed 2.1-0) #225469 From fedora-extras-commits at redhat.com Fri Feb 2 16:17:26 2007 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Fri, 2 Feb 2007 11:17:26 -0500 Subject: rpms/exaile/devel exaile.spec,1.3,1.4 Message-ID: <200702021617.l12GHQer012895@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/exaile/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12855 Modified Files: exaile.spec Log Message: Bump release Index: exaile.spec =================================================================== RCS file: /cvs/extras/rpms/exaile/devel/exaile.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- exaile.spec 28 Jan 2007 22:51:51 -0000 1.3 +++ exaile.spec 2 Feb 2007 16:16:53 -0000 1.4 @@ -1,7 +1,7 @@ Summary: A music player Name: exaile Version: 0.2.8 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Multimedia License: GPL URL: http://www.exaile.org @@ -80,7 +80,7 @@ %{_datadir}/exaile/ %changelog -* Sun Jan 28 2007 Deji Akingunola - 0.2.8-1 +* Sun Jan 28 2007 Deji Akingunola - 0.2.8-2 - Fixes for empty debuginfo by Ville Skytt?? (Bug #225093) * Tue Jan 09 2007 Deji Akingunola - 0.2.8-1 From fedora-extras-commits at redhat.com Fri Feb 2 16:19:14 2007 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Fri, 2 Feb 2007 11:19:14 -0500 Subject: rpms/exaile/FC-6 exaile.spec,1.3,1.4 Message-ID: <200702021619.l12GJE07013008@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/exaile/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12973 Modified Files: exaile.spec Log Message: Bump release Index: exaile.spec =================================================================== RCS file: /cvs/extras/rpms/exaile/FC-6/exaile.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- exaile.spec 28 Jan 2007 22:53:37 -0000 1.3 +++ exaile.spec 2 Feb 2007 16:18:42 -0000 1.4 @@ -1,7 +1,7 @@ Summary: A music player Name: exaile Version: 0.2.8 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Multimedia License: GPL URL: http://www.exaile.org @@ -80,7 +80,7 @@ %{_datadir}/exaile/ %changelog -* Sun Jan 28 2007 Deji Akingunola - 0.2.8-1 +* Sun Jan 28 2007 Deji Akingunola - 0.2.8-2 - Fixes for empty debuginfo by Ville Skytt?? (Bug #225093) * Tue Jan 09 2007 Deji Akingunola - 0.2.8-1 From fedora-extras-commits at redhat.com Fri Feb 2 16:36:35 2007 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Fri, 2 Feb 2007 11:36:35 -0500 Subject: rpms/hping3/devel hping3.spec,1.4,1.5 Message-ID: <200702021636.l12GaZAB013309@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/hping3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13291 Modified Files: hping3.spec Log Message: * Fri Feb 2 2007 Paul Wouters 0.0.20051105-6 - Rebuild for new tcl 8.5 dependancy Index: hping3.spec =================================================================== RCS file: /cvs/extras/rpms/hping3/devel/hping3.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- hping3.spec 29 Nov 2006 21:47:42 -0000 1.4 +++ hping3.spec 2 Feb 2007 16:36:03 -0000 1.5 @@ -1,7 +1,7 @@ %define cvs 20051105 Name: hping3 Version: 0.0.%{cvs} -Release: 5%{?dist} +Release: 6%{?dist} Summary: TCP/IP stack auditing and much more Group: Applications/Internet @@ -59,8 +59,11 @@ %{_mandir}/man8/* %changelog +* Fri Feb 2 2007 Paul Wouters 0.0.20051105-6 +- Rebuild for new tcl 8.5 dependancy + * Wed Nov 29 2006 Paul Wouters 0.0.20051105-5 -* Rebuild for new libpcap dependancy +- Rebuild for new libpcap dependancy * Thu Sep 7 2006 Paul Wouters 0.0.20051105-4 - Rebuild requested for PT_GNU_HASH support from gcc From fedora-extras-commits at redhat.com Fri Feb 2 17:11:44 2007 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Fri, 2 Feb 2007 12:11:44 -0500 Subject: comps comps-fe6.xml.in,1.289,1.290 comps-fe7.xml.in,1.97,1.98 Message-ID: <200702021711.l12HBiZF016817@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16779 Modified Files: comps-fe6.xml.in comps-fe7.xml.in Log Message: Add entries for tracker-search-tool and scigraphica Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.289 retrieving revision 1.290 diff -u -r1.289 -r1.290 --- comps-fe6.xml.in 29 Jan 2007 03:58:03 -0000 1.289 +++ comps-fe6.xml.in 2 Feb 2007 17:11:14 -0000 1.290 @@ -342,6 +342,7 @@ R rrdtool scalapack + scigraphica scrip sextractor SIBsim4 @@ -527,6 +528,7 @@ sabayon seahorse themes-backgrounds-gnome + tracker-search-tool verbiste-gnome wallpapoz wp_tray Index: comps-fe7.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe7.xml.in,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- comps-fe7.xml.in 1 Feb 2007 09:37:58 -0000 1.97 +++ comps-fe7.xml.in 2 Feb 2007 17:11:14 -0000 1.98 @@ -342,6 +342,7 @@ R rrdtool scalapack + scigraphica scrip sextractor SIBsim4 @@ -529,6 +530,7 @@ sabayon seahorse themes-backgrounds-gnome + tracker-search-tool verbiste-gnome wallpapoz wp_tray From fedora-extras-commits at redhat.com Fri Feb 2 17:14:17 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 2 Feb 2007 12:14:17 -0500 Subject: rpms/xtide/devel .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 xtide.spec, 1.20, 1.21 Message-ID: <200702021714.l12HEHIK016931@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xtide/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16874 Modified Files: .cvsignore sources xtide.spec Log Message: * Fri Feb 2 2007 Mamoru Tasaka - 2.9-0.3.RC1 - 2.9 RC1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xtide/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 22 Jan 2007 15:40:31 -0000 1.13 +++ .cvsignore 2 Feb 2007 17:13:45 -0000 1.14 @@ -1 +1 @@ -xtide-2.9dev-20070120.tar.bz2 +xtide-2.9-RC1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xtide/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 22 Jan 2007 15:40:31 -0000 1.13 +++ sources 2 Feb 2007 17:13:45 -0000 1.14 @@ -1 +1 @@ -e8be4da642b36c853d37e98f2c8a7d53 xtide-2.9dev-20070120.tar.bz2 +614c2883316381b576dc092e6a8b3615 xtide-2.9-RC1.tar.bz2 Index: xtide.spec =================================================================== RCS file: /cvs/extras/rpms/xtide/devel/xtide.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- xtide.spec 22 Jan 2007 15:40:31 -0000 1.20 +++ xtide.spec 2 Feb 2007 17:13:45 -0000 1.21 @@ -1,12 +1,12 @@ -%define src_date 20070120 +%define betatag RC1 Summary: Calculate tide all over the world Name: xtide Version: 2.9 -Release: 0.2.date%{src_date}%{?dist} +Release: 0.3.%{betatag}%{?dist} URL: http://www.flaterco.com/xtide/ -Source0: ftp://ftp.flaterco.com/xtide/%{name}-%{version}dev-%{src_date}.tar.bz2 +Source0: ftp://ftp.flaterco.com/xtide/%{name}-%{version}-%{betatag}.tar.bz2 Source14: xtide-get_harmonics-data.sh Source20: %{name}.desktop @@ -83,7 +83,7 @@ Please read README.fedora for Fedora specific issue. %prep -%setup -q -n %{name}-2.9dev +%setup -q -n %{name}-2.9-%{betatag} %build %configure \ @@ -220,6 +220,9 @@ %{_datadir}/man/man8/xttpd.8* %changelog +* Fri Feb 2 2007 Mamoru Tasaka - 2.9-0.3.RC1 +- 2.9 RC1 + * Mon Jan 22 2007 Mamoru Tasaka - 2.9-0.2.date20070120 - 2.9 dev 20070120 From fedora-extras-commits at redhat.com Fri Feb 2 17:14:42 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 2 Feb 2007 12:14:42 -0500 Subject: rpms/xtide/FC-6 .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 xtide.spec, 1.20, 1.21 Message-ID: <200702021714.l12HEgDD016996@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xtide/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16904 Modified Files: .cvsignore sources xtide.spec Log Message: * Fri Feb 2 2007 Mamoru Tasaka - 2.9-0.3.RC1 - 2.9 RC1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xtide/FC-6/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 22 Jan 2007 15:40:39 -0000 1.13 +++ .cvsignore 2 Feb 2007 17:14:09 -0000 1.14 @@ -1 +1 @@ -xtide-2.9dev-20070120.tar.bz2 +xtide-2.9-RC1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xtide/FC-6/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 22 Jan 2007 15:40:39 -0000 1.13 +++ sources 2 Feb 2007 17:14:09 -0000 1.14 @@ -1 +1 @@ -e8be4da642b36c853d37e98f2c8a7d53 xtide-2.9dev-20070120.tar.bz2 +614c2883316381b576dc092e6a8b3615 xtide-2.9-RC1.tar.bz2 Index: xtide.spec =================================================================== RCS file: /cvs/extras/rpms/xtide/FC-6/xtide.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- xtide.spec 22 Jan 2007 15:40:39 -0000 1.20 +++ xtide.spec 2 Feb 2007 17:14:09 -0000 1.21 @@ -1,12 +1,12 @@ -%define src_date 20070120 +%define betatag RC1 Summary: Calculate tide all over the world Name: xtide Version: 2.9 -Release: 0.2.date%{src_date}%{?dist} +Release: 0.3.%{betatag}%{?dist} URL: http://www.flaterco.com/xtide/ -Source0: ftp://ftp.flaterco.com/xtide/%{name}-%{version}dev-%{src_date}.tar.bz2 +Source0: ftp://ftp.flaterco.com/xtide/%{name}-%{version}-%{betatag}.tar.bz2 Source14: xtide-get_harmonics-data.sh Source20: %{name}.desktop @@ -83,7 +83,7 @@ Please read README.fedora for Fedora specific issue. %prep -%setup -q -n %{name}-2.9dev +%setup -q -n %{name}-2.9-%{betatag} %build %configure \ @@ -220,6 +220,9 @@ %{_datadir}/man/man8/xttpd.8* %changelog +* Fri Feb 2 2007 Mamoru Tasaka - 2.9-0.3.RC1 +- 2.9 RC1 + * Mon Jan 22 2007 Mamoru Tasaka - 2.9-0.2.date20070120 - 2.9 dev 20070120 From fedora-extras-commits at redhat.com Fri Feb 2 17:15:09 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 2 Feb 2007 12:15:09 -0500 Subject: rpms/xtide/FC-5 .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 xtide.spec, 1.21, 1.22 Message-ID: <200702021715.l12HF9D8017041@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xtide/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16972 Modified Files: .cvsignore sources xtide.spec Log Message: * Fri Feb 2 2007 Mamoru Tasaka - 2.9-0.3.RC1 - 2.9 RC1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xtide/FC-5/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 22 Jan 2007 15:40:46 -0000 1.13 +++ .cvsignore 2 Feb 2007 17:14:36 -0000 1.14 @@ -1 +1 @@ -xtide-2.9dev-20070120.tar.bz2 +xtide-2.9-RC1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xtide/FC-5/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 22 Jan 2007 15:40:46 -0000 1.13 +++ sources 2 Feb 2007 17:14:36 -0000 1.14 @@ -1 +1 @@ -e8be4da642b36c853d37e98f2c8a7d53 xtide-2.9dev-20070120.tar.bz2 +614c2883316381b576dc092e6a8b3615 xtide-2.9-RC1.tar.bz2 Index: xtide.spec =================================================================== RCS file: /cvs/extras/rpms/xtide/FC-5/xtide.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- xtide.spec 22 Jan 2007 15:40:46 -0000 1.21 +++ xtide.spec 2 Feb 2007 17:14:36 -0000 1.22 @@ -1,12 +1,12 @@ -%define src_date 20070120 +%define betatag RC1 Summary: Calculate tide all over the world Name: xtide Version: 2.9 -Release: 0.2.date%{src_date}%{?dist} +Release: 0.3.%{betatag}%{?dist} URL: http://www.flaterco.com/xtide/ -Source0: ftp://ftp.flaterco.com/xtide/%{name}-%{version}dev-%{src_date}.tar.bz2 +Source0: ftp://ftp.flaterco.com/xtide/%{name}-%{version}-%{betatag}.tar.bz2 Source14: xtide-get_harmonics-data.sh Source20: %{name}.desktop @@ -83,7 +83,7 @@ Please read README.fedora for Fedora specific issue. %prep -%setup -q -n %{name}-2.9dev +%setup -q -n %{name}-2.9-%{betatag} %build %configure \ @@ -220,6 +220,9 @@ %{_datadir}/man/man8/xttpd.8* %changelog +* Fri Feb 2 2007 Mamoru Tasaka - 2.9-0.3.RC1 +- 2.9 RC1 + * Mon Jan 22 2007 Mamoru Tasaka - 2.9-0.2.date20070120 - 2.9 dev 20070120 From fedora-extras-commits at redhat.com Fri Feb 2 17:21:48 2007 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 2 Feb 2007 12:21:48 -0500 Subject: rpms/mhash/devel mhash-0.9.7.1-haval-be.patch, NONE, 1.1 mhash.spec, 1.17, 1.18 mhash-0.9.7.1-be-test.patch, 1.1, NONE Message-ID: <200702021721.l12HLmD2017162@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/mhash/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17142 Modified Files: mhash.spec Added Files: mhash-0.9.7.1-haval-be.patch Removed Files: mhash-0.9.7.1-be-test.patch Log Message: * Fri Feb 2 2007 Michael Schwendt - 0.9.7.1-4 - Fix big-endian memory leaks in haval.c - Patch is sufficient to pass test-suite on ppc. Fixes #226987. mhash-0.9.7.1-haval-be.patch: --- NEW FILE mhash-0.9.7.1-haval-be.patch --- diff -Nur mhash-0.9.7.1-orig/lib/haval.c mhash-0.9.7.1/lib/haval.c --- mhash-0.9.7.1-orig/lib/haval.c 2006-06-24 08:07:56.000000000 +0200 +++ mhash-0.9.7.1/lib/haval.c 2007-02-02 18:25:17.000000000 +0100 @@ -235,6 +235,9 @@ E[1] += T[1] = ROTR (F3 (T[0], T[3], T[4], T[5], T[6], T[7], T[2]), 7) + ROTR (T[1], 11) + W[ 5] + 0xAFD6BA33UL; E[0] += T[0] = ROTR (F3 (T[7], T[2], T[3], T[4], T[5], T[6], T[1]), 7) + ROTR (T[0], 11) + W[ 2] + 0x6C24CF5CUL; +#if defined(WORDS_BIGENDIAN) + mutils_free(W); +#endif } /* havalTransform3 */ @@ -400,6 +403,9 @@ E[1] += T[1] = ROTR (F4 (T[0], T[6], T[2], T[7], T[4], T[3], T[5]), 7) + ROTR (T[1], 11) + W[16] + 0x6EEF0B6CUL; E[0] += T[0] = ROTR (F4 (T[7], T[5], T[1], T[6], T[3], T[2], T[4]), 7) + ROTR (T[0], 11) + W[13] + 0x137A3BE4UL; +#if defined(WORDS_BIGENDIAN) + mutils_free(W); +#endif } /* havalTransform4 */ @@ -603,6 +609,9 @@ E[1] += T[1] = ROTR (F5 (T[4], T[7], T[2], T[0], T[6], T[5], T[3]), 7) + ROTR (T[1], 11) + W[25] + 0xC1A94FB6UL; E[0] += T[0] = ROTR (F5 (T[3], T[6], T[1], T[7], T[5], T[4], T[2]), 7) + ROTR (T[0], 11) + W[15] + 0x409F60C4UL; +#if defined(WORDS_BIGENDIAN) + mutils_free(W); +#endif } /* havalTransform5 */ mutils_error havalInit256( havalContext *hcp) { @@ -831,10 +840,9 @@ ) >> 8) | ( (hcp->digest[7] & 0x000000FFUL) << 24); #if defined(WORDS_BIGENDIAN) - digest = mutils_word32nswap((mutils_word32 *) (hcp->digest), 128/32, MUTILS_FALSE); -#else - mutils_memcpy(digest, hcp->digest, 128/8); + mutils_word32nswap((mutils_word32 *) (hcp->digest), 128/32, MUTILS_TRUE); #endif + mutils_memcpy(digest, hcp->digest, 128/8); break; case 160: hcp->digest[4] += @@ -851,10 +859,9 @@ ((hcp->digest[7] & 0x0000003FUL) | (hcp->digest[6] & 0xFE000000UL) | (hcp->digest[5] & 0x01F80000UL), 19); #if defined(WORDS_BIGENDIAN) - digest = mutils_word32nswap((mutils_word32 *) (hcp->digest), 160/32, MUTILS_FALSE); -#else - mutils_memcpy (digest, hcp->digest, 160/8); + mutils_word32nswap((mutils_word32 *) (hcp->digest), 160/32, MUTILS_TRUE); #endif + mutils_memcpy (digest, hcp->digest, 160/8); break; case 192: @@ -873,10 +880,9 @@ ((hcp->digest[7] & 0x0000001FUL) | (hcp->digest[6] & 0xFC000000UL), 26); #if defined(WORDS_BIGENDIAN) - digest = mutils_word32nswap((mutils_word32 *) (hcp->digest), 192/32, MUTILS_FALSE); -#else - mutils_memcpy (digest, hcp->digest, 192/8); + mutils_word32nswap((mutils_word32 *) (hcp->digest), 192/32, MUTILS_TRUE); #endif + mutils_memcpy (digest, hcp->digest, 192/8); break; case 224: @@ -889,19 +895,17 @@ hcp->digest[0] += (hcp->digest[7] >> 27) & 0x0000001FUL; #if defined(WORDS_BIGENDIAN) - digest = mutils_word32nswap((mutils_word32 *) (hcp->digest), 224/32, MUTILS_FALSE); -#else - mutils_memcpy (digest, hcp->digest, 224/8); + mutils_word32nswap((mutils_word32 *) (hcp->digest), 224/32, MUTILS_TRUE); #endif + mutils_memcpy (digest, hcp->digest, 224/8); break; case 256: #if defined(WORDS_BIGENDIAN) - digest = mutils_word32nswap((mutils_word32 *) (hcp->digest), 256/32, MUTILS_FALSE); -#else - mutils_memcpy (digest, hcp->digest, 256/8); + mutils_word32nswap((mutils_word32 *) (hcp->digest), 256/32, MUTILS_TRUE); #endif + mutils_memcpy (digest, hcp->digest, 256/8); break; } Index: mhash.spec =================================================================== RCS file: /cvs/extras/rpms/mhash/devel/mhash.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- mhash.spec 2 Feb 2007 15:37:21 -0000 1.17 +++ mhash.spec 2 Feb 2007 17:21:16 -0000 1.18 @@ -1,12 +1,12 @@ Summary: Thread-safe hash algorithms library Name: mhash Version: 0.9.7.1 -Release: 3 +Release: 4 URL: http://mhash.sourceforge.net/ License: LGPL Group: System Environment/Libraries Source: http://download.sourceforge.net/mhash/mhash-%{version}.tar.bz2 -Patch0: mhash-0.9.7.1-be-test.patch +Patch0: mhash-0.9.7.1-haval-be.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) Provides: libmhash = %{version}-%{release} @@ -86,7 +86,8 @@ %changelog -* Fri Feb 2 2007 Michael Schwendt - 0.9.7.1-3 +* Fri Feb 2 2007 Michael Schwendt - 0.9.7.1-4 +- Fix big-endian memory leaks in haval.c - Patch is sufficient to pass test-suite on ppc. Fixes #226987. * Fri Feb 2 2007 Michael Schwendt - 0.9.7.1-2 --- mhash-0.9.7.1-be-test.patch DELETED --- From fedora-extras-commits at redhat.com Fri Feb 2 17:28:54 2007 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 2 Feb 2007 12:28:54 -0500 Subject: rpms/mhash/devel mhash-0.9.7.1-haval-be.patch,1.1,1.2 Message-ID: <200702021728.l12HSs1X017281@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/mhash/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17261 Modified Files: mhash-0.9.7.1-haval-be.patch Log Message: mhash-0.9.7.1-haval-be.patch: Index: mhash-0.9.7.1-haval-be.patch =================================================================== RCS file: /cvs/extras/rpms/mhash/devel/mhash-0.9.7.1-haval-be.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mhash-0.9.7.1-haval-be.patch 2 Feb 2007 17:21:16 -0000 1.1 +++ mhash-0.9.7.1-haval-be.patch 2 Feb 2007 17:28:21 -0000 1.2 @@ -1,12 +1,12 @@ diff -Nur mhash-0.9.7.1-orig/lib/haval.c mhash-0.9.7.1/lib/haval.c --- mhash-0.9.7.1-orig/lib/haval.c 2006-06-24 08:07:56.000000000 +0200 -+++ mhash-0.9.7.1/lib/haval.c 2007-02-02 18:25:17.000000000 +0100 ++++ mhash-0.9.7.1/lib/haval.c 2007-02-02 18:32:45.000000000 +0100 @@ -235,6 +235,9 @@ E[1] += T[1] = ROTR (F3 (T[0], T[3], T[4], T[5], T[6], T[7], T[2]), 7) + ROTR (T[1], 11) + W[ 5] + 0xAFD6BA33UL; E[0] += T[0] = ROTR (F3 (T[7], T[2], T[3], T[4], T[5], T[6], T[1]), 7) + ROTR (T[0], 11) + W[ 2] + 0x6C24CF5CUL; +#if defined(WORDS_BIGENDIAN) -+ mutils_free(W); ++ mhash_free(W); +#endif } /* havalTransform3 */ @@ -16,7 +16,7 @@ E[0] += T[0] = ROTR (F4 (T[7], T[5], T[1], T[6], T[3], T[2], T[4]), 7) + ROTR (T[0], 11) + W[13] + 0x137A3BE4UL; +#if defined(WORDS_BIGENDIAN) -+ mutils_free(W); ++ mhash_free(W); +#endif } /* havalTransform4 */ @@ -26,7 +26,7 @@ E[0] += T[0] = ROTR (F5 (T[3], T[6], T[1], T[7], T[5], T[4], T[2]), 7) + ROTR (T[0], 11) + W[15] + 0x409F60C4UL; +#if defined(WORDS_BIGENDIAN) -+ mutils_free(W); ++ mhash_free(W); +#endif } /* havalTransform5 */ From fedora-extras-commits at redhat.com Fri Feb 2 17:31:01 2007 From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris)) Date: Fri, 2 Feb 2007 12:31:01 -0500 Subject: status-report-scripts getReviewByFlags,NONE,1.1 Message-ID: <200702021731.l12HV1Ln017361@cvs-int.fedora.redhat.com> Author: c4chris Update of /cvs/fedora/status-report-scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17345 Added Files: getReviewByFlags Log Message: Add getReviewByFlags. ***** Error reading new file: [Errno 2] No such file or directory: 'getReviewByFlags' From fedora-extras-commits at redhat.com Fri Feb 2 17:37:19 2007 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 2 Feb 2007 12:37:19 -0500 Subject: rpms/mhash/devel mhash-0.9.7.1-haval-be.patch,1.2,1.3 Message-ID: <200702021737.l12HbJ6A017426@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/mhash/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17400 Modified Files: mhash-0.9.7.1-haval-be.patch Log Message: mhash-0.9.7.1-haval-be.patch: Index: mhash-0.9.7.1-haval-be.patch =================================================================== RCS file: /cvs/extras/rpms/mhash/devel/mhash-0.9.7.1-haval-be.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mhash-0.9.7.1-haval-be.patch 2 Feb 2007 17:28:21 -0000 1.2 +++ mhash-0.9.7.1-haval-be.patch 2 Feb 2007 17:36:46 -0000 1.3 @@ -1,12 +1,12 @@ diff -Nur mhash-0.9.7.1-orig/lib/haval.c mhash-0.9.7.1/lib/haval.c --- mhash-0.9.7.1-orig/lib/haval.c 2006-06-24 08:07:56.000000000 +0200 -+++ mhash-0.9.7.1/lib/haval.c 2007-02-02 18:32:45.000000000 +0100 ++++ mhash-0.9.7.1/lib/haval.c 2007-02-02 18:44:11.000000000 +0100 @@ -235,6 +235,9 @@ E[1] += T[1] = ROTR (F3 (T[0], T[3], T[4], T[5], T[6], T[7], T[2]), 7) + ROTR (T[1], 11) + W[ 5] + 0xAFD6BA33UL; E[0] += T[0] = ROTR (F3 (T[7], T[2], T[3], T[4], T[5], T[6], T[1]), 7) + ROTR (T[0], 11) + W[ 2] + 0x6C24CF5CUL; +#if defined(WORDS_BIGENDIAN) -+ mhash_free(W); ++ mutils_free(W); +#endif } /* havalTransform3 */ @@ -16,7 +16,7 @@ E[0] += T[0] = ROTR (F4 (T[7], T[5], T[1], T[6], T[3], T[2], T[4]), 7) + ROTR (T[0], 11) + W[13] + 0x137A3BE4UL; +#if defined(WORDS_BIGENDIAN) -+ mhash_free(W); ++ mutils_free(W); +#endif } /* havalTransform4 */ @@ -26,7 +26,7 @@ E[0] += T[0] = ROTR (F5 (T[3], T[6], T[1], T[7], T[5], T[4], T[2]), 7) + ROTR (T[0], 11) + W[15] + 0x409F60C4UL; +#if defined(WORDS_BIGENDIAN) -+ mhash_free(W); ++ mutils_free(W); +#endif } /* havalTransform5 */ From fedora-extras-commits at redhat.com Fri Feb 2 18:02:58 2007 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 2 Feb 2007 13:02:58 -0500 Subject: rpms/xine-lib/FC-6 xine-lib-1.1.4-optflags.patch, NONE, 1.1 xine-lib-mk-autotools-patch.sh, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xine-lib.spec, 1.3, 1.4 xine-lib-1.1.3-flac113.patch, 1.1, NONE xine-lib-1.1.3-optflags.patch, 1.1, NONE Message-ID: <200702021802.l12I2w44023577@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xine-lib/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23547 Modified Files: .cvsignore sources xine-lib.spec Added Files: xine-lib-1.1.4-optflags.patch xine-lib-mk-autotools-patch.sh Removed Files: xine-lib-1.1.3-flac113.patch xine-lib-1.1.3-optflags.patch Log Message: * Wed Jan 31 2007 Ville Skytt?? - 1.1.4-1 - 1.1.4, with wavpack and system libmpcdec support. xine-lib-1.1.4-optflags.patch: --- NEW FILE xine-lib-1.1.4-optflags.patch --- --- xine-lib-1.1.4/m4/optimizations.m4~ 2006-06-17 18:20:56.000000000 +0300 +++ xine-lib-1.1.4/m4/optimizations.m4 2007-01-30 23:03:27.000000000 +0200 @@ -107,7 +107,7 @@ DEBUG_CFLAGS="-O $DEBUG_CFLAGS" - if test x"$sarchopt" != "xno"; then + if false ; then archopt_val= case "$host_or_hostalias" in --- xine-lib-1.1.4/configure~ 2007-01-30 23:02:56.000000000 +0200 +++ xine-lib-1.1.4/configure 2007-01-30 23:03:40.000000000 +0200 @@ -47754,7 +47754,7 @@ DEBUG_CFLAGS="-O $DEBUG_CFLAGS" - if test x"$sarchopt" != "xno"; then + if false ; then archopt_val= case "$host_or_hostalias" in --- NEW FILE xine-lib-mk-autotools-patch.sh --- #!/bin/sh # be sure to have all build deps + libtool installed before running this set -e if [ -z "$1" -o $# -ne 1 ]; then echo "Usage: $0 " exit 2 fi version=$1 rm -rf xine-lib-$version xine-lib-$version-pruned tar jxf xine-lib-$version-pruned.tar.bz2 cp -a xine-lib-$version xine-lib-$version-pruned cd xine-lib-$version ./autogen.sh noconfig rm -rf autom4te.cache *~ cd .. diff -Nru xine-lib-$version-pruned xine-lib-$version \ | bzip2 --best > xine-lib-$version-autotools.patch.bz2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xine-lib/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 17 Dec 2006 12:51:33 -0000 1.3 +++ .cvsignore 2 Feb 2007 18:02:26 -0000 1.4 @@ -1,2 +1,2 @@ -xine-lib-1.1.3-pruned.tar.bz2 -xine-lib-1.1.3-autotools.patch.bz2 +xine-lib-1.1.4-pruned.tar.bz2 +xine-lib-1.1.4-autotools.patch.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xine-lib/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 17 Dec 2006 12:51:33 -0000 1.3 +++ sources 2 Feb 2007 18:02:26 -0000 1.4 @@ -1,2 +1,2 @@ -eff682745f198e1881773509f12c70c3 xine-lib-1.1.3-pruned.tar.bz2 -a58fce450d9288224caa413ad8bc1f8d xine-lib-1.1.3-autotools.patch.bz2 +81faabf1e38abed44639dbe4c76719f9 xine-lib-1.1.4-pruned.tar.bz2 +a916758545ed73a369f40648c7bc449c xine-lib-1.1.4-autotools.patch.bz2 Index: xine-lib.spec =================================================================== RCS file: /cvs/extras/rpms/xine-lib/FC-6/xine-lib.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xine-lib.spec 3 Jan 2007 20:27:12 -0000 1.3 +++ xine-lib.spec 2 Feb 2007 18:02:26 -0000 1.4 @@ -1,29 +1,26 @@ # TODO, sometime, maybe: # - libstk: http://www.libstk.net/ # - pulseaudio +# - --enable-antialiasing? %define codecdir %{_libdir}/codecs Summary: Xine library Name: xine-lib -Version: 1.1.3 -Release: 3%{?dist} +Version: 1.1.4 +Release: 1%{?dist} License: GPL Group: System Environment/Libraries URL: http://xinehq.de/ # The tarball is generated from the upstream tarball using # the script in SOURCE1. It prunes potentially patented code -#Source0: http://dl.sourceforge.net/xine/xine-lib-%{version}.tar.gz +#Source0: http://dl.sourceforge.net/xine/xine-lib-%{version}.tar.bz2 Source0: %{name}-%{version}-pruned.tar.bz2 Source1: %{name}-cleanup-sources.sh -# To recreate the autotools patch: install build deps, extract source0, -# remove run_configure "$@" from autogen.sh, copy the dir to -patched, -# run autogen.sh (doesn't work with automake 1.10 as of 1.1.3 so use 1.9), -# remove autom4te.cache, then diff the dirs. Apply rest of the patches during -# build so that autotools do not need to be run again. -Patch0: %{name}-1.1.3-autotools.patch.bz2 -Patch1: %{name}-1.1.3-optflags.patch -Patch2: %{name}-1.1.3-flac113.patch +Source2: %{name}-mk-autotools-patch.sh +# autotools patch created with source2 +Patch0: %{name}-1.1.4-autotools.patch.bz2 +Patch1: %{name}-1.1.4-optflags.patch Patch3: %{name}-1.1.3-legacy-flac-init.patch Patch6: %{name}-1.1.1-deepbind-939.patch Patch7: %{name}-1.1.1-multilib-devel.patch @@ -45,7 +42,7 @@ # Audio BuildRequires: libogg-devel libvorbis-devel flac-devel libmodplug-devel BuildRequires: esound-devel speex-devel arts-devel alsa-lib-devel >= 0.9.0 -BuildRequires: jack-audio-connection-kit-devel +BuildRequires: jack-audio-connection-kit-devel wavpack-devel libmpcdec-devel # CDs BuildRequires: libcdio-devel # Other @@ -101,10 +98,10 @@ %prep %setup -q %patch0 -p1 -b .autotools -cp -p m4/optimizations.m4 m4/optimizations.m4.stamp +touch -r configure.ac aclocal.m4 +touch -r m4/optimizations.m4 m4/optimizations.m4.stamp %patch1 -p1 -b .optflags touch -r m4/optimizations.m4.stamp m4/optimizations.m4 -%patch2 -p1 -b .flac113 %patch3 -p0 -b .legacy-flac-init # Patch6 needed at least when compiling with external ffmpeg, #939. %patch6 -p1 -b .deepbind @@ -124,6 +121,9 @@ --with-xv-path=%{_libdir} \ --with-w32-path=%{codecdir} \ --with-external-ffmpeg \ + --with-external-libmpcdec \ + --with-libflac \ + --with-wavpack \ --enable-ipv6 \ %if 0%{!?_without_directfb:1} --enable-directfb \ @@ -149,8 +149,8 @@ rm -rf $RPM_BUILD_ROOT __docs make install DESTDIR=$RPM_BUILD_ROOT %find_lang libxine1 -cp -pR $RPM_BUILD_ROOT%{_docdir}/xine __docs -rm -rf $RPM_BUILD_ROOT%{_docdir}/xine +cp -pR $RPM_BUILD_ROOT%{_docdir}/xine-lib __docs +rm -rf $RPM_BUILD_ROOT%{_docdir}/xine-lib # Removing useless files rm -Rf $RPM_BUILD_ROOT%{_libdir}/libxine.la __docs/README \ @@ -166,12 +166,14 @@ %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig %files -f libxine1.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING CREDITS ChangeLog* README TODO __docs/README.* __docs/faq +%doc AUTHORS COPYING CREDITS ChangeLog* README TODO +%doc __docs/README.* __docs/faq.* %dir %{codecdir} %{_datadir}/xine %{_libdir}/libxine.so.* @@ -213,6 +215,7 @@ %{_libdir}/xine/plugins/%{version}/xineplug_decode_theora.so %{_libdir}/xine/plugins/%{version}/xineplug_decode_spudvb.so %{_libdir}/xine/plugins/%{version}/xineplug_decode_mpc.so +%{_libdir}/xine/plugins/%{version}/xineplug_decode_sputext.so %{_libdir}/xine/plugins/%{version}/xineplug_dmx_yuv_frames.so %{_libdir}/xine/plugins/%{version}/xineplug_dmx_real.so %{_libdir}/xine/plugins/%{version}/xineplug_dmx_audio.so @@ -232,7 +235,7 @@ %{_libdir}/xine/plugins/%{version}/xineplug_dmx_games.so %{_libdir}/xine/plugins/%{version}/xineplug_dmx_slave.so %{_libdir}/xine/plugins/%{version}/xineplug_flac.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_sputext.so +%{_libdir}/xine/plugins/%{version}/xineplug_wavpack.so %ifarch %ix86 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_vidix.so %{_libdir}/xine/plugins/%{version}/xineplug_decode_qt.so @@ -281,6 +284,12 @@ %changelog +* Wed Jan 31 2007 Ville Skytt?? - 1.1.4-1 +- 1.1.4, with wavpack and system libmpcdec support. + +* Thu Jan 18 2007 Aurelien Bompard 1.1.3-4 +- rebuild + * Wed Jan 3 2007 Ville Skytt?? - 1.1.3-3 - Fix libflac decoder with FLAC < 1.1.3 (#220961). - Apply upstream patch for FLAC >= 1.1.3. --- xine-lib-1.1.3-flac113.patch DELETED --- --- xine-lib-1.1.3-optflags.patch DELETED --- From fedora-extras-commits at redhat.com Fri Feb 2 18:28:01 2007 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 2 Feb 2007 13:28:01 -0500 Subject: rpms/R/devel R.spec,1.21,1.22 Message-ID: <200702021828.l12IS1EF024697@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24442 Modified Files: R.spec Log Message: Rebuild in devel for new tcl/tk. Index: R.spec =================================================================== RCS file: /cvs/extras/rpms/R/devel/R.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- R.spec 20 Dec 2006 00:47:34 -0000 1.21 +++ R.spec 2 Feb 2007 18:27:29 -0000 1.22 @@ -1,6 +1,6 @@ Name: R Version: 2.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz @@ -219,6 +219,9 @@ /sbin/ldconfig %changelog +* Fri Feb 2 2007 Tom "spot" Callaway 2.4.1-2 +- rebuild for new tcl/tk + * Tue Dec 19 2006 Tom "spot" Callaway 2.4.1-1 - bump to 2.4.1 - fix install-info invocations in post/preun (bz 219407) From fedora-extras-commits at redhat.com Fri Feb 2 18:59:46 2007 From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard)) Date: Fri, 2 Feb 2007 13:59:46 -0500 Subject: rpms/clips/FC-5 clips.spec,1.8,1.9 Message-ID: <200702021859.l12IxkpH003137@cvs-int.fedora.redhat.com> Author: rvinyard Update of /cvs/extras/rpms/clips/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2572/FC-5 Modified Files: clips.spec Log Message: Fix Bugzilla Bug 226770: link with ncurses Index: clips.spec =================================================================== RCS file: /cvs/extras/rpms/clips/FC-5/clips.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- clips.spec 1 Aug 2006 00:58:28 -0000 1.8 +++ clips.spec 2 Feb 2007 18:59:14 -0000 1.9 @@ -1,7 +1,7 @@ Summary: CLIPS language for developing expert systems Name: clips Version: 6.24 -Release: 19%{?dist} +Release: 21%{?dist} Url: http://www.ghg.net/clips/download/source/ License: GPL Group: Development/Tools @@ -24,7 +24,7 @@ Source16: http://www.ghg.net/clips/download/other/Bug_Fixes/DR0873.txt Patch0: clips-6.24-linux.patch.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libtermcap-devel libXt-devel libXext-devel libXmu-devel libXaw-devel xorg-x11-server-Xorg xorg-x11-proto-devel xorg-x11-xbitmaps desktop-file-utils +BuildRequires: ncurses-devel libXt-devel libXext-devel libXmu-devel libXaw-devel xorg-x11-server-Xorg xorg-x11-proto-devel xorg-x11-xbitmaps desktop-file-utils %description CLIPS is a productive development and delivery expert system tool which @@ -46,7 +46,7 @@ Summary: Headers for developing programs that will embed CLIPS Group: Development/Libraries Requires: clips-libs = %{version}-%{release} -Requires: libtermcap-devel pkgconfig +Requires: ncurses-devel pkgconfig %description devel This package contains the libraries and header files needed for @@ -162,6 +162,13 @@ %doc ig.pdf %changelog +* Fri Feb 02 2007 Rick L Vinyard Jr 6.24-21 +- New clips patch builds against ncurses instead of libtermcap +- Changed all requires of libtermcap-devel to ncurses-devel + +* Sun Aug 27 2006 Rick L Vinyard Jr 6.24-20 +- Bump release for mass rebuild + * Mon Jul 31 2006 Rick L Vinyard Jr 6.24-19 - Remove autoconf config.h from linux patch - Added clips-config.h with CLIPS_HELPFILE define to linux patch From fedora-extras-commits at redhat.com Fri Feb 2 18:59:49 2007 From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard)) Date: Fri, 2 Feb 2007 13:59:49 -0500 Subject: rpms/clips/FC-6 clips.spec,1.6,1.7 Message-ID: <200702021859.l12Ixn2b003149@cvs-int.fedora.redhat.com> Author: rvinyard Update of /cvs/extras/rpms/clips/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2572/FC-6 Modified Files: clips.spec Log Message: Fix Bugzilla Bug 226770: link with ncurses Index: clips.spec =================================================================== RCS file: /cvs/extras/rpms/clips/FC-6/clips.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- clips.spec 28 Aug 2006 02:05:13 -0000 1.6 +++ clips.spec 2 Feb 2007 18:59:17 -0000 1.7 @@ -1,7 +1,7 @@ Summary: CLIPS language for developing expert systems Name: clips Version: 6.24 -Release: 20%{?dist} +Release: 21%{?dist} Url: http://www.ghg.net/clips/download/source/ License: GPL Group: Development/Tools @@ -24,7 +24,7 @@ Source16: http://www.ghg.net/clips/download/other/Bug_Fixes/DR0873.txt Patch0: clips-6.24-linux.patch.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libtermcap-devel libXt-devel libXext-devel libXmu-devel libXaw-devel xorg-x11-server-Xorg xorg-x11-proto-devel xorg-x11-xbitmaps desktop-file-utils +BuildRequires: ncurses-devel libXt-devel libXext-devel libXmu-devel libXaw-devel xorg-x11-server-Xorg xorg-x11-proto-devel xorg-x11-xbitmaps desktop-file-utils %description CLIPS is a productive development and delivery expert system tool which @@ -46,7 +46,7 @@ Summary: Headers for developing programs that will embed CLIPS Group: Development/Libraries Requires: clips-libs = %{version}-%{release} -Requires: libtermcap-devel pkgconfig +Requires: ncurses-devel pkgconfig %description devel This package contains the libraries and header files needed for @@ -162,6 +162,10 @@ %doc ig.pdf %changelog +* Fri Feb 02 2007 Rick L Vinyard Jr 6.24-21 +- New clips patch builds against ncurses instead of libtermcap +- Changed all requires of libtermcap-devel to ncurses-devel + * Sun Aug 27 2006 Rick L Vinyard Jr 6.24-20 - Bump release for mass rebuild From fedora-extras-commits at redhat.com Fri Feb 2 18:59:51 2007 From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard)) Date: Fri, 2 Feb 2007 13:59:51 -0500 Subject: rpms/clips/devel clips.spec,1.6,1.7 Message-ID: <200702021859.l12IxpGw003160@cvs-int.fedora.redhat.com> Author: rvinyard Update of /cvs/extras/rpms/clips/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2572/devel Modified Files: clips.spec Log Message: Fix Bugzilla Bug 226770: link with ncurses Index: clips.spec =================================================================== RCS file: /cvs/extras/rpms/clips/devel/clips.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- clips.spec 28 Aug 2006 02:05:13 -0000 1.6 +++ clips.spec 2 Feb 2007 18:59:19 -0000 1.7 @@ -1,7 +1,7 @@ Summary: CLIPS language for developing expert systems Name: clips Version: 6.24 -Release: 20%{?dist} +Release: 21%{?dist} Url: http://www.ghg.net/clips/download/source/ License: GPL Group: Development/Tools @@ -24,7 +24,7 @@ Source16: http://www.ghg.net/clips/download/other/Bug_Fixes/DR0873.txt Patch0: clips-6.24-linux.patch.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libtermcap-devel libXt-devel libXext-devel libXmu-devel libXaw-devel xorg-x11-server-Xorg xorg-x11-proto-devel xorg-x11-xbitmaps desktop-file-utils +BuildRequires: ncurses-devel libXt-devel libXext-devel libXmu-devel libXaw-devel xorg-x11-server-Xorg xorg-x11-proto-devel xorg-x11-xbitmaps desktop-file-utils %description CLIPS is a productive development and delivery expert system tool which @@ -46,7 +46,7 @@ Summary: Headers for developing programs that will embed CLIPS Group: Development/Libraries Requires: clips-libs = %{version}-%{release} -Requires: libtermcap-devel pkgconfig +Requires: ncurses-devel pkgconfig %description devel This package contains the libraries and header files needed for @@ -162,6 +162,10 @@ %doc ig.pdf %changelog +* Fri Feb 02 2007 Rick L Vinyard Jr 6.24-21 +- New clips patch builds against ncurses instead of libtermcap +- Changed all requires of libtermcap-devel to ncurses-devel + * Sun Aug 27 2006 Rick L Vinyard Jr 6.24-20 - Bump release for mass rebuild From fedora-extras-commits at redhat.com Fri Feb 2 19:04:34 2007 From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard)) Date: Fri, 2 Feb 2007 14:04:34 -0500 Subject: rpms/clips/FC-6 .cvsignore,1.3,1.4 sources,1.5,1.6 Message-ID: <200702021904.l12J4YGC006698@cvs-int.fedora.redhat.com> Author: rvinyard Update of /cvs/extras/rpms/clips/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6635/FC-6 Modified Files: .cvsignore sources Log Message: Fix Bugzilla Bug 226770: link with ncurses Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/clips/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 11 Jul 2006 03:06:00 -0000 1.3 +++ .cvsignore 2 Feb 2007 19:04:02 -0000 1.4 @@ -4,7 +4,6 @@ apg.pdf arch5-1.pdf bpg.pdf -clips-6.24-linux.patch.bz2 clipssrc.tar.Z ig.pdf usrguide.pdf @@ -12,3 +11,4 @@ FunctionContext.zip objrtmch.c DR0873.txt +clips-6.24-linux.patch.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/clips/FC-6/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 1 Aug 2006 01:13:09 -0000 1.5 +++ sources 2 Feb 2007 19:04:02 -0000 1.6 @@ -11,4 +11,4 @@ ac0d7c465a909158ae908fe39d68478c FunctionContext.zip da5ad2328e4d8dd7680d8bb28005e90d objrtmch.c f80256270a8a93504e37644ab9bc16b4 DR0873.txt -d7415e77dca85fb14ab1c7170afb9c1a clips-6.24-linux.patch.bz2 +cbf0382ca4153adc0446b0bf5c123559 clips-6.24-linux.patch.bz2 From fedora-extras-commits at redhat.com Fri Feb 2 19:04:32 2007 From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard)) Date: Fri, 2 Feb 2007 14:04:32 -0500 Subject: rpms/clips/FC-5 .cvsignore,1.5,1.6 Message-ID: <200702021904.l12J4WS2006694@cvs-int.fedora.redhat.com> Author: rvinyard Update of /cvs/extras/rpms/clips/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6635/FC-5 Modified Files: .cvsignore Log Message: Fix Bugzilla Bug 226770: link with ncurses Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/clips/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 11 Jul 2006 02:57:35 -0000 1.5 +++ .cvsignore 2 Feb 2007 19:03:59 -0000 1.6 @@ -4,7 +4,6 @@ apg.pdf arch5-1.pdf bpg.pdf -clips-6.24-linux.patch.bz2 clipssrc.tar.Z ig.pdf usrguide.pdf @@ -12,3 +11,4 @@ FunctionContext.zip objrtmch.c DR0873.txt +clips-6.24-linux.patch.bz2 From fedora-extras-commits at redhat.com Fri Feb 2 19:04:37 2007 From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard)) Date: Fri, 2 Feb 2007 14:04:37 -0500 Subject: rpms/clips/devel .cvsignore,1.3,1.4 Message-ID: <200702021904.l12J4bnY006701@cvs-int.fedora.redhat.com> Author: rvinyard Update of /cvs/extras/rpms/clips/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6635/devel Modified Files: .cvsignore Log Message: Fix Bugzilla Bug 226770: link with ncurses Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/clips/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 11 Jul 2006 03:06:00 -0000 1.3 +++ .cvsignore 2 Feb 2007 19:04:04 -0000 1.4 @@ -4,7 +4,6 @@ apg.pdf arch5-1.pdf bpg.pdf -clips-6.24-linux.patch.bz2 clipssrc.tar.Z ig.pdf usrguide.pdf @@ -12,3 +11,4 @@ FunctionContext.zip objrtmch.c DR0873.txt +clips-6.24-linux.patch.bz2 From fedora-extras-commits at redhat.com Fri Feb 2 19:20:25 2007 From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard)) Date: Fri, 2 Feb 2007 14:20:25 -0500 Subject: rpms/clips/devel clips.spec,1.7,1.8 sources,1.5,1.6 Message-ID: <200702021920.l12JKPrM007000@cvs-int.fedora.redhat.com> Author: rvinyard Update of /cvs/extras/rpms/clips/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6941/devel Modified Files: clips.spec sources Log Message: Index: clips.spec =================================================================== RCS file: /cvs/extras/rpms/clips/devel/clips.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- clips.spec 2 Feb 2007 18:59:19 -0000 1.7 +++ clips.spec 2 Feb 2007 19:19:53 -0000 1.8 @@ -1,7 +1,7 @@ Summary: CLIPS language for developing expert systems Name: clips Version: 6.24 -Release: 21%{?dist} +Release: 22%{?dist} Url: http://www.ghg.net/clips/download/source/ License: GPL Group: Development/Tools @@ -162,6 +162,9 @@ %doc ig.pdf %changelog +* Fri Feb 02 2007 Rick L Vinyard Jr 6.24-22 +- Bump release to build FC-5 and devel against new patch + * Fri Feb 02 2007 Rick L Vinyard Jr 6.24-21 - New clips patch builds against ncurses instead of libtermcap - Changed all requires of libtermcap-devel to ncurses-devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/clips/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 1 Aug 2006 01:13:09 -0000 1.5 +++ sources 2 Feb 2007 19:19:53 -0000 1.6 @@ -11,4 +11,4 @@ ac0d7c465a909158ae908fe39d68478c FunctionContext.zip da5ad2328e4d8dd7680d8bb28005e90d objrtmch.c f80256270a8a93504e37644ab9bc16b4 DR0873.txt -d7415e77dca85fb14ab1c7170afb9c1a clips-6.24-linux.patch.bz2 +cbf0382ca4153adc0446b0bf5c123559 clips-6.24-linux.patch.bz2 From fedora-extras-commits at redhat.com Fri Feb 2 19:20:21 2007 From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard)) Date: Fri, 2 Feb 2007 14:20:21 -0500 Subject: rpms/clips/FC-5 clips.spec,1.9,1.10 sources,1.7,1.8 Message-ID: <200702021920.l12JKLLq006993@cvs-int.fedora.redhat.com> Author: rvinyard Update of /cvs/extras/rpms/clips/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6941/FC-5 Modified Files: clips.spec sources Log Message: Index: clips.spec =================================================================== RCS file: /cvs/extras/rpms/clips/FC-5/clips.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- clips.spec 2 Feb 2007 18:59:14 -0000 1.9 +++ clips.spec 2 Feb 2007 19:19:48 -0000 1.10 @@ -1,7 +1,7 @@ Summary: CLIPS language for developing expert systems Name: clips Version: 6.24 -Release: 21%{?dist} +Release: 22%{?dist} Url: http://www.ghg.net/clips/download/source/ License: GPL Group: Development/Tools @@ -162,6 +162,9 @@ %doc ig.pdf %changelog +* Fri Feb 02 2007 Rick L Vinyard Jr 6.24-22 +- Bump release to build FC-5 and devel against new patch + * Fri Feb 02 2007 Rick L Vinyard Jr 6.24-21 - New clips patch builds against ncurses instead of libtermcap - Changed all requires of libtermcap-devel to ncurses-devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/clips/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 1 Aug 2006 00:58:28 -0000 1.7 +++ sources 2 Feb 2007 19:19:48 -0000 1.8 @@ -11,4 +11,4 @@ ac0d7c465a909158ae908fe39d68478c FunctionContext.zip da5ad2328e4d8dd7680d8bb28005e90d objrtmch.c f80256270a8a93504e37644ab9bc16b4 DR0873.txt -d7415e77dca85fb14ab1c7170afb9c1a clips-6.24-linux.patch.bz2 +cbf0382ca4153adc0446b0bf5c123559 clips-6.24-linux.patch.bz2 From fedora-extras-commits at redhat.com Fri Feb 2 19:20:23 2007 From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard)) Date: Fri, 2 Feb 2007 14:20:23 -0500 Subject: rpms/clips/FC-6 clips.spec,1.7,1.8 Message-ID: <200702021920.l12JKNAL006996@cvs-int.fedora.redhat.com> Author: rvinyard Update of /cvs/extras/rpms/clips/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6941/FC-6 Modified Files: clips.spec Log Message: Index: clips.spec =================================================================== RCS file: /cvs/extras/rpms/clips/FC-6/clips.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- clips.spec 2 Feb 2007 18:59:17 -0000 1.7 +++ clips.spec 2 Feb 2007 19:19:51 -0000 1.8 @@ -1,7 +1,7 @@ Summary: CLIPS language for developing expert systems Name: clips Version: 6.24 -Release: 21%{?dist} +Release: 22%{?dist} Url: http://www.ghg.net/clips/download/source/ License: GPL Group: Development/Tools @@ -162,6 +162,9 @@ %doc ig.pdf %changelog +* Fri Feb 02 2007 Rick L Vinyard Jr 6.24-22 +- Bump release to build FC-5 and devel against new patch + * Fri Feb 02 2007 Rick L Vinyard Jr 6.24-21 - New clips patch builds against ncurses instead of libtermcap - Changed all requires of libtermcap-devel to ncurses-devel From fedora-extras-commits at redhat.com Fri Feb 2 19:34:56 2007 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 2 Feb 2007 14:34:56 -0500 Subject: rpms/tclxml/devel tclxml-3.1-sgmlversion.patch, NONE, 1.1 tclxml.spec, 1.9, 1.10 Message-ID: <200702021934.l12JYumj007344@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tclxml/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7313 Modified Files: tclxml.spec Added Files: tclxml-3.1-sgmlversion.patch Log Message: - Fix sgmlparser version mismatch - Move package directories to tcl-specific directories tclxml-3.1-sgmlversion.patch: --- NEW FILE tclxml-3.1-sgmlversion.patch --- --- library/sgmlparser.tcl.orig 2007-02-02 09:09:04.000000000 -0800 +++ library/sgmlparser.tcl 2007-02-02 09:09:12.000000000 -0800 @@ -20,7 +20,7 @@ package require uri 1.1 -package provide sgmlparser 1.0 +package provide sgmlparser 1.1 namespace eval sgml { namespace export tokenise parseEvent Index: tclxml.spec =================================================================== RCS file: /cvs/extras/rpms/tclxml/devel/tclxml.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- tclxml.spec 28 Aug 2006 16:39:14 -0000 1.9 +++ tclxml.spec 2 Feb 2007 19:34:24 -0000 1.10 @@ -1,14 +1,17 @@ +%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%(echo 'puts $tcl_version' | tclsh)} + Summary: TclXML is a package that provides XML parsing for the Tcl scripting language Name: tclxml Version: 3.1 -Release: 9%{?dist} +Release: 10%{?dist} License: BSD Group: Development/Libraries URL: http://tclxml.sourceforge.net/ Source: http://dl.sf.net/tclxml/tclxml-3.1.tar.gz Patch0: tclxml.patch +Patch1: tclxml-3.1-sgmlversion.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: tcl tcl-devel libxml2-devel expat-devel +BuildRequires: tcl-devel libxml2-devel expat-devel Requires: tcl tcllib %description @@ -43,8 +46,10 @@ header files for the base, expat, and libxml2 subpackages. %prep +echo "tcl_sitelib is %{tcl_sitelib}" %setup -q %patch0 -p1 +%patch1 # Clean up rpmlint warning about line endings on # one of the documentation files. @@ -91,32 +96,43 @@ rm -f $RPM_BUILD_ROOT/usr/include/xmltok.h rm -f $RPM_BUILD_ROOT/usr/include/xmlrole.h +# Don't pollute the system lib directory; move this package to +# a tcl-specific location +mkdir -p $RPM_BUILD_ROOT%{tcl_sitearch} +mv $RPM_BUILD_ROOT%{_libdir}/Tclxml%{version} $RPM_BUILD_ROOT%{tcl_sitearch}/Tclxml%{version} +mv $RPM_BUILD_ROOT%{_libdir}/Tclexpat%{version} $RPM_BUILD_ROOT%{tcl_sitearch}/Tclexpat%{version} +mv $RPM_BUILD_ROOT%{_libdir}/TclXML_libxml2%{version} $RPM_BUILD_ROOT%{tcl_sitearch}/TclXML_libxml2%{version} + %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%dir %{_libdir}/Tclxml%{version} -%{_libdir}/Tclxml%{version}/*.so -%{_libdir}/Tclxml%{version}/*.tcl +%dir %{tcl_sitearch}/Tclxml%{version} +%{tcl_sitearch}/Tclxml%{version}/*.so +%{tcl_sitearch}/Tclxml%{version}/*.tcl %doc LICENSE ANNOUNCE ChangeLog README RELNOTES %doc doc/* %files expat %defattr(-,root,root) -%{_libdir}/Tclexpat%{version} +%{tcl_sitearch}/Tclexpat%{version} %files libxml2 %defattr(-,root,root) -%{_libdir}/TclXML_libxml2%{version} +%{tcl_sitearch}/TclXML_libxml2%{version} %files devel %defattr(-,root,root) %{_includedir}/* %{_libdir}/TclxmlConfig.sh -%{_libdir}/Tclxml%{version}/*.a +%{tcl_sitearch}/Tclxml%{version}/*.a %changelog +* Fri Feb 2 2007 Wart - 3.1-10 +- Fix sgmlparser version mismatch +- Move package directories to tcl-specific directories + * Mon Aug 28 2006 Wart - 3.1-9 - Rebuild for Fedora Extras From fedora-extras-commits at redhat.com Fri Feb 2 19:37:37 2007 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Fri, 2 Feb 2007 14:37:37 -0500 Subject: fedora-security/audit fc5,1.445,1.446 fc6,1.199,1.200 Message-ID: <200702021937.l12Jbbc9007427@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7408 Modified Files: fc5 fc6 Log Message: Add some wireshark issues Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.445 retrieving revision 1.446 diff -u -r1.445 -r1.446 --- fc5 30 Jan 2007 15:38:44 -0000 1.445 +++ fc5 2 Feb 2007 19:37:35 -0000 1.446 @@ -4,6 +4,10 @@ ** are items that need attention CVE-2007-0537 VULNERABLE (kdebase) #225420 +CVE-2007-0459 VULNERABLE (wireshark, fixed 0.99.5) #227140 +CVE-2007-0458 VULNERABLE (wireshark, fixed 0.99.5) #227140 +CVE-2007-0457 VULNERABLE (wireshark, fixed 0.99.5) #227140 +CVE-2007-0456 VULNERABLE (wireshark, fixed 0.99.5) #227140 CVE-2007-0455 VULNERABLE (gd) #224610 CVE-2007-0247 backport(squid, fixed 2.6.STABLE7) #222883 [since FEDORA-2007-092] CVE-2007-0235 VULNERABLE (libgtop2) #222637 not sure, will triage Index: fc6 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc6,v retrieving revision 1.199 retrieving revision 1.200 diff -u -r1.199 -r1.200 --- fc6 30 Jan 2007 15:38:44 -0000 1.199 +++ fc6 2 Feb 2007 19:37:35 -0000 1.200 @@ -4,6 +4,10 @@ ** are items that need attention CVE-2007-0537 VULNERABLE (kdebase) #225420 +CVE-2007-0459 VULNERABLE (wireshark, fixed 0.99.5) #227140 +CVE-2007-0458 VULNERABLE (wireshark, fixed 0.99.5) #227140 +CVE-2007-0457 VULNERABLE (wireshark, fixed 0.99.5) #227140 +CVE-2007-0456 VULNERABLE (wireshark, fixed 0.99.5) #227140 CVE-2007-0455 VULNERABLE (gd) #224610 CVE-2007-0248 version (squid, fixed 2.6.STABLE7) [since FEDORA-2007-073] CVE-2007-0247 version (squid, fixed 2.6.STABLE7) #222883 [since FEDORA-2007-073] From fedora-extras-commits at redhat.com Fri Feb 2 19:54:46 2007 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Fri, 2 Feb 2007 14:54:46 -0500 Subject: rpms/banshee/devel .cvsignore, 1.8, 1.9 banshee.spec, 1.21, 1.22 sources, 1.8, 1.9 Message-ID: <200702021954.l12JskJ8008083@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/banshee/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7986 Modified Files: .cvsignore banshee.spec sources Log Message: * Fri Feb 2 2007 Christopher Aillon - 0.11.5-1 - Update to 0.11.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/banshee/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 24 Aug 2006 03:41:10 -0000 1.8 +++ .cvsignore 2 Feb 2007 19:54:13 -0000 1.9 @@ -0,0 +1 @@ +banshee-0.11.5.tar.bz2 Index: banshee.spec =================================================================== RCS file: /cvs/extras/rpms/banshee/devel/banshee.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- banshee.spec 1 Sep 2006 19:26:48 -0000 1.21 +++ banshee.spec 2 Feb 2007 19:54:13 -0000 1.22 @@ -1,6 +1,6 @@ Name: banshee -Version: 0.10.12 -Release: 4%{?dist} +Version: 0.11.5 +Release: 1%{?dist} Summary: easily import, manage, and play selections from your music collection Group: Applications/Multimedia @@ -108,6 +108,9 @@ %exclude %{_libdir}/banshee/*.la %changelog +* Fri Feb 2 2007 Christopher Aillon - 0.11.5-1 +- Update to 0.11.5 + * Fri Sep 1 2006 Christopher Aillon - 0.10.12-4 - Register banshee-notificationareaicon.schemas in %%post (bug 185605) - Add dllmap for libdbus-glib so banshee works without dbus-glib-devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/banshee/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 24 Aug 2006 03:39:17 -0000 1.8 +++ sources 2 Feb 2007 19:54:13 -0000 1.9 @@ -1 +1 @@ -13806b7dee6444013dcb1436b4cf0e78 banshee-0.10.12.tar.gz +480018043c26e02fd65ccebfc06cc38b banshee-0.11.5.tar.bz2 From fedora-extras-commits at redhat.com Fri Feb 2 20:00:40 2007 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Fri, 2 Feb 2007 15:00:40 -0500 Subject: rpms/banshee/devel banshee.spec,1.22,1.23 Message-ID: <200702022000.l12K0eLw008913@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/banshee/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8826 Modified Files: banshee.spec Log Message: * Fri Feb 2 2007 Christopher Aillon - 0.11.5-1 - Update to 0.11.5 Index: banshee.spec =================================================================== RCS file: /cvs/extras/rpms/banshee/devel/banshee.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- banshee.spec 2 Feb 2007 19:54:13 -0000 1.22 +++ banshee.spec 2 Feb 2007 20:00:08 -0000 1.23 @@ -6,7 +6,7 @@ Group: Applications/Multimedia License: MIT URL: http://banshee-project.org/ -Source0: http://banshee-project.org/files/banshee/%{name}-%{version}.tar.gz +Source0: http://banshee-project.org/files/banshee/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: banshee-0.10.12-mono-libdir.patch Patch2: banshee-0.10.12-libdbus-glib-dllmap.patch From fedora-extras-commits at redhat.com Fri Feb 2 20:11:16 2007 From: fedora-extras-commits at redhat.com (Braden McDaniel (braden)) Date: Fri, 2 Feb 2007 15:11:16 -0500 Subject: rpms/openvrml/devel openvrml.spec,1.8,1.9 Message-ID: <200702022011.l12KBGw2013749@cvs-int.fedora.redhat.com> Author: braden Update of /cvs/extras/rpms/openvrml/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13630/devel Modified Files: openvrml.spec Log Message: Require GLib >= 2.6 for use of GOption in openvrml-gtkplug. Index: openvrml.spec =================================================================== RCS file: /cvs/extras/rpms/openvrml/devel/openvrml.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- openvrml.spec 1 Jan 2007 06:08:46 -0000 1.8 +++ openvrml.spec 2 Feb 2007 20:10:44 -0000 1.9 @@ -1,7 +1,7 @@ # -*- rpm-spec -*- Name: openvrml Version: 0.16.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: VRML/X3D runtime library License: LGPL Group: System Environment/Libraries @@ -17,6 +17,7 @@ BuildRequires: firefox-devel BuildRequires: libGLU-devel BuildRequires: libXmu-devel +BuildRequires: glib2-devel >= 2.6 BuildRequires: gtk2-devel Requires: firefox = 2.0.0.1 @@ -149,6 +150,9 @@ %changelog +* Fri Feb 02 2007 Braden McDaniel - 0.16.3-3 +- Require GLib >= 2.6 for use of GOption in openvrml-gtkplug. + * Mon Jan 01 2007 Braden McDaniel - 0.16.3-2 - Updated firefox dependency to 2.0.0.1. From fedora-extras-commits at redhat.com Fri Feb 2 20:11:14 2007 From: fedora-extras-commits at redhat.com (Braden McDaniel (braden)) Date: Fri, 2 Feb 2007 15:11:14 -0500 Subject: rpms/openvrml/FC-6 openvrml.spec,1.7,1.8 Message-ID: <200702022011.l12KBEeP013742@cvs-int.fedora.redhat.com> Author: braden Update of /cvs/extras/rpms/openvrml/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13630/FC-6 Modified Files: openvrml.spec Log Message: Require GLib >= 2.6 for use of GOption in openvrml-gtkplug. Index: openvrml.spec =================================================================== RCS file: /cvs/extras/rpms/openvrml/FC-6/openvrml.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- openvrml.spec 31 Dec 2006 05:28:43 -0000 1.7 +++ openvrml.spec 2 Feb 2007 20:10:42 -0000 1.8 @@ -1,7 +1,7 @@ # -*- rpm-spec -*- Name: openvrml Version: 0.16.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: VRML/X3D runtime library License: LGPL Group: System Environment/Libraries @@ -17,6 +17,7 @@ BuildRequires: firefox-devel BuildRequires: libGLU-devel BuildRequires: libXmu-devel +BuildRequires: glib2-devel >= 2.6 BuildRequires: gtk2-devel Requires: firefox = 1.5.0.9 @@ -149,6 +150,9 @@ %changelog +* Fri Feb 02 2007 Braden McDaniel - 0.16.3-2 +- Require GLib >= 2.6 for use of GOption in openvrml-gtkplug. + * Sun Dec 31 2006 Braden McDaniel - 0.16.3-1 - Updated to 0.16.3. From fedora-extras-commits at redhat.com Fri Feb 2 20:30:36 2007 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Fri, 2 Feb 2007 15:30:36 -0500 Subject: rpms/banshee/devel banshee.spec,1.23,1.24 Message-ID: <200702022030.l12KUath015696@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/banshee/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15670 Modified Files: banshee.spec Log Message: * Fri Feb 2 2007 Christopher Aillon - 0.11.5-1 - Update to 0.11.5 Index: banshee.spec =================================================================== RCS file: /cvs/extras/rpms/banshee/devel/banshee.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- banshee.spec 2 Feb 2007 20:00:08 -0000 1.23 +++ banshee.spec 2 Feb 2007 20:30:04 -0000 1.24 @@ -42,8 +42,8 @@ %prep %setup -q -%patch1 -p1 -b .mono-libdir -%patch2 -p1 -b .libdbus-glib-dllmap +#%patch1 -p1 -b .mono-libdir +#%patch2 -p1 -b .libdbus-glib-dllmap %build # try to work around a problem where gst-inspect does @@ -103,6 +103,7 @@ %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/* %{_datadir}/dbus-1/services/org.gnome.Banshee.service +%{_datadir}/banshee/audio-profiles %{_sysconfdir}/gconf/schemas %exclude %{_libdir}/banshee/*.a %exclude %{_libdir}/banshee/*.la From fedora-extras-commits at redhat.com Fri Feb 2 21:21:40 2007 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Fri, 2 Feb 2007 16:21:40 -0500 Subject: rpms/ejabberd/devel .cvsignore, 1.3, 1.4 ejabberd.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200702022121.l12LLeB0019432@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/ejabberd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19406 Modified Files: .cvsignore ejabberd.spec sources Log Message: Update to 1.1.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ejabberd/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Oct 2006 04:22:54 -0000 1.3 +++ .cvsignore 2 Feb 2007 21:21:08 -0000 1.4 @@ -1 +1 @@ -ejabberd-1.1.2.tar.gz +ejabberd-1.1.3.tar.gz Index: ejabberd.spec =================================================================== RCS file: /cvs/extras/rpms/ejabberd/devel/ejabberd.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ejabberd.spec 11 Oct 2006 20:33:59 -0000 1.6 +++ ejabberd.spec 2 Feb 2007 21:21:08 -0000 1.7 @@ -1,15 +1,15 @@ Name: ejabberd -Version: 1.1.2 -Release: 2%{?dist} +Version: 1.1.3 +Release: 1%{?dist} Summary: A distributed, fault-tolerant Jabber/XMPP server Group: Applications/Internet License: GPL URL: http://ejabberd.jabber.ru/ Source0: http://www.process-one.net/en/projects/ejabberd/download/%{version}/ejabberd-%{version}.tar.gz -Source1: ejabberd.init -Source2: ejabberd.logrotate -Source3: inetrc +Source1: ejabberd.init +Source2: ejabberd.logrotate +Source3: inetrc # http://ejabberd.jabber.ru/ejabberdctl-extra Source4: http://ejabberd.jabber.ru/files/efiles/mod_ctlextra.erl @@ -22,7 +22,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: expat-devel -BuildRequires: openssl-devel +BuildRequires: openssl-devel BuildRequires: erlang BuildRequires: hevea @@ -150,6 +150,9 @@ %doc ChangeLog COPYING TODO doc/*.pdf doc/*.html doc/*.png doc/release_notes_* %changelog +* Fri Feb 2 2007 Jeffrey C. Ollie - 1.1.3-1 +- Update to 1.1.3 + * Wed Oct 11 2006 Jeffrey C. Ollie - 1.1.2-2 - Fix logrotate script (BZ#210366) Index: sources =================================================================== RCS file: /cvs/extras/rpms/ejabberd/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Oct 2006 04:22:54 -0000 1.3 +++ sources 2 Feb 2007 21:21:08 -0000 1.4 @@ -1 +1 @@ -5b947e19e18a6b554bf31d1c95176eb6 ejabberd-1.1.2.tar.gz +bdb39965a147506fc194d5a28117172a ejabberd-1.1.3.tar.gz From fedora-extras-commits at redhat.com Fri Feb 2 21:23:17 2007 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Fri, 2 Feb 2007 16:23:17 -0500 Subject: rpms/ejabberd/FC-6 .cvsignore, 1.3, 1.4 ejabberd.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200702022123.l12LNHG1019502@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/ejabberd/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19481 Modified Files: .cvsignore ejabberd.spec sources Log Message: Update to 1.1.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ejabberd/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Oct 2006 04:22:54 -0000 1.3 +++ .cvsignore 2 Feb 2007 21:22:45 -0000 1.4 @@ -1 +1 @@ -ejabberd-1.1.2.tar.gz +ejabberd-1.1.3.tar.gz Index: ejabberd.spec =================================================================== RCS file: /cvs/extras/rpms/ejabberd/FC-6/ejabberd.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ejabberd.spec 11 Oct 2006 20:33:59 -0000 1.6 +++ ejabberd.spec 2 Feb 2007 21:22:45 -0000 1.7 @@ -1,15 +1,15 @@ Name: ejabberd -Version: 1.1.2 -Release: 2%{?dist} +Version: 1.1.3 +Release: 1%{?dist} Summary: A distributed, fault-tolerant Jabber/XMPP server Group: Applications/Internet License: GPL URL: http://ejabberd.jabber.ru/ Source0: http://www.process-one.net/en/projects/ejabberd/download/%{version}/ejabberd-%{version}.tar.gz -Source1: ejabberd.init -Source2: ejabberd.logrotate -Source3: inetrc +Source1: ejabberd.init +Source2: ejabberd.logrotate +Source3: inetrc # http://ejabberd.jabber.ru/ejabberdctl-extra Source4: http://ejabberd.jabber.ru/files/efiles/mod_ctlextra.erl @@ -22,7 +22,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: expat-devel -BuildRequires: openssl-devel +BuildRequires: openssl-devel BuildRequires: erlang BuildRequires: hevea @@ -150,6 +150,9 @@ %doc ChangeLog COPYING TODO doc/*.pdf doc/*.html doc/*.png doc/release_notes_* %changelog +* Fri Feb 2 2007 Jeffrey C. Ollie - 1.1.3-1 +- Update to 1.1.3 + * Wed Oct 11 2006 Jeffrey C. Ollie - 1.1.2-2 - Fix logrotate script (BZ#210366) Index: sources =================================================================== RCS file: /cvs/extras/rpms/ejabberd/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Oct 2006 04:22:54 -0000 1.3 +++ sources 2 Feb 2007 21:22:45 -0000 1.4 @@ -1 +1 @@ -5b947e19e18a6b554bf31d1c95176eb6 ejabberd-1.1.2.tar.gz +bdb39965a147506fc194d5a28117172a ejabberd-1.1.3.tar.gz From fedora-extras-commits at redhat.com Fri Feb 2 21:24:24 2007 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Fri, 2 Feb 2007 16:24:24 -0500 Subject: rpms/ejabberd/FC-5 .cvsignore, 1.3, 1.4 ejabberd.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200702022124.l12LOO70019630@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/ejabberd/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19546 Modified Files: .cvsignore ejabberd.spec sources Log Message: Update to 1.1.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ejabberd/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Oct 2006 04:24:02 -0000 1.3 +++ .cvsignore 2 Feb 2007 21:23:52 -0000 1.4 @@ -1 +1 @@ -ejabberd-1.1.2.tar.gz +ejabberd-1.1.3.tar.gz Index: ejabberd.spec =================================================================== RCS file: /cvs/extras/rpms/ejabberd/FC-5/ejabberd.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ejabberd.spec 11 Oct 2006 20:35:18 -0000 1.5 +++ ejabberd.spec 2 Feb 2007 21:23:52 -0000 1.6 @@ -1,15 +1,15 @@ Name: ejabberd -Version: 1.1.2 -Release: 2%{?dist} +Version: 1.1.3 +Release: 1%{?dist} Summary: A distributed, fault-tolerant Jabber/XMPP server Group: Applications/Internet License: GPL URL: http://ejabberd.jabber.ru/ Source0: http://www.process-one.net/en/projects/ejabberd/download/%{version}/ejabberd-%{version}.tar.gz -Source1: ejabberd.init -Source2: ejabberd.logrotate -Source3: inetrc +Source1: ejabberd.init +Source2: ejabberd.logrotate +Source3: inetrc # http://ejabberd.jabber.ru/ejabberdctl-extra Source4: http://ejabberd.jabber.ru/files/efiles/mod_ctlextra.erl @@ -22,7 +22,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: expat-devel -BuildRequires: openssl-devel +BuildRequires: openssl-devel BuildRequires: erlang BuildRequires: hevea @@ -150,6 +150,9 @@ %doc ChangeLog COPYING TODO doc/*.pdf doc/*.html doc/*.png doc/release_notes_* %changelog +* Fri Feb 2 2007 Jeffrey C. Ollie - 1.1.3-1 +- Update to 1.1.3 + * Wed Oct 11 2006 Jeffrey C. Ollie - 1.1.2-2 - Fix logrotate script (BZ#210366) Index: sources =================================================================== RCS file: /cvs/extras/rpms/ejabberd/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Oct 2006 04:24:02 -0000 1.3 +++ sources 2 Feb 2007 21:23:52 -0000 1.4 @@ -1 +1 @@ -5b947e19e18a6b554bf31d1c95176eb6 ejabberd-1.1.2.tar.gz +bdb39965a147506fc194d5a28117172a ejabberd-1.1.3.tar.gz From fedora-extras-commits at redhat.com Fri Feb 2 21:24:36 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Fri, 2 Feb 2007 16:24:36 -0500 Subject: rpms/genius/FC-5 .cvsignore, 1.2, 1.3 genius.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200702022124.l12LOaru019673@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/genius/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19568/FC-5 Modified Files: .cvsignore genius.spec sources Log Message: new version 0.7.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/genius/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Oct 2006 15:44:01 -0000 1.2 +++ .cvsignore 2 Feb 2007 21:24:04 -0000 1.3 @@ -1 +1 @@ -genius-0.7.6.1.tar.gz +genius-0.7.7.tar.gz Index: genius.spec =================================================================== RCS file: /cvs/extras/rpms/genius/FC-5/genius.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- genius.spec 18 Oct 2006 15:44:01 -0000 1.1 +++ genius.spec 2 Feb 2007 21:24:04 -0000 1.2 @@ -1,6 +1,6 @@ Name: genius -Version: 0.7.6.1 -Release: 3%{?dist} +Version: 0.7.7 +Release: 1%{?dist} Summary: An arbitrary precision integer and multiple precision floatingpoint calculator Group: Applications/Engineering @@ -123,6 +123,9 @@ %changelog +* Fri Feb 2 2007 Gerard Milmeister - 0.7.7-1 +- new version 0.7.7 + * Wed Oct 18 2006 Gerard Milmeister - 0.7.6.1-3 - Fixed Req and permissions Index: sources =================================================================== RCS file: /cvs/extras/rpms/genius/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Oct 2006 15:44:01 -0000 1.2 +++ sources 2 Feb 2007 21:24:04 -0000 1.3 @@ -1 +1 @@ -5af450d765dfff8465da47d227333c72 genius-0.7.6.1.tar.gz +f935692cc2642ecebd868c9cf635b13f genius-0.7.7.tar.gz From fedora-extras-commits at redhat.com Fri Feb 2 21:24:38 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Fri, 2 Feb 2007 16:24:38 -0500 Subject: rpms/genius/FC-6 .cvsignore, 1.2, 1.3 genius.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200702022124.l12LOcOH019678@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/genius/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19568/FC-6 Modified Files: .cvsignore genius.spec sources Log Message: new version 0.7.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/genius/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Oct 2006 15:44:01 -0000 1.2 +++ .cvsignore 2 Feb 2007 21:24:06 -0000 1.3 @@ -1 +1 @@ -genius-0.7.6.1.tar.gz +genius-0.7.7.tar.gz Index: genius.spec =================================================================== RCS file: /cvs/extras/rpms/genius/FC-6/genius.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- genius.spec 18 Oct 2006 15:44:01 -0000 1.1 +++ genius.spec 2 Feb 2007 21:24:06 -0000 1.2 @@ -1,6 +1,6 @@ Name: genius -Version: 0.7.6.1 -Release: 3%{?dist} +Version: 0.7.7 +Release: 1%{?dist} Summary: An arbitrary precision integer and multiple precision floatingpoint calculator Group: Applications/Engineering @@ -123,6 +123,9 @@ %changelog +* Fri Feb 2 2007 Gerard Milmeister - 0.7.7-1 +- new version 0.7.7 + * Wed Oct 18 2006 Gerard Milmeister - 0.7.6.1-3 - Fixed Req and permissions Index: sources =================================================================== RCS file: /cvs/extras/rpms/genius/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Oct 2006 15:44:01 -0000 1.2 +++ sources 2 Feb 2007 21:24:06 -0000 1.3 @@ -1 +1 @@ -5af450d765dfff8465da47d227333c72 genius-0.7.6.1.tar.gz +f935692cc2642ecebd868c9cf635b13f genius-0.7.7.tar.gz From fedora-extras-commits at redhat.com Fri Feb 2 21:24:41 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Fri, 2 Feb 2007 16:24:41 -0500 Subject: rpms/genius/devel .cvsignore, 1.2, 1.3 genius.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200702022124.l12LOfsb019683@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/genius/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19568/devel Modified Files: .cvsignore genius.spec sources Log Message: new version 0.7.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/genius/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Oct 2006 15:44:01 -0000 1.2 +++ .cvsignore 2 Feb 2007 21:24:08 -0000 1.3 @@ -1 +1 @@ -genius-0.7.6.1.tar.gz +genius-0.7.7.tar.gz Index: genius.spec =================================================================== RCS file: /cvs/extras/rpms/genius/devel/genius.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- genius.spec 18 Oct 2006 15:44:01 -0000 1.1 +++ genius.spec 2 Feb 2007 21:24:08 -0000 1.2 @@ -1,6 +1,6 @@ Name: genius -Version: 0.7.6.1 -Release: 3%{?dist} +Version: 0.7.7 +Release: 1%{?dist} Summary: An arbitrary precision integer and multiple precision floatingpoint calculator Group: Applications/Engineering @@ -123,6 +123,9 @@ %changelog +* Fri Feb 2 2007 Gerard Milmeister - 0.7.7-1 +- new version 0.7.7 + * Wed Oct 18 2006 Gerard Milmeister - 0.7.6.1-3 - Fixed Req and permissions Index: sources =================================================================== RCS file: /cvs/extras/rpms/genius/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Oct 2006 15:44:01 -0000 1.2 +++ sources 2 Feb 2007 21:24:08 -0000 1.3 @@ -1 +1 @@ -5af450d765dfff8465da47d227333c72 genius-0.7.6.1.tar.gz +f935692cc2642ecebd868c9cf635b13f genius-0.7.7.tar.gz From fedora-extras-commits at redhat.com Fri Feb 2 21:34:45 2007 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 2 Feb 2007 16:34:45 -0500 Subject: rpms/tclsoap/devel tclsoap-1.6.7-version.patch, NONE, 1.1 tclsoap.spec, 1.2, 1.3 Message-ID: <200702022134.l12LYjom019887@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tclsoap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19863 Modified Files: tclsoap.spec Added Files: tclsoap-1.6.7-version.patch Log Message: Fix version mismatch in pkgIndex.tcl; move to a tcl-specific directory. tclsoap-1.6.7-version.patch: --- NEW FILE tclsoap-1.6.7-version.patch --- --- pkgIndex.tcl.orig 2007-02-02 11:43:13.000000000 -0800 +++ pkgIndex.tcl 2007-02-02 11:43:22.000000000 -0800 @@ -12,7 +12,7 @@ package ifneeded SOAP::CGI 1.0 [list source [file join $dir SOAP-CGI.tcl]] package ifneeded SOAP::Domain 1.4 [list source [file join $dir SOAP-domain.tcl]] package ifneeded SOAP::Service 0.4 [list source [file join $dir SOAP-service.tcl]] -package ifneeded SOAP::Utils 1.0 [list source [file join $dir utils.tcl]] +package ifneeded SOAP::Utils 1.0.1 [list source [file join $dir utils.tcl]] package ifneeded SOAP::ftp 1.0 [list source [file join $dir ftp.tcl]] package ifneeded SOAP::http 1.0 [list source [file join $dir http.tcl]] package ifneeded SOAP::https 1.0 [list source [file join $dir https.tcl]] Index: tclsoap.spec =================================================================== RCS file: /cvs/extras/rpms/tclsoap/devel/tclsoap.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tclsoap.spec 29 Aug 2006 02:39:55 -0000 1.2 +++ tclsoap.spec 2 Feb 2007 21:34:12 -0000 1.3 @@ -1,12 +1,15 @@ +%{!?tcl_sitelib: %define tcl_sitelib %{_datadir}/tcl%(echo 'puts $tcl_version' | tclsh)} + Summary: Tcl commands for SOAP remote procedure calls Name: tclsoap Version: 1.6.7 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT URL: http://tclsoap.sourceforge.net/ Group: Development/Libraries Source0: http://download.sourceforge.net/tclsoap/TclSOAP-1.6.7.tar.gz Patch0: tclsoap.patch +Patch1: tclsoap-1.6.7-version.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: tcl @@ -21,10 +24,11 @@ %prep %setup -q -n %{name}%{version} %patch0 -p1 +%patch1 chmod a-x doc/* %build -%configure --libdir=%{_datadir} +%configure --libdir=%{tcl_sitelib} # Nothing to build. Don't run 'make' %install @@ -36,11 +40,15 @@ %files %defattr(-,root,root) -%{_datadir}/%{name}%{version} +%{tcl_sitelib}/%{name}%{version} %doc CHANGES LICENSE DESCRIPTION.txt TclSOAP.ANN %doc doc/* %changelog +* Fri Feb 2 2007 Wart - 1.6.7-3 +- Add patch to fix version mismatch +- Move package to tcl-specific directory + * Mon Aug 28 2006 Wart - 1.6.7-2 - Rebuild for Fedora Extras From fedora-extras-commits at redhat.com Fri Feb 2 22:21:57 2007 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 2 Feb 2007 17:21:57 -0500 Subject: rpms/dxpc/devel Makefile, 1.3, 1.4 dxpc-3.8.2-mandir.patch, 1.2, 1.3 dxpc.spec, 1.13, 1.14 sources, 1.5, 1.6 dead.package, 1.1, NONE Message-ID: <200702022221.l12MLvnK023862@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/dxpc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23836 Added Files: Makefile dxpc-3.8.2-mandir.patch dxpc.spec sources Removed Files: dead.package Log Message: resurrect Index: Makefile =================================================================== RCS file: Makefile diff -N Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Makefile 2 Feb 2007 22:21:24 -0000 1.4 @@ -0,0 +1,21 @@ +# Makefile for source rpm: dxpc +# $Id$ +NAME := dxpc +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) dxpc-3.8.2-mandir.patch: Index: dxpc-3.8.2-mandir.patch =================================================================== RCS file: dxpc-3.8.2-mandir.patch diff -N dxpc-3.8.2-mandir.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ dxpc-3.8.2-mandir.patch 2 Feb 2007 22:21:24 -0000 1.3 @@ -0,0 +1,22 @@ +--- dxpc-3.8.2/Makefile.in.mandir 2002-11-11 12:37:52.000000000 -0600 ++++ dxpc-3.8.2/Makefile.in 2003-06-12 14:10:41.000000000 -0500 +@@ -7,7 +7,7 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + bindir = @bindir@ +-man1dir = @mandir@/man1 ++mandir = @mandir@ + VPATH = @srcdir@ + + INSTALL = @INSTALL@ +@@ -57,8 +57,8 @@ + $(INSTALL) $(TARGET) $(bindir)/$(TARGET) + + install.man: +- $(srcdir)/mkinstalldirs $(man1dir) +- $(INSTALL_DATA) $(TARGET).man $(man1dir)/$(TARGET).1 ++ $(srcdir)/mkinstalldirs $(mandir)/man1 ++ $(INSTALL_DATA) $(TARGET).man $(mandir)/man1/$(TARGET).1 + + clean: + -rm -f *~ *.o $(TARGET) pure_* quant_* *.bak core gmon.out Index: dxpc.spec =================================================================== RCS file: dxpc.spec diff -N dxpc.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ dxpc.spec 2 Feb 2007 22:21:24 -0000 1.14 @@ -0,0 +1,76 @@ + +Summary: Differential X Protocol Compressor +Name: dxpc +Version: 3.9.0 +Release: 1%{?dist} + +# Since dxpc links against GPL'd lzo, changed license from BSD -> GPL +License: GPL +Group: User Interface/X +URL: http://www.vigor.nu/dxpc/ +Source: http://www.vigor.nu/dxpc/%{version}/dxpc-%{version}.tgz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Patch1: dxpc-3.8.2-mandir.patch + +BuildRequires: lzo-devel +%if "%{?fedora}" > "4" +BuildRequires: libXt-devel +%else +BuildRequires: xorg-x11-devel +%endif + +%description +dxpc is an X protocol compressor designed to improve the +speed of X11 applications run over low-bandwidth links +(such as dialup PPP connections). + + +%prep +%setup -q + +%patch1 -p1 -b .mandir + + +%build +%configure + +make %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT +%makeinstall + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc README* CHANGES TODO +%{_bindir}/* +%{_mandir}/man1/* + + +%changelog +* Tue Jul 25 2006 Rex Dieter 3.9.0-1 +- 3.9.0 + +* Wed Mar 1 2006 Rex Dieter +- fc5: gcc/glibc respin + +* Mon Jan 30 2006 Rex Dieter 3.8.2-3 +- drop BR: XFree86-devel (#179283) +- add BR: xorg-x11-devel/libXt-devel (#179283) + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + +* Fri Jul 11 2003 Rex Dieter 0:3.8.2-0.fdr.1 +- BuildRequires: XFree86-devel (fedora bug #381) + +* Tue Jun 17 2003 Rex Dieter 0:3.8.2-0.fdr.0 +- 3.8.2 + Index: sources =================================================================== RCS file: sources diff -N sources --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sources 2 Feb 2007 22:21:24 -0000 1.6 @@ -0,0 +1 @@ +ff8148868271b405a1a67b412e45d4e1 dxpc-3.9.0.tgz --- dead.package DELETED --- From fedora-extras-commits at redhat.com Fri Feb 2 22:27:32 2007 From: fedora-extras-commits at redhat.com (John T. Guthrie III (guthrie)) Date: Fri, 2 Feb 2007 17:27:32 -0500 Subject: rpms/dxpc import.log,1.5,1.6 Message-ID: <200702022227.l12MRWVm023971@cvs-int.fedora.redhat.com> Author: guthrie Update of /cvs/extras/rpms/dxpc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23931 Modified Files: import.log Log Message: auto-import dxpc-3.9.1-0.1.b1.fc6 on branch devel from dxpc-3.9.1-0.1.b1.fc6.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dxpc/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 8 Nov 2004 04:15:35 -0000 1.5 +++ import.log 2 Feb 2007 22:27:00 -0000 1.6 @@ -2,3 +2,4 @@ dxpc-3_8_2-0_fdr_1_rh90:HEAD:dxpc-3.8.2-0.fdr.1.rh90.src.rpm:1099887323 dxpc-3_8_2-0_fdr_1_1:HEAD:dxpc-3.8.2-0.fdr.1.1.src.rpm:1099887329 dxpc-3_8_2-0_fdr_1_2:HEAD:dxpc-3.8.2-0.fdr.1.2.src.rpm:1099887335 +dxpc-3_9_1-0_1_b1_fc6:HEAD:dxpc-3.9.1-0.1.b1.fc6.src.rpm:1170455213 From fedora-extras-commits at redhat.com Fri Feb 2 22:27:34 2007 From: fedora-extras-commits at redhat.com (John T. Guthrie III (guthrie)) Date: Fri, 2 Feb 2007 17:27:34 -0500 Subject: rpms/dxpc/devel dxpc-3.9.0-dxpcssh.patch, NONE, 1.1 dxpc-3.9.0-mandir.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 dxpc.spec, 1.14, 1.15 sources, 1.6, 1.7 dxpc-3.8.2-mandir.patch, 1.3, NONE Message-ID: <200702022227.l12MRYGM023976@cvs-int.fedora.redhat.com> Author: guthrie Update of /cvs/extras/rpms/dxpc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23931/devel Modified Files: .cvsignore dxpc.spec sources Added Files: dxpc-3.9.0-dxpcssh.patch dxpc-3.9.0-mandir.patch Removed Files: dxpc-3.8.2-mandir.patch Log Message: auto-import dxpc-3.9.1-0.1.b1.fc6 on branch devel from dxpc-3.9.1-0.1.b1.fc6.src.rpm dxpc-3.9.0-dxpcssh.patch: --- NEW FILE dxpc-3.9.0-dxpcssh.patch --- --- Makefile.in.dxpcssh 2007-01-22 15:26:16.000000000 -0500 +++ Makefile.in 2007-01-22 22:18:19.000000000 -0500 @@ -26,6 +26,7 @@ $(CXX) $(CPPFLAGS) -c $(CXXFLAGS) $< TARGET= dxpc$(EXEEXT) +TARGETSSH = dxpcssh # The mingw build results in two targets, the console mode and windows mode # app. @@ -69,7 +70,7 @@ depends: makedepend -f Makefile $(SRCS) -install: install.bin install.man +install: install.bin install.man install.scripts install.bin: $(TARGET) $(srcdir)/mkinstalldirs $(bindir) @@ -79,6 +80,10 @@ $(srcdir)/mkinstalldirs $(mandir)/man1 $(INSTALL_DATA) $(TARGET).man $(mandir)/man1/$(TARGET).1 +install.scripts: + $(srcdir)/mkinstalldirs $(mandir)/man1 + $(INSTALL) $(TARGETSSH) $(bindir)/$(TARGETSSH) + clean: -rm -f *~ *.o $(TARGET) pure_* quant_* *.bak core gmon.out dxpc-3.9.0-mandir.patch: --- NEW FILE dxpc-3.9.0-mandir.patch --- --- dxpc-3.9.0/Makefile.in.mandir 2006-02-28 15:46:52.000000000 -0500 +++ dxpc-3.9.0/Makefile.in 2007-01-22 11:02:08.000000000 -0500 @@ -9,7 +9,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ -man1dir = @mandir@/man1 +mandir = @mandir@ VPATH = @srcdir@ INSTALL = @INSTALL@ @@ -76,8 +76,8 @@ $(INSTALL) $(TARGET) $(bindir)/$(TARGET) install.man: - $(srcdir)/mkinstalldirs $(man1dir) - $(INSTALL_DATA) $(TARGET).man $(man1dir)/$(TARGET).1 + $(srcdir)/mkinstalldirs $(mandir)/man1 + $(INSTALL_DATA) $(TARGET).man $(mandir)/man1/$(TARGET).1 clean: -rm -f *~ *.o $(TARGET) pure_* quant_* *.bak core gmon.out Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dxpc/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 25 Jul 2006 22:06:39 -0000 1.3 +++ .cvsignore 2 Feb 2007 22:27:02 -0000 1.4 @@ -1 +1 @@ -dxpc-3.9.0.tgz +dxpc-3.9.1b1.tgz Index: dxpc.spec =================================================================== RCS file: /cvs/extras/rpms/dxpc/devel/dxpc.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- dxpc.spec 2 Feb 2007 22:21:24 -0000 1.14 +++ dxpc.spec 2 Feb 2007 22:27:02 -0000 1.15 @@ -1,19 +1,17 @@ - -Summary: Differential X Protocol Compressor +Summary: A Differential X Protocol Compressor Name: dxpc -Version: 3.9.0 -Release: 1%{?dist} +Version: 3.9.1 +Release: 0.1.b1%{?dist} -# Since dxpc links against GPL'd lzo, changed license from BSD -> GPL -License: GPL -Group: User Interface/X +License: BSD +Group: User Interface/X URL: http://www.vigor.nu/dxpc/ -Source: http://www.vigor.nu/dxpc/%{version}/dxpc-%{version}.tgz +Source: http://www.vigor.nu/dxpc-%{version}b1.tgz +Patch0: dxpc-3.9.0-mandir.patch +Patch1: dxpc-3.9.0-dxpcssh.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: dxpc-3.8.2-mandir.patch - -BuildRequires: lzo-devel +BuildRequires: lzo-devel >= 1.08 %if "%{?fedora}" > "4" BuildRequires: libXt-devel %else @@ -23,40 +21,54 @@ %description dxpc is an X protocol compressor designed to improve the speed of X11 applications run over low-bandwidth links -(such as dialup PPP connections). +(such as dialup PPP connections or ADSL). %prep -%setup -q +%setup -q -n %{name}-%{version}b1 -%patch1 -p1 -b .mandir +%patch0 -p1 -b .mandir +%patch1 -p0 -b .dxpcssh %build -%configure - +%configure make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %makeinstall %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc README* CHANGES TODO +%doc README CHANGES TODO %{_bindir}/* %{_mandir}/man1/* %changelog -* Tue Jul 25 2006 Rex Dieter 3.9.0-1 -- 3.9.0 +* Fri Feb 02 2007 John Guthrie - 3.9.1-0.1.b1 +- Upgraded source code to 3.9.1-0.1.b1 + +* Mon Jan 29 2007 John Guthrie - 3.9.0-3 +- Removed test for %%{buildroot} +- Cleaned up warnings from rpmlint +- Removed README.mingw from the documentation as it had no relevance to + Linux + +* Mon Jan 22 2007 John Guthrie - 3.9.0-3 +- Added patch to Makefile.in to make it install dxpcssh + +* Mon Jan 22 2007 John Guthrie - 3.9.0-2 +- Updated to 3.9.0 +- Added mandir patch that was used in 3.8.2 +- Changed $RPM_BUILD_ROOT to %%{buildroot} in scriptlets for consistency * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin @@ -73,4 +85,3 @@ * Tue Jun 17 2003 Rex Dieter 0:3.8.2-0.fdr.0 - 3.8.2 - Index: sources =================================================================== RCS file: /cvs/extras/rpms/dxpc/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 2 Feb 2007 22:21:24 -0000 1.6 +++ sources 2 Feb 2007 22:27:02 -0000 1.7 @@ -1 +1 @@ -ff8148868271b405a1a67b412e45d4e1 dxpc-3.9.0.tgz +b3ea5af52360a141c2c56182b99c6516 dxpc-3.9.1b1.tgz --- dxpc-3.8.2-mandir.patch DELETED --- From fedora-extras-commits at redhat.com Sat Feb 3 01:24:16 2007 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Fri, 2 Feb 2007 20:24:16 -0500 Subject: rpms/smart/devel .cvsignore, 1.5, 1.6 smart.spec, 1.15, 1.16 sources, 1.6, 1.7 Message-ID: <200702030124.l131OGaf002910@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/smart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2889 Modified Files: .cvsignore smart.spec sources Log Message: Update to 0.50. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/smart/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 1 Sep 2006 22:34:43 -0000 1.5 +++ .cvsignore 3 Feb 2007 01:23:44 -0000 1.6 @@ -1,3 +1,3 @@ -smart-0.42.tar.bz2 +smart-0.50.tar.bz2 +smart-0.50-ccache.patch smart-0.42-autofs5fix.patch -ksmarttray.desktop Index: smart.spec =================================================================== RCS file: /cvs/extras/rpms/smart/devel/smart.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- smart.spec 11 Dec 2006 21:06:46 -0000 1.15 +++ smart.spec 3 Feb 2007 01:23:44 -0000 1.16 @@ -1,9 +1,11 @@ %{!?python_sitearch: %define python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%bcond_with ksmarttray +%bcond_without pygtk Summary: Next generation package handling tool Name: smart -Version: 0.42 -Release: 41%{?dist} +Version: 0.50 +Release: 44%{?dist} License: GPL Group: Applications/System URL: http://labix.org/smart/ @@ -14,24 +16,22 @@ Source4: distro.py Source5: ksmarttray.desktop Patch0: smart-0.42-autofs5fix.patch +Patch1: smart-0.50-ccache.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: python-devel >= 2.3 BuildRequires: desktop-file-utils - -#BuildRequires: autoconf, automake, gettext, gcc-c++ -#BuildRequires: libXt-devel, libXext-devel -#BuildRequires: qt-devel >= 1:3.2, kdelibs-devel -#BuildRequires: zlib-devel -#BuildRequires: kdesdk - +BuildRequires: gettext +%if %{with ksmarttray} +BuildRequires: autoconf, automake, gcc-c++ +BuildRequires: libXt-devel, libXext-devel +BuildRequires: qt-devel >= 1:3.2, kdelibs-devel +BuildRequires: zlib-devel +%endif Requires: python-abi = %(python -c "import sys ; print sys.version[:3]") Requires: rpm-python >= 4.4 - +%{!?with_pygtk:Requires: usermode} Requires: smart-config -Provides: ksmarttray = %{version}-%{release} -Obsoletes: ksmarttray < %{version}-%{release} - %description Smart Package Manager is a next generation package handling tool. @@ -44,6 +44,7 @@ Allows execution of 'smart update' by normal users through a special suid command. +%if %{with pygtk} %package gui Summary: Graphical user interface for the smart package manager Group: Applications/System @@ -54,23 +55,24 @@ %description gui Graphical user interface for the smart package manager. +%endif -#package -n ksmarttray -#Summary: KDE tray program for watching updates with Smart Package Manager -#Group: Applications/System -#Requires: %{_bindir}/kdesu -#Requires: smart-update = %{version}-%{release} -#Requires: smart-gui = %{version}-%{release} -# -#description -n ksmarttray -#KDE tray program for watching updates with Smart Package Manager. +%if %{with ksmarttray} +%package -n ksmarttray +Summary: KDE tray program for watching updates with Smart Package Manager +Group: Applications/System +Requires: %{_bindir}/kdesu +Requires: smart-update = %{version}-%{release} +Requires: smart-gui = %{version}-%{release} + +%description -n ksmarttray +KDE tray program for watching updates with Smart Package Manager. +%endif %prep %setup -q %patch0 -p1 -b .autofs5 -#rm -fr contrib/ksmarttray/admin -#cp -a %{_datadir}/apps/kapptemplate/admin contrib/ksmarttray/admin -#chmod +x contrib/ksmarttray/admin/*.pl +%patch1 -p0 -b .ccache # /usr/lib is hardcoded perl -pi -e's,/usr/lib/,%{_libdir}/,' smart/const.py @@ -79,12 +81,14 @@ export CFLAGS python setup.py build -## ksmarttray -#pushd contrib/ksmarttray -#make -f admin/Makefile.common -#configure --disable-rpath -#make -#popd +%if %{with ksmarttray} +# ksmarttray +pushd contrib/ksmarttray +make -f admin/Makefile.common +%configure --disable-rpath +make +popd +%endif # smart-update make -C contrib/smart-update @@ -97,12 +101,14 @@ mkdir -p %{buildroot}%{_sysconfdir}/smart/channels mkdir -p %{buildroot}%{_localstatedir}/lib/smart{/packages,/channels} -## ksmarttray -#make -C contrib/ksmarttray install DESTDIR=%{buildroot} \ -# iconsdir=%{_datadir}/icons/hicolor/48x48/apps -#desktop-file-install --vendor="" \ -# --dir %{buildroot}%{_datadir}/applications \ -# %{SOURCE5} +%if %{with ksmarttray} +# ksmarttray +make -C contrib/ksmarttray install DESTDIR=%{buildroot} \ + iconsdir=%{_datadir}/icons/hicolor/48x48/apps +desktop-file-install --vendor="" \ + --dir %{buildroot}%{_datadir}/applications \ + %{SOURCE5} +%endif # usermode support ln -sf consolehelper %{buildroot}%{_bindir}/smart-root @@ -163,29 +169,43 @@ %defattr(-,root,root,-) %{_bindir}/smart-update +%if %{with pygtk} %files gui %defattr(-,root,root,-) %{python_sitearch}/smart/interfaces/gtk %{_datadir}/applications/smart.desktop %{_datadir}/icons/hicolor/48x48/apps/smart.png +%else +%exclude %{python_sitearch}/smart/interfaces/gtk +%exclude %{_datadir}/applications/smart.desktop +%exclude %{_datadir}/icons/hicolor/48x48/apps/smart.png +%endif %{_bindir}/smart-root %config %{_sysconfdir}/security/console.apps/smart-root %config %{_sysconfdir}/pam.d/smart-root -#files -n ksmarttray -#defattr(-,root,root,-) -#{_bindir}/ksmarttray -#{_datadir}/apps/ksmarttray -#{_datadir}/applications/ksmarttray.desktop -#{_datadir}/icons/hicolor/48x48/apps/ksmarttray.png +%if %{with ksmarttray} +%files -n ksmarttray +%defattr(-,root,root,-) +%{_bindir}/ksmarttray +%{_datadir}/apps/ksmarttray +%{_datadir}/applications/ksmarttray.desktop +%{_datadir}/icons/hicolor/48x48/apps/ksmarttray.png +%endif %changelog -* Mon Dec 11 2006 Axel Thimm - 0.42-41 -- Deactivate ksmarttray for now. +* Mon Jan 22 2007 Axel Thimm - 0.50-44 +- Add ccache fix from svn trunk. + +* Sun Jan 21 2007 Axel Thimm - 0.50-43 +- gettext is BR'd outside of ksmarttray. + +* Thu Jan 18 2007 Axel Thimm - 0.50-42 +- Update to 0.50. -* Sun Dec 3 2006 Axel Thimm -- Refresh kde admin dir. +* Fri Dec 8 2006 Axel Thimm - 0.50-41_rc1 +- Update to 0.50rc1. * Sat Nov 25 2006 Axel Thimm - 0.42-40 - Start preparing virtual provides for upcoming qt gui. Index: sources =================================================================== RCS file: /cvs/extras/rpms/smart/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 30 Sep 2006 09:29:31 -0000 1.6 +++ sources 3 Feb 2007 01:23:44 -0000 1.7 @@ -1,3 +1,3 @@ -e60b411ad41dbe2e6fc57a04d82f91cb smart-0.42.tar.bz2 -3e758faa20a498f27deabb0f773a923d ksmarttray.desktop +7595df0259829fff64496f1c359a53cf smart-0.50.tar.bz2 +044e7fb260f201b23f6b0554fd70243e smart-0.50-ccache.patch 371a72eff80e2e98e37d29275a1f5e9d smart-0.42-autofs5fix.patch From fedora-extras-commits at redhat.com Sat Feb 3 01:47:29 2007 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Fri, 2 Feb 2007 20:47:29 -0500 Subject: rpms/smart/devel .cvsignore,1.6,1.7 sources,1.7,1.8 Message-ID: <200702030147.l131lTNG003373@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/smart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3354 Modified Files: .cvsignore sources Log Message: ksmarttray.desktop slipped in the previous new-sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/smart/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 3 Feb 2007 01:23:44 -0000 1.6 +++ .cvsignore 3 Feb 2007 01:46:56 -0000 1.7 @@ -1,3 +1,4 @@ smart-0.50.tar.bz2 smart-0.50-ccache.patch smart-0.42-autofs5fix.patch +ksmarttray.desktop Index: sources =================================================================== RCS file: /cvs/extras/rpms/smart/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 3 Feb 2007 01:23:44 -0000 1.7 +++ sources 3 Feb 2007 01:46:57 -0000 1.8 @@ -1,3 +1,4 @@ 7595df0259829fff64496f1c359a53cf smart-0.50.tar.bz2 044e7fb260f201b23f6b0554fd70243e smart-0.50-ccache.patch 371a72eff80e2e98e37d29275a1f5e9d smart-0.42-autofs5fix.patch +3e758faa20a498f27deabb0f773a923d ksmarttray.desktop From fedora-extras-commits at redhat.com Sat Feb 3 02:04:08 2007 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Fri, 2 Feb 2007 21:04:08 -0500 Subject: rpms/bcfg2 - New directory Message-ID: <200702030204.l13248NG006844@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/bcfg2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6839/bcfg2 Log Message: Directory /cvs/extras/rpms/bcfg2 added to the repository From fedora-extras-commits at redhat.com Sat Feb 3 02:04:15 2007 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Fri, 2 Feb 2007 21:04:15 -0500 Subject: rpms/bcfg2/devel - New directory Message-ID: <200702030204.l1324FnK006860@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/bcfg2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6839/bcfg2/devel Log Message: Directory /cvs/extras/rpms/bcfg2/devel added to the repository From fedora-extras-commits at redhat.com Sat Feb 3 02:23:19 2007 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Fri, 2 Feb 2007 21:23:19 -0500 Subject: rpms/smart/devel smart.spec,1.16,1.17 Message-ID: <200702030223.l132NJlh007090@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/smart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7065 Modified Files: smart.spec Log Message: Funny bug - The previous version would make rpm not expand python_sitearch anymore ... (???) Index: smart.spec =================================================================== RCS file: /cvs/extras/rpms/smart/devel/smart.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- smart.spec 3 Feb 2007 01:23:44 -0000 1.16 +++ smart.spec 3 Feb 2007 02:22:47 -0000 1.17 @@ -1,7 +1,8 @@ -%{!?python_sitearch: %define python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %bcond_with ksmarttray %bcond_without pygtk +%{!?python_sitearch: %define python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} + Summary: Next generation package handling tool Name: smart Version: 0.50 From fedora-extras-commits at redhat.com Sat Feb 3 02:33:21 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 2 Feb 2007 21:33:21 -0500 Subject: rpms/liborigin - New directory Message-ID: <200702030233.l132XLlw007296@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/liborigin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7291/liborigin Log Message: Directory /cvs/extras/rpms/liborigin added to the repository From fedora-extras-commits at redhat.com Sat Feb 3 02:33:29 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 2 Feb 2007 21:33:29 -0500 Subject: rpms/liborigin/devel - New directory Message-ID: <200702030233.l132XTOx007310@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/liborigin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7291/liborigin/devel Log Message: Directory /cvs/extras/rpms/liborigin/devel added to the repository From fedora-extras-commits at redhat.com Sat Feb 3 02:41:11 2007 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Fri, 2 Feb 2007 21:41:11 -0500 Subject: rpms/smart/devel smart.spec,1.17,1.18 Message-ID: <200702030241.l132fBiN007486@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/smart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7412 Modified Files: smart.spec Log Message: The previous "fix" only rectified rpm -q --specfile, rpmbuild would still fail to expand %{python_sitearch}. The workaround is to strip off the conditional part of the definition of %{python_sitearch}. I've seen the %{!?foo: %define foo xxx} fail in other occasions, too (always involving using some other non-leaf macro), seems to be some rpm issue. Index: smart.spec =================================================================== RCS file: /cvs/extras/rpms/smart/devel/smart.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- smart.spec 3 Feb 2007 02:22:47 -0000 1.17 +++ smart.spec 3 Feb 2007 02:40:39 -0000 1.18 @@ -1,8 +1,8 @@ +%define python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)") + %bcond_with ksmarttray %bcond_without pygtk -%{!?python_sitearch: %define python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - Summary: Next generation package handling tool Name: smart Version: 0.50 From fedora-extras-commits at redhat.com Sat Feb 3 02:51:25 2007 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 2 Feb 2007 21:51:25 -0500 Subject: rpms/gnupg2/devel .cvsignore, 1.19, 1.20 gnupg2.spec, 1.66, 1.67 sources, 1.21, 1.22 gnupg-2.0.1-CVE-2006-6235.patch, 1.1, NONE Message-ID: <200702030251.l132pP2h007647@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gnupg2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7626 Modified Files: .cvsignore gnupg2.spec sources Removed Files: gnupg-2.0.1-CVE-2006-6235.patch Log Message: * Fri Feb 02 2007 Rex Dieter 2.0.2-1 - gnupg-2.0.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnupg2/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 29 Nov 2006 15:51:16 -0000 1.19 +++ .cvsignore 3 Feb 2007 02:50:53 -0000 1.20 @@ -1,3 +1,3 @@ clog -gnupg-2.0.1.tar.bz2 -gnupg-2.0.1.tar.bz2.sig +gnupg-2.0.2.tar.bz2 +gnupg-2.0.2.tar.bz2.sig Index: gnupg2.spec =================================================================== RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- gnupg2.spec 6 Dec 2006 19:19:10 -0000 1.66 +++ gnupg2.spec 3 Feb 2007 02:50:53 -0000 1.67 @@ -1,7 +1,7 @@ ## Keep an eye on http://bugzilla.redhat.com/175744, ## in case these dirs go away or change -%if "%{?fedora}" > "3" || "%{?rhel}" > "4" +%if 0%{?fedora} > 3 || 0%{?rhel} > 4 %define kde_scriptdir %{_sysconfdir}/kde %else %define kde_scriptdir %{_prefix} @@ -9,8 +9,8 @@ Summary: Utility for secure communication and data storage Name: gnupg2 -Version: 2.0.1 -Release: 2%{?dist} +Version: 2.0.2 +Release: 1%{?dist} License: GPL Group: Applications/System @@ -24,7 +24,6 @@ Source11: gpg-agent-shutdown.sh Patch1: gnupg-1.9.16-testverbose.patch -Patch2: gnupg-2.0.1-CVE-2006-6235.patch Obsoletes: newpg < 0.9.5 @@ -82,14 +81,11 @@ %setup -q -n gnupg-%{version}%{?beta} #patch1 -p1 -b .testverbose -pushd g10 -%patch2 -p0 -b .CVE-2006-6235 -popd # pcsc-lite library major: 0 in 1.2.0, 1 in 1.2.9+ (dlopen()'d in pcsc-wrapper) # Note: this is just the name of the default shared lib to load in scdaemon, # it can use other implementations too (including non-pcsc ones). -%if "%{?fedora}" > "3" +%if 0%{?fedora} > 3 || 0%{?rhel} > 4 %global pcsclib %(basename $(ls -1 %{_libdir}/libpcsclite.so.? 2>/dev/null ) 2>/dev/null ) %else %define pcsclib libpcsclite.so.0 @@ -181,12 +177,15 @@ %changelog +* Fri Feb 02 2007 Rex Dieter 2.0.2-1 +- gnupg-2.0.2 + * Wed Dec 06 2006 Rex Dieter 2.0.1-2 -- CVE-2006-6235 +- CVE-2006-6235 (#219934) * Wed Nov 29 2006 Rex Dieter 2.0.1-1 - gnupg-2.0.1 -- CVE-2006-6169 (bug #217950) +- CVE-2006-6169 (#217950) * Sat Nov 25 2006 Rex Dieter 2.0.1-0.3.rc1 - gnupg-2.0.1rc1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnupg2/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 29 Nov 2006 15:51:16 -0000 1.21 +++ sources 3 Feb 2007 02:50:53 -0000 1.22 @@ -1,2 +1,2 @@ -eb24e258db73f4cb53a3ce18375efa21 gnupg-2.0.1.tar.bz2 -58b1bbc2f34c0882ab1a49542a8ffd45 gnupg-2.0.1.tar.bz2.sig +a2bde7013f6fa047e617088bbdc29d7b gnupg-2.0.2.tar.bz2.sig +9f972c78135a7dea1bae66bb9f263980 gnupg-2.0.2.tar.bz2 --- gnupg-2.0.1-CVE-2006-6235.patch DELETED --- From fedora-extras-commits at redhat.com Sat Feb 3 03:32:41 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 2 Feb 2007 22:32:41 -0500 Subject: rpms/dolphin - New directory Message-ID: <200702030332.l133WfjA011366@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/dolphin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11361/dolphin Log Message: Directory /cvs/extras/rpms/dolphin added to the repository From fedora-extras-commits at redhat.com Sat Feb 3 03:32:49 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 2 Feb 2007 22:32:49 -0500 Subject: rpms/dolphin/devel - New directory Message-ID: <200702030332.l133WnjU011380@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/dolphin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11361/dolphin/devel Log Message: Directory /cvs/extras/rpms/dolphin/devel added to the repository From fedora-extras-commits at redhat.com Sat Feb 3 04:39:26 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 2 Feb 2007 23:39:26 -0500 Subject: rpms/xscreensaver/devel xscreensaver.spec,1.34,1.35 Message-ID: <200702030439.l134dQOM015212@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xscreensaver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15175 Modified Files: xscreensaver.spec Log Message: * Sat Feb 3 2007 Mamoru Tasaka - 1:5.01-6 - Make hack packages require base package (#227017) - Create xscreensaver metapackage Index: xscreensaver.spec =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- xscreensaver.spec 21 Nov 2006 09:01:11 -0000 1.34 +++ xscreensaver.spec 3 Feb 2007 04:38:54 -0000 1.35 @@ -2,7 +2,7 @@ %define version 5.01 %define beta_ver %{nil} -%define fedora_rel 5 +%define fedora_rel 6 %define default_text %{_datadir}/eula/eula.en_US @@ -27,13 +27,18 @@ Patch8: xscreensaver-5.00b5-include-directory.patch Patch21: xscreensaver-5.01-webcollage-default-nonet.patch Patch114: xscreensaver-5.01a1-pam-popup-passwindow.patch +Requires: xscreensaver-base = %{epoch}:%{version}-%{release} +Requires: xscreensaver-extras = %{epoch}:%{version}-%{release} +Requires: xscreensaver-gl-extras = %{epoch}:%{version}-%{release} %package base Summary: A minimal installation of xscreensaver Group: Amusements/Graphics BuildRequires: gettext BuildRequires: desktop-file-utils +%if %{allow_non_passwd} BuildRequires: autoconf >= %{autoconf_ver} +%endif BuildRequires: sed BuildRequires: libtool BuildRequires: bc @@ -52,13 +57,12 @@ Requires: /etc/pam.d/system-auth Requires: pam > %{pam_ver} Requires: xorg-x11-resutils -Provides: xscreensaver = %{epoch}:%{version}-%{release} -Obsoletes: xscreensaver %package extras Summary: An enhanced set of screensavers Group: Amusements/Graphics BuildRequires: desktop-backgrounds-basic +Requires: xscreensaver-base %package gl-extras Summary: An enhanced set of screensavers that require OpenGL @@ -66,6 +70,7 @@ Provides: xscreensaver-gl = %{epoch}:%{version}-%{release} Obsoletes: xscreensaver-gl BuildRequires: libGLU-devel, libGL-devel +Requires: xscreensaver-base %package extras-gss Summary: Desktop files of extras for gnome-screensaver @@ -84,10 +89,16 @@ A modular screen saver and locker for the X Window System. More than 200 display modes are included in this package. +This is a metapackage for installing all default packages +related to XScreenSaver. + %description -l fr Un ??conomiseur d'??cran modulaire pour le syst??me X Window. Plus de 200 modes d'affichages sont inclus dans ce paquet. +This is a metapackage for installing all default packages +related to XScreenSaver. + %description base A modular screen saver and locker for the X Window System. This package contains the bare minimum needed to blank and @@ -233,7 +244,9 @@ fi %build +%if %{allow_non_passwd} autoconf +%endif archdir=`./config.guess` mkdir $archdir cd $archdir @@ -398,6 +411,9 @@ %clean rm -rf ${RPM_BUILD_ROOT} +%files +%defattr(-,root,root) + %files -f base.files base %defattr(-,root,root) @@ -414,6 +430,10 @@ %defattr(-,root,root) %changelog +* Sat Feb 3 2007 Mamoru Tasaka - 1:5.01-6 +- Make hack packages require base package (#227017) +- Create xscreensaver metapackage + * Mon Nov 20 2006 Mamoru Tasaka - 1:5.01-5 - Require xorg-x11-resutils (#216245) From fedora-extras-commits at redhat.com Sat Feb 3 04:39:35 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 2 Feb 2007 23:39:35 -0500 Subject: rpms/xscreensaver/FC-6 xscreensaver.spec,1.34,1.35 Message-ID: <200702030439.l134dZQh015244@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xscreensaver/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15195 Modified Files: xscreensaver.spec Log Message: * Sat Feb 3 2007 Mamoru Tasaka - 1:5.01-6 - Make hack packages require base package (#227017) - Create xscreensaver metapackage Index: xscreensaver.spec =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/FC-6/xscreensaver.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- xscreensaver.spec 21 Nov 2006 09:05:38 -0000 1.34 +++ xscreensaver.spec 3 Feb 2007 04:39:03 -0000 1.35 @@ -2,7 +2,7 @@ %define version 5.01 %define beta_ver %{nil} -%define fedora_rel 5 +%define fedora_rel 6 %define default_text %{_datadir}/eula/eula.en_US @@ -27,13 +27,18 @@ Patch8: xscreensaver-5.00b5-include-directory.patch Patch21: xscreensaver-5.01-webcollage-default-nonet.patch Patch114: xscreensaver-5.01a1-pam-popup-passwindow.patch +Requires: xscreensaver-base = %{epoch}:%{version}-%{release} +Requires: xscreensaver-extras = %{epoch}:%{version}-%{release} +Requires: xscreensaver-gl-extras = %{epoch}:%{version}-%{release} %package base Summary: A minimal installation of xscreensaver Group: Amusements/Graphics BuildRequires: gettext BuildRequires: desktop-file-utils +%if %{allow_non_passwd} BuildRequires: autoconf >= %{autoconf_ver} +%endif BuildRequires: sed BuildRequires: libtool BuildRequires: bc @@ -52,13 +57,12 @@ Requires: /etc/pam.d/system-auth Requires: pam > %{pam_ver} Requires: xorg-x11-resutils -Provides: xscreensaver = %{epoch}:%{version}-%{release} -Obsoletes: xscreensaver %package extras Summary: An enhanced set of screensavers Group: Amusements/Graphics BuildRequires: desktop-backgrounds-basic +Requires: xscreensaver-base %package gl-extras Summary: An enhanced set of screensavers that require OpenGL @@ -66,6 +70,7 @@ Provides: xscreensaver-gl = %{epoch}:%{version}-%{release} Obsoletes: xscreensaver-gl BuildRequires: libGLU-devel, libGL-devel +Requires: xscreensaver-base %package extras-gss Summary: Desktop files of extras for gnome-screensaver @@ -84,10 +89,16 @@ A modular screen saver and locker for the X Window System. More than 200 display modes are included in this package. +This is a metapackage for installing all default packages +related to XScreenSaver. + %description -l fr Un ??conomiseur d'??cran modulaire pour le syst??me X Window. Plus de 200 modes d'affichages sont inclus dans ce paquet. +This is a metapackage for installing all default packages +related to XScreenSaver. + %description base A modular screen saver and locker for the X Window System. This package contains the bare minimum needed to blank and @@ -233,7 +244,9 @@ fi %build +%if %{allow_non_passwd} autoconf +%endif archdir=`./config.guess` mkdir $archdir cd $archdir @@ -398,6 +411,9 @@ %clean rm -rf ${RPM_BUILD_ROOT} +%files +%defattr(-,root,root) + %files -f base.files base %defattr(-,root,root) @@ -414,6 +430,10 @@ %defattr(-,root,root) %changelog +* Sat Feb 3 2007 Mamoru Tasaka - 1:5.01-6 +- Make hack packages require base package (#227017) +- Create xscreensaver metapackage + * Mon Nov 20 2006 Mamoru Tasaka - 1:5.01-5 - Require xorg-x11-resutils (#216245) From fedora-extras-commits at redhat.com Sat Feb 3 05:17:02 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sat, 3 Feb 2007 00:17:02 -0500 Subject: rpms/kazehakase/devel kazehakase.spec,1.1,1.2 Message-ID: <200702030517.l135H20X018736@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/kazehakase/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18712 Modified Files: kazehakase.spec Log Message: * Sat Feb 3 2007 Mamoru Tasaka - 0.4.4.1-2 - Remove -Werror staff Index: kazehakase.spec =================================================================== RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kazehakase.spec 2 Feb 2007 15:56:51 -0000 1.1 +++ kazehakase.spec 3 Feb 2007 05:16:29 -0000 1.2 @@ -1,16 +1,16 @@ -# FC5 has other dependency. -# For now this spec file is for FC7/6. - %if 0%{?fedora} == 7 %define FFver 2.0.0.1 %endif %if 0%{?fedora} == 6 %define FFver 1.5.0.9 %endif +%if 0%{?fedora} == 5 +%define SMver 1.0.7 +%endif Name: kazehakase Version: 0.4.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Kazehakase browser Group: Applications/Internet @@ -21,7 +21,6 @@ BuildRequires: anthy-devel BuildRequires: expat-devel -BuildRequires: firefox-devel %{?FFver:= %{FFver}} BuildRequires: gnutls-devel BuildRequires: gtk2-devel BuildRequires: libSM-devel @@ -29,7 +28,14 @@ BuildRequires: desktop-file-utils BuildRequires: gettext +%if 0%{?fedora} == 5 +BuildRequires: seamonkey-devel %{?SMver:= %{SMver}} +BuildRequires: seamonkey %{?SMver:= %{SMver}} +Requires: seamonkey %{?SMver:= %{SMver}} +%else +BuildRequires: firefox-devel %{?FFver:= %{FFver}} Requires: firefox %{?FFver:= %{FFver}} +%endif %description Kazehakase is a Web browser which aims to provide @@ -38,13 +44,13 @@ %prep %setup -q -# -Werror causes configure option detection failure. -%{__sed} -i -e '/^CPPFLAGS/s|-Werror||' configure - %build -%configure --with-gecko-engine=firefox -# Removing -Werror ignores signedness difference -echo "#undef MOZ_NSIHELPERAPPLAUNCHERDIALOG_NSPRBOOL_" >> config.h +%configure \ +%if 0%{?fedora} == 5 + --with-gecko-engine=seamonkey +%else + --with-gecko-engine=firefox +%endif %{__make} %{?_smp_mflags} @@ -92,6 +98,9 @@ %{_mandir}/man1/%{name}.1* %changelog +* Sat Feb 3 2007 Mamoru Tasaka - 0.4.4.1-2 +- Remove -Werror staff + * Fri Feb 2 2007 Mamoru Tasaka - 0.4.4.1-1 - 0.4.4.1 From fedora-extras-commits at redhat.com Sat Feb 3 05:36:03 2007 From: fedora-extras-commits at redhat.com (Garrick Staples (garrick)) Date: Sat, 3 Feb 2007 00:36:03 -0500 Subject: rpms/torque/devel torque.spec,1.18,1.19 Message-ID: <200702030536.l135a3pq018915@cvs-int.fedora.redhat.com> Author: garrick Update of /cvs/extras/rpms/torque/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18891 Modified Files: torque.spec Log Message: * Fri Feb 2 2007 Garrick Staples 2.1.6-2 - rebuild for tcl8.5 Index: torque.spec =================================================================== RCS file: /cvs/extras/rpms/torque/devel/torque.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- torque.spec 25 Oct 2006 00:33:38 -0000 1.18 +++ torque.spec 3 Feb 2007 05:35:30 -0000 1.19 @@ -3,7 +3,7 @@ %define name torque %define version 2.1.6 #%%define snap 200604251602 -%define release 1 +%define release 2 # The following options are supported: # --with server_name=hostname @@ -403,6 +403,9 @@ %changelog +* Fri Feb 2 2007 Garrick Staples 2.1.6-2 +- rebuild for tcl8.5 + * Tue Oct 24 2006 Garrick Staples 2.1.6-1 - fixes more regressions from Friday From fedora-extras-commits at redhat.com Sat Feb 3 12:45:37 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 3 Feb 2007 07:45:37 -0500 Subject: rpms/kshutdown import.log,1.4,1.5 Message-ID: <200702031245.l13Cjbb4019207@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/kshutdown In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19167 Modified Files: import.log Log Message: auto-import kshutdown-0.9.1beta-2 on branch devel from kshutdown-0.9.1beta-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/kshutdown/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 13 Jan 2007 14:33:35 -0000 1.4 +++ import.log 3 Feb 2007 12:45:05 -0000 1.5 @@ -1,3 +1,4 @@ kshutdown-0_8_2-5:HEAD:kshutdown-0.8.2-5.src.rpm:1157883343 kshutdown-0_9_1beta-1:FC-6:kshutdown-0.9.1beta-1.src.rpm:1168699076 kshutdown-0_9_1beta-1:HEAD:kshutdown-0.9.1beta-1.src.rpm:1168699172 +kshutdown-0_9_1beta-2:HEAD:kshutdown-0.9.1beta-2.src.rpm:1170506731 From fedora-extras-commits at redhat.com Sat Feb 3 12:45:39 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 3 Feb 2007 07:45:39 -0500 Subject: rpms/kshutdown/devel kshutdown.spec,1.2,1.3 Message-ID: <200702031245.l13CjdVY019210@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/kshutdown/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19167/devel Modified Files: kshutdown.spec Log Message: auto-import kshutdown-0.9.1beta-2 on branch devel from kshutdown-0.9.1beta-2.src.rpm Index: kshutdown.spec =================================================================== RCS file: /cvs/extras/rpms/kshutdown/devel/kshutdown.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kshutdown.spec 13 Jan 2007 14:33:35 -0000 1.2 +++ kshutdown.spec 3 Feb 2007 12:45:07 -0000 1.3 @@ -1,6 +1,6 @@ Name: kshutdown Version: 0.9.1beta -Release: 1%{?dist} +Release: 2%{?dist} Summary: KShutDown is an advanced shut down utility for KDE Group: Applications/System @@ -32,7 +32,7 @@ --delete-original \ %{buildroot}%{_datadir}/applications/%{name}.desktop -#%{__rm} -f %{buildroot}%{_docdir}/HTML/??/%{name}/common + %{__rm} -f %{buildroot}%{_datadir}/apps/%{name}/extras/{multimedia,system,shutdown}/.directory ## File lists @@ -72,7 +72,7 @@ %doc AUTHORS COPYING NEWS README TODO VERSION %{_bindir}/%{name} -%exclude %{_libdir}/kde3/%{name}lockout_panelapplet.la +%{_libdir}/kde3/%{name}lockout_panelapplet.la %{_libdir}/kde3/%{name}lockout_panelapplet.so %{_datadir}/applications/%{name}.desktop %{_datadir}/apps/%{name} @@ -82,6 +82,9 @@ %Changelog +* Sat Feb 03 2007 Chitlesh Goorah 0.9.1beta-2 +- bug fix #224430 + * Wed Jan 10 2007 Chitlesh Goorah 0.9.1beta-1 - New upstream development release 0.9.1beta - Dropped fedora vendor From fedora-extras-commits at redhat.com Sat Feb 3 12:46:58 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 3 Feb 2007 07:46:58 -0500 Subject: rpms/kshutdown import.log,1.5,1.6 Message-ID: <200702031246.l13Ckwur019300@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/kshutdown In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19265 Modified Files: import.log Log Message: auto-import kshutdown-0.9.1beta-2 on branch FC-6 from kshutdown-0.9.1beta-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/kshutdown/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 3 Feb 2007 12:45:05 -0000 1.5 +++ import.log 3 Feb 2007 12:46:26 -0000 1.6 @@ -2,3 +2,4 @@ kshutdown-0_9_1beta-1:FC-6:kshutdown-0.9.1beta-1.src.rpm:1168699076 kshutdown-0_9_1beta-1:HEAD:kshutdown-0.9.1beta-1.src.rpm:1168699172 kshutdown-0_9_1beta-2:HEAD:kshutdown-0.9.1beta-2.src.rpm:1170506731 +kshutdown-0_9_1beta-2:FC-6:kshutdown-0.9.1beta-2.src.rpm:1170506811 From fedora-extras-commits at redhat.com Sat Feb 3 12:47:00 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 3 Feb 2007 07:47:00 -0500 Subject: rpms/kshutdown/FC-6 kshutdown.spec,1.2,1.3 Message-ID: <200702031247.l13Cl05j019303@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/kshutdown/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19265/FC-6 Modified Files: kshutdown.spec Log Message: auto-import kshutdown-0.9.1beta-2 on branch FC-6 from kshutdown-0.9.1beta-2.src.rpm Index: kshutdown.spec =================================================================== RCS file: /cvs/extras/rpms/kshutdown/FC-6/kshutdown.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kshutdown.spec 13 Jan 2007 14:32:01 -0000 1.2 +++ kshutdown.spec 3 Feb 2007 12:46:28 -0000 1.3 @@ -1,6 +1,6 @@ Name: kshutdown Version: 0.9.1beta -Release: 1%{?dist} +Release: 2%{?dist} Summary: KShutDown is an advanced shut down utility for KDE Group: Applications/System @@ -32,7 +32,7 @@ --delete-original \ %{buildroot}%{_datadir}/applications/%{name}.desktop -#%{__rm} -f %{buildroot}%{_docdir}/HTML/??/%{name}/common + %{__rm} -f %{buildroot}%{_datadir}/apps/%{name}/extras/{multimedia,system,shutdown}/.directory ## File lists @@ -72,7 +72,7 @@ %doc AUTHORS COPYING NEWS README TODO VERSION %{_bindir}/%{name} -%exclude %{_libdir}/kde3/%{name}lockout_panelapplet.la +%{_libdir}/kde3/%{name}lockout_panelapplet.la %{_libdir}/kde3/%{name}lockout_panelapplet.so %{_datadir}/applications/%{name}.desktop %{_datadir}/apps/%{name} @@ -82,6 +82,9 @@ %Changelog +* Sat Feb 03 2007 Chitlesh Goorah 0.9.1beta-2 +- bug fix #224430 + * Wed Jan 10 2007 Chitlesh Goorah 0.9.1beta-1 - New upstream development release 0.9.1beta - Dropped fedora vendor From fedora-extras-commits at redhat.com Sat Feb 3 12:48:23 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 3 Feb 2007 07:48:23 -0500 Subject: rpms/kshutdown import.log,1.6,1.7 Message-ID: <200702031248.l13CmNX6019400@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/kshutdown In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19365 Modified Files: import.log Log Message: auto-import kshutdown-0.9.1beta-2 on branch FC-5 from kshutdown-0.9.1beta-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/kshutdown/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 3 Feb 2007 12:46:26 -0000 1.6 +++ import.log 3 Feb 2007 12:47:50 -0000 1.7 @@ -3,3 +3,4 @@ kshutdown-0_9_1beta-1:HEAD:kshutdown-0.9.1beta-1.src.rpm:1168699172 kshutdown-0_9_1beta-2:HEAD:kshutdown-0.9.1beta-2.src.rpm:1170506731 kshutdown-0_9_1beta-2:FC-6:kshutdown-0.9.1beta-2.src.rpm:1170506811 +kshutdown-0_9_1beta-2:FC-5:kshutdown-0.9.1beta-2.src.rpm:1170506897 From fedora-extras-commits at redhat.com Sat Feb 3 12:48:25 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 3 Feb 2007 07:48:25 -0500 Subject: rpms/kshutdown/FC-5 .cvsignore, 1.2, 1.3 kshutdown.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200702031248.l13CmPIs019405@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/kshutdown/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19365/FC-5 Modified Files: .cvsignore kshutdown.spec sources Log Message: auto-import kshutdown-0.9.1beta-2 on branch FC-5 from kshutdown-0.9.1beta-2.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kshutdown/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 Sep 2006 10:11:36 -0000 1.2 +++ .cvsignore 3 Feb 2007 12:47:53 -0000 1.3 @@ -1 +1 @@ -kshutdown-0.8.2.tar.bz2 +kshutdown-0.9.1beta.tar.bz2 Index: kshutdown.spec =================================================================== RCS file: /cvs/extras/rpms/kshutdown/FC-5/kshutdown.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kshutdown.spec 10 Sep 2006 10:11:36 -0000 1.1 +++ kshutdown.spec 3 Feb 2007 12:47:53 -0000 1.2 @@ -1,12 +1,14 @@ Name: kshutdown -Version: 0.8.2 -Release: 5%{?dist} +Version: 0.9.1beta +Release: 2%{?dist} Summary: KShutDown is an advanced shut down utility for KDE Group: Applications/System License: GPL + URL: http://kshutdown.sourceforge.net/ Source: http://dl.sourceforge.net/sourceforge/kshutdown/kshutdown-%{version}.tar.bz2 + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils, kdelibs-devel @@ -18,57 +20,77 @@ %build %configure --disable-rpath -make %{?_smp_mflags} +%{__make} %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT - -desktop-file-install --vendor fedora \ - --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - --add-category X-Fedora \ - --add-category Application \ - --add-category Utility \ - --add-category KDE \ - --add-category Qt \ - --delete-original \ - ${RPM_BUILD_ROOT}%{_datadir}/applications/kshutdown.desktop +%{__rm} -rf %{buildroot} +%{__make} install DESTDIR=%{buildroot} -rm -f $RPM_BUILD_ROOT%{_docdir}/HTML/??/%{name}/common -rm -f $RPM_BUILD_ROOT%{_datadir}/apps/%{name}/extras/{multimedia,system,shutdown}/.directory - -%find_lang %{name} +desktop-file-install --vendor "" \ + --dir %{buildroot}%{_datadir}/applications \ + --add-category Utility \ + --delete-original \ + %{buildroot}%{_datadir}/applications/%{name}.desktop + + +%{__rm} -f %{buildroot}%{_datadir}/apps/%{name}/extras/{multimedia,system,shutdown}/.directory + +## File lists +# locale's +%find_lang %{name} || touch %{name}.lang +# HTML (1.0) +HTML_DIR=$(kde-config --expandvars --install html) +if [ -d %{buildroot}$HTML_DIR ]; then +for lang_dir in %{buildroot}$HTML_DIR/* ; do + if [ -d $lang_dir ]; then + lang=$(basename $lang_dir) + echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang + # replace absolute symlinks with relative ones + pushd $lang_dir + for i in *; do + [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common + done + popd + fi +done +fi %post touch --no-create %{_datadir}/icons/hicolor || : -if [ -x ${_bindir}/gtk-update-icon-cache ] ; then - ${_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %postun touch --no-create %{_datadir}/icons/hicolor || : -if [ -x ${_bindir}/gtk-update-icon-cache ] ; then - ${_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf %{buildroot} %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README TODO VERSION -%{_bindir}/kshutdown -%exclude %{_libdir}/kde3/kshutdownlockout_panelapplet.la -%{_libdir}/kde3/kshutdownlockout_panelapplet.so -%{_datadir}/applications/fedora-kshutdown.desktop -%{_datadir}/apps/kshutdown +%{_bindir}/%{name} +%{_libdir}/kde3/%{name}lockout_panelapplet.la +%{_libdir}/kde3/%{name}lockout_panelapplet.so +%{_datadir}/applications/%{name}.desktop +%{_datadir}/apps/%{name} %{_datadir}/apps/kconf_update/kshutdown.upd -%{_datadir}/apps/kicker/applets/kshutdownlockout.desktop -%{_datadir}/icons/hicolor/??x??/apps/kshutdown.png -%{_datadir}/doc/HTML/??/kshutdown +%{_datadir}/apps/kicker/applets/%{name}lockout.desktop +%{_datadir}/icons/hicolor/??x??/apps/%{name}.png + %Changelog +* Sat Feb 03 2007 Chitlesh Goorah 0.9.1beta-2 +- bug fix #224430 + +* Wed Jan 10 2007 Chitlesh Goorah 0.9.1beta-1 +- New upstream development release 0.9.1beta +- Dropped fedora vendor +- Minor fixes in the spec files +- Fixed absolute paths + * Sun Sep 10 2006 Chitlesh Goorah 0.8.2-5 - Added %%{?dist} Index: sources =================================================================== RCS file: /cvs/extras/rpms/kshutdown/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 Sep 2006 10:11:36 -0000 1.2 +++ sources 3 Feb 2007 12:47:53 -0000 1.3 @@ -1 +1 @@ -6acd45acc5c0669b0973f0246e4bcca7 kshutdown-0.8.2.tar.bz2 +44bd0ff7c6fae44eb24831ebf8446954 kshutdown-0.9.1beta.tar.bz2 From fedora-extras-commits at redhat.com Sat Feb 3 13:13:38 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 3 Feb 2007 08:13:38 -0500 Subject: rpms/xcircuit import.log,1.9,1.10 Message-ID: <200702031313.l13DDcSk023197@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/xcircuit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23139 Modified Files: import.log Log Message: auto-import xcircuit-3.4.26-18 on branch FC-5 from xcircuit-3.4.26-18.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/xcircuit/import.log,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- import.log 30 Aug 2006 17:51:49 -0000 1.9 +++ import.log 3 Feb 2007 13:13:06 -0000 1.10 @@ -6,3 +6,4 @@ xcircuit-3_4_26-13:FC-5:xcircuit-3.4.26-13.src.rpm:1156626552 xcircuit-3_4_26-14:FC-5:xcircuit-3.4.26-14.src.rpm:1156628462 xcircuit-3_4_26-17:HEAD:xcircuit-3.4.26-17.src.rpm:1156960519 +xcircuit-3_4_26-18:FC-5:xcircuit-3.4.26-18.src.rpm:1170508411 From fedora-extras-commits at redhat.com Sat Feb 3 13:13:40 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Sat, 3 Feb 2007 08:13:40 -0500 Subject: rpms/skencil/FC-6 skencil-0.6.17-fonts.patch, NONE, 1.1 skencil.spec, 1.12, 1.13 skencil-python2.4.patch, 1.1, NONE Message-ID: <200702031313.l13DDepP023200@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/skencil/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23150 Modified Files: skencil.spec Added Files: skencil-0.6.17-fonts.patch Removed Files: skencil-python2.4.patch Log Message: fix font paths skencil-0.6.17-fonts.patch: --- NEW FILE skencil-0.6.17-fonts.patch --- --- skencil-0.6.17/Sketch/Base/config.py.fonts 2007-02-03 14:03:36.000000000 +0100 +++ skencil-0.6.17/Sketch/Base/config.py 2007-02-03 14:09:52.000000000 +0100 @@ -61,8 +61,10 @@ # # On platforms other than Linux this probably needs a few additional # directories. (non-existing dirs are automatically removed) -font_path = ['/usr/X11R6/lib/X11/fonts/Type1', - '/usr/share/ghostscript/fonts', +font_path = ['/usr/share/X11/fonts/Type1', + '/usr/share/fonts/default/Type1', + '/usr/share/fonts/default/ghostscript', + '/usr/X11R6/lib/X11/fonts/Type1', '/usr/lib/ghostscript/fonts'] Index: skencil.spec =================================================================== RCS file: /cvs/extras/rpms/skencil/FC-6/skencil.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- skencil.spec 28 Aug 2006 09:20:12 -0000 1.12 +++ skencil.spec 3 Feb 2007 13:13:07 -0000 1.13 @@ -1,6 +1,6 @@ Name: skencil Version: 0.6.17 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Vector drawing program @@ -9,6 +9,7 @@ URL: http://www.skencil.org Source0: http://dl.sf.net/sketch/skencil-0.6.17.tar.gz Source1: skencil-logo.png +Patch0: skencil-0.6.17-fonts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel @@ -22,6 +23,9 @@ Requires: tkinter Requires: python-imaging Requires: PyXML +Requires: xorg-x11-fonts-Type1 +Requires: urw-fonts +Requires: ghostscript-fonts Requires(post): shared-mime-info, desktop-file-utils Requires(postun): shared-mime-info, desktop-file-utils @@ -36,6 +40,7 @@ %prep %setup -q +%patch0 -p1 grep -rl lib/ . | xargs perl -pi -e's,lib/,%{_lib}/,g' grep -rl lib\' . | xargs perl -pi -es,lib\',%{_lib}\',g @@ -110,6 +115,9 @@ %changelog +* Sat Feb 3 2007 Gerard Milmeister - 0.6.17-9 +- fix font paths + * Mon Aug 28 2006 Gerard Milmeister - 0.6.17-8 - Rebuild for FE6 --- skencil-python2.4.patch DELETED --- From fedora-extras-commits at redhat.com Sat Feb 3 13:13:41 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 3 Feb 2007 08:13:41 -0500 Subject: rpms/xcircuit/FC-5 xcircuit.desktop, 1.1, 1.2 xcircuit.spec, 1.9, 1.10 xcircuit-3.4.26-LIBTOOL.patch, 1.1, NONE Message-ID: <200702031313.l13DDfJP023204@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/xcircuit/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23139/FC-5 Modified Files: xcircuit.desktop xcircuit.spec Removed Files: xcircuit-3.4.26-LIBTOOL.patch Log Message: auto-import xcircuit-3.4.26-18 on branch FC-5 from xcircuit-3.4.26-18.src.rpm Index: xcircuit.desktop =================================================================== RCS file: /cvs/extras/rpms/xcircuit/FC-5/xcircuit.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xcircuit.desktop 26 Aug 2006 15:39:55 -0000 1.1 +++ xcircuit.desktop 3 Feb 2007 13:13:09 -0000 1.2 @@ -6,5 +6,5 @@ Type=Application Terminal=false GenericName=xcircuit -Categories=Education;Science;X-Fedora;Engineering; +Categories=Qt;KDE;Education;Science; X-Desktop-File-Install-Version=0.10 \ No newline at end of file Index: xcircuit.spec =================================================================== RCS file: /cvs/extras/rpms/xcircuit/FC-5/xcircuit.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xcircuit.spec 27 Aug 2006 04:50:04 -0000 1.9 +++ xcircuit.spec 3 Feb 2007 13:13:09 -0000 1.10 @@ -1,6 +1,6 @@ Name: xcircuit Version: 3.4.26 -Release: 16%{?dist} +Release: 18%{?dist} Summary: Electronic circuit schematic drawing program License: GPL @@ -12,15 +12,11 @@ # http://opencircuitdesign.com/xcircuit/archive/xcircuit.xpm as 64x64 Source2: %{name}.png -Patch0: xcircuit-3.4.26-LIBTOOL.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: tcl-devel, tk-devel, desktop-file-utils, libtool, libXt-devel, zlib-devel, libXpm-devel -Requires: tcl, tk -Requires(post): %{_bindir}/gtk-update-icon-cache -Requires(post): %{_bindir}/update-desktop-database -Requires(postun): %{_bindir}/gtk-update-icon-cache -Requires(postun): %{_bindir}/update-desktop-database +BuildRequires: tk-devel, desktop-file-utils, libtool, libXt-devel, m4 +BuildRequires: ghostscript-devel, ngspice, libXpm-devel, zlib-devel +Requires: tk %description Xcircuit is a general-purpose drawing program and also a specific-purpose @@ -28,7 +24,6 @@ %prep %setup -q -%patch0 -p0 -b configure.in %build %{__libtoolize} --force --copy @@ -36,63 +31,94 @@ %{__automake} --add-missing %{__autoconf} + if [ -d %{_prefix}/lib64 ] ; then SUF=64 else SUF= fi + +WISH=/usr/bin/wish +export WISH + + %configure \ - --with-tcl=%{_prefix}/lib$SUF --with-tk=%{_prefix}/lib$SUF \ - --with-tcllibs=%{_prefix}/lib$SUF --with-tklibs=%{_prefix}/lib$SUF + --with-tcl=%{_prefix}/lib$SUF \ + --with-tk=%{_prefix}/lib$SUF \ + --with-tcllibs=%{_prefix}/lib$SUF \ + --with-tklibs=%{_prefix}/lib$SUF + + %{__make} %{?_smp_mflags} + %install %{__rm} -rf %{buildroot} %{__rm} %{_builddir}/%{name} -%{__make} DESTDIR=%{buildroot} install + +%{__make} INSTALL="install -p" DESTDIR=%{buildroot} install %{__make} install-man mandir="%{buildroot}%{_mandir}" + %{__rm} -rf examples/win32 + +#W: xcircuit hidden-file-or-dir /usr/share/doc/xcircuit-3.4.26/examples/python/.xcircuitrc +#W: xcircuit hidden-file-or-dir /usr/share/doc/xcircuit-3.4.36/examples/.xcircuitrc %{__rm} examples/.%{name}rc %{__rm} examples/python/.%{name}rc -%{__rm} %{buildroot}%{_prefix}/lib*/%{name}-3.4/man/%{name}.1 -mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/ + +#%{__rm} %{buildroot}%{_prefix}/lib*/%{name}-3.6/man/%{name}.1 + + +%{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/ %{__cp} -p %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png -chmod -x %{buildroot}%{_prefix}/lib*/%{name}-3.4/console.tcl -desktop-file-install --vendor fedora \ - --add-category Engineering \ - --add-category X-Fedora \ +%{__cp} -pr examples/ %{buildroot}%{_prefix}/lib*/%{name}-3.4/ + + +desktop-file-install --vendor "" \ + --add-category Engineering \ --dir %{buildroot}%{_datadir}/applications \ %{SOURCE1} + %clean -rm -rf %{buildroot} +%{__rm} -rf %{buildroot} + %post touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_bindir}/update-desktop-database %{_datadir}/applications + %postun touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_bindir}/update-desktop-database %{_datadir}/applications + %files %defattr(-,root,root,-) -%doc CHANGES COPYRIGHT README* TODO examples/ +%doc CHANGES COPYRIGHT README* TODO %{_bindir}/%{name} %{_prefix}/lib*/%{name}-3.4/ -%{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/32x32/apps/%{name}.png %{_mandir}/man1/%{name}.1.gz + %Changelog +* Wed Jan 31 2007 Chitlesh Goorah - 3.4.26-18 +- Fix presence in Gnome menu + +* Wed Aug 30 2006 Chitlesh Goorah - 3.4.26-17 +- Rebuilt for FC6 devel + * Sun Aug 26 2006 Mamoru Tasaka - 3.4.26-16 - Again. --- xcircuit-3.4.26-LIBTOOL.patch DELETED --- From fedora-extras-commits at redhat.com Sat Feb 3 13:18:36 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 3 Feb 2007 08:18:36 -0500 Subject: rpms/xcircuit import.log,1.10,1.11 Message-ID: <200702031318.l13DIafe023347@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/xcircuit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23303 Modified Files: import.log Log Message: auto-import xcircuit-3.4.26-18 on branch FC-6 from xcircuit-3.4.26-18.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/xcircuit/import.log,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- import.log 3 Feb 2007 13:13:06 -0000 1.10 +++ import.log 3 Feb 2007 13:18:04 -0000 1.11 @@ -7,3 +7,4 @@ xcircuit-3_4_26-14:FC-5:xcircuit-3.4.26-14.src.rpm:1156628462 xcircuit-3_4_26-17:HEAD:xcircuit-3.4.26-17.src.rpm:1156960519 xcircuit-3_4_26-18:FC-5:xcircuit-3.4.26-18.src.rpm:1170508411 +xcircuit-3_4_26-18:FC-6:xcircuit-3.4.26-18.src.rpm:1170508709 From fedora-extras-commits at redhat.com Sat Feb 3 13:18:38 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 3 Feb 2007 08:18:38 -0500 Subject: rpms/xcircuit/FC-6 xcircuit.desktop, 1.1, 1.2 xcircuit.spec, 1.3, 1.4 xcircuit-3.4.26-LIBTOOL.patch, 1.1, NONE Message-ID: <200702031318.l13DIc8Z023352@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/xcircuit/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23303/FC-6 Modified Files: xcircuit.desktop xcircuit.spec Removed Files: xcircuit-3.4.26-LIBTOOL.patch Log Message: auto-import xcircuit-3.4.26-18 on branch FC-6 from xcircuit-3.4.26-18.src.rpm Index: xcircuit.desktop =================================================================== RCS file: /cvs/extras/rpms/xcircuit/FC-6/xcircuit.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xcircuit.desktop 26 Aug 2006 15:39:55 -0000 1.1 +++ xcircuit.desktop 3 Feb 2007 13:18:06 -0000 1.2 @@ -6,5 +6,5 @@ Type=Application Terminal=false GenericName=xcircuit -Categories=Education;Science;X-Fedora;Engineering; +Categories=Qt;KDE;Education;Science; X-Desktop-File-Install-Version=0.10 \ No newline at end of file Index: xcircuit.spec =================================================================== RCS file: /cvs/extras/rpms/xcircuit/FC-6/xcircuit.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xcircuit.spec 30 Aug 2006 17:40:12 -0000 1.3 +++ xcircuit.spec 3 Feb 2007 13:18:06 -0000 1.4 @@ -1,6 +1,6 @@ Name: xcircuit Version: 3.4.26 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Electronic circuit schematic drawing program License: GPL @@ -12,15 +12,11 @@ # http://opencircuitdesign.com/xcircuit/archive/xcircuit.xpm as 64x64 Source2: %{name}.png -Patch0: xcircuit-3.4.26-LIBTOOL.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: tcl-devel, tk-devel, desktop-file-utils, libtool, libXt-devel, zlib-devel, libXpm-devel -Requires: tcl, tk -Requires(post): %{_bindir}/gtk-update-icon-cache -Requires(post): %{_bindir}/update-desktop-database -Requires(postun): %{_bindir}/gtk-update-icon-cache -Requires(postun): %{_bindir}/update-desktop-database +BuildRequires: tk-devel, desktop-file-utils, libtool, libXt-devel, m4 +BuildRequires: ghostscript-devel, ngspice, libXpm-devel, zlib-devel +Requires: tk %description Xcircuit is a general-purpose drawing program and also a specific-purpose @@ -28,7 +24,6 @@ %prep %setup -q -%patch0 -p0 -b configure.in %build %{__libtoolize} --force --copy @@ -36,63 +31,91 @@ %{__automake} --add-missing %{__autoconf} + if [ -d %{_prefix}/lib64 ] ; then SUF=64 else SUF= fi + +WISH=/usr/bin/wish +export WISH + + %configure \ - --with-tcl=%{_prefix}/lib$SUF --with-tk=%{_prefix}/lib$SUF \ - --with-tcllibs=%{_prefix}/lib$SUF --with-tklibs=%{_prefix}/lib$SUF + --with-tcl=%{_prefix}/lib$SUF \ + --with-tk=%{_prefix}/lib$SUF \ + --with-tcllibs=%{_prefix}/lib$SUF \ + --with-tklibs=%{_prefix}/lib$SUF + + %{__make} %{?_smp_mflags} + %install %{__rm} -rf %{buildroot} %{__rm} %{_builddir}/%{name} -%{__make} DESTDIR=%{buildroot} install + +%{__make} INSTALL="install -p" DESTDIR=%{buildroot} install %{__make} install-man mandir="%{buildroot}%{_mandir}" + %{__rm} -rf examples/win32 + +#W: xcircuit hidden-file-or-dir /usr/share/doc/xcircuit-3.4.26/examples/python/.xcircuitrc +#W: xcircuit hidden-file-or-dir /usr/share/doc/xcircuit-3.4.36/examples/.xcircuitrc %{__rm} examples/.%{name}rc %{__rm} examples/python/.%{name}rc -%{__rm} %{buildroot}%{_prefix}/lib*/%{name}-3.4/man/%{name}.1 -mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/ + +#%{__rm} %{buildroot}%{_prefix}/lib*/%{name}-3.6/man/%{name}.1 + + +%{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/ %{__cp} -p %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png -chmod -x %{buildroot}%{_prefix}/lib*/%{name}-3.4/console.tcl -desktop-file-install --vendor fedora \ - --add-category Engineering \ - --add-category X-Fedora \ +%{__cp} -pr examples/ %{buildroot}%{_prefix}/lib*/%{name}-3.4/ + + +desktop-file-install --vendor "" \ + --add-category Engineering \ --dir %{buildroot}%{_datadir}/applications \ %{SOURCE1} + %clean -rm -rf %{buildroot} +%{__rm} -rf %{buildroot} + %post touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_bindir}/update-desktop-database %{_datadir}/applications + %postun touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_bindir}/update-desktop-database %{_datadir}/applications + %files %defattr(-,root,root,-) -%doc CHANGES COPYRIGHT README* TODO examples/ +%doc CHANGES COPYRIGHT README* TODO %{_bindir}/%{name} %{_prefix}/lib*/%{name}-3.4/ -%{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/32x32/apps/%{name}.png %{_mandir}/man1/%{name}.1.gz + %Changelog +* Wed Jan 31 2007 Chitlesh Goorah - 3.4.26-18 +- Fix presence in Gnome menu + * Wed Aug 30 2006 Chitlesh Goorah - 3.4.26-17 - Rebuilt for FC6 devel --- xcircuit-3.4.26-LIBTOOL.patch DELETED --- From fedora-extras-commits at redhat.com Sat Feb 3 13:23:01 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 3 Feb 2007 08:23:01 -0500 Subject: rpms/xcircuit import.log,1.11,1.12 Message-ID: <200702031323.l13DN1ri023475@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/xcircuit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23440 Modified Files: import.log Log Message: auto-import xcircuit-3.4.26-18 on branch devel from xcircuit-3.4.26-18.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/xcircuit/import.log,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- import.log 3 Feb 2007 13:18:04 -0000 1.11 +++ import.log 3 Feb 2007 13:22:29 -0000 1.12 @@ -8,3 +8,4 @@ xcircuit-3_4_26-17:HEAD:xcircuit-3.4.26-17.src.rpm:1156960519 xcircuit-3_4_26-18:FC-5:xcircuit-3.4.26-18.src.rpm:1170508411 xcircuit-3_4_26-18:FC-6:xcircuit-3.4.26-18.src.rpm:1170508709 +xcircuit-3_4_26-18:HEAD:xcircuit-3.4.26-18.src.rpm:1170508974 From fedora-extras-commits at redhat.com Sat Feb 3 13:23:04 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 3 Feb 2007 08:23:04 -0500 Subject: rpms/xcircuit/devel xcircuit.desktop, 1.1, 1.2 xcircuit.spec, 1.3, 1.4 xcircuit-3.4.26-LIBTOOL.patch, 1.1, NONE Message-ID: <200702031323.l13DN4GK023479@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/xcircuit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23440/devel Modified Files: xcircuit.desktop xcircuit.spec Removed Files: xcircuit-3.4.26-LIBTOOL.patch Log Message: auto-import xcircuit-3.4.26-18 on branch devel from xcircuit-3.4.26-18.src.rpm Index: xcircuit.desktop =================================================================== RCS file: /cvs/extras/rpms/xcircuit/devel/xcircuit.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xcircuit.desktop 26 Aug 2006 15:39:55 -0000 1.1 +++ xcircuit.desktop 3 Feb 2007 13:22:31 -0000 1.2 @@ -6,5 +6,5 @@ Type=Application Terminal=false GenericName=xcircuit -Categories=Education;Science;X-Fedora;Engineering; +Categories=Qt;KDE;Education;Science; X-Desktop-File-Install-Version=0.10 \ No newline at end of file Index: xcircuit.spec =================================================================== RCS file: /cvs/extras/rpms/xcircuit/devel/xcircuit.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xcircuit.spec 30 Aug 2006 17:40:12 -0000 1.3 +++ xcircuit.spec 3 Feb 2007 13:22:31 -0000 1.4 @@ -1,6 +1,6 @@ Name: xcircuit Version: 3.4.26 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Electronic circuit schematic drawing program License: GPL @@ -12,15 +12,11 @@ # http://opencircuitdesign.com/xcircuit/archive/xcircuit.xpm as 64x64 Source2: %{name}.png -Patch0: xcircuit-3.4.26-LIBTOOL.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: tcl-devel, tk-devel, desktop-file-utils, libtool, libXt-devel, zlib-devel, libXpm-devel -Requires: tcl, tk -Requires(post): %{_bindir}/gtk-update-icon-cache -Requires(post): %{_bindir}/update-desktop-database -Requires(postun): %{_bindir}/gtk-update-icon-cache -Requires(postun): %{_bindir}/update-desktop-database +BuildRequires: tk-devel, desktop-file-utils, libtool, libXt-devel, m4 +BuildRequires: ghostscript-devel, ngspice, libXpm-devel, zlib-devel +Requires: tk %description Xcircuit is a general-purpose drawing program and also a specific-purpose @@ -28,7 +24,6 @@ %prep %setup -q -%patch0 -p0 -b configure.in %build %{__libtoolize} --force --copy @@ -36,63 +31,91 @@ %{__automake} --add-missing %{__autoconf} + if [ -d %{_prefix}/lib64 ] ; then SUF=64 else SUF= fi + +WISH=/usr/bin/wish +export WISH + + %configure \ - --with-tcl=%{_prefix}/lib$SUF --with-tk=%{_prefix}/lib$SUF \ - --with-tcllibs=%{_prefix}/lib$SUF --with-tklibs=%{_prefix}/lib$SUF + --with-tcl=%{_prefix}/lib$SUF \ + --with-tk=%{_prefix}/lib$SUF \ + --with-tcllibs=%{_prefix}/lib$SUF \ + --with-tklibs=%{_prefix}/lib$SUF + + %{__make} %{?_smp_mflags} + %install %{__rm} -rf %{buildroot} %{__rm} %{_builddir}/%{name} -%{__make} DESTDIR=%{buildroot} install + +%{__make} INSTALL="install -p" DESTDIR=%{buildroot} install %{__make} install-man mandir="%{buildroot}%{_mandir}" + %{__rm} -rf examples/win32 + +#W: xcircuit hidden-file-or-dir /usr/share/doc/xcircuit-3.4.26/examples/python/.xcircuitrc +#W: xcircuit hidden-file-or-dir /usr/share/doc/xcircuit-3.4.36/examples/.xcircuitrc %{__rm} examples/.%{name}rc %{__rm} examples/python/.%{name}rc -%{__rm} %{buildroot}%{_prefix}/lib*/%{name}-3.4/man/%{name}.1 -mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/ + +#%{__rm} %{buildroot}%{_prefix}/lib*/%{name}-3.6/man/%{name}.1 + + +%{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/ %{__cp} -p %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png -chmod -x %{buildroot}%{_prefix}/lib*/%{name}-3.4/console.tcl -desktop-file-install --vendor fedora \ - --add-category Engineering \ - --add-category X-Fedora \ +%{__cp} -pr examples/ %{buildroot}%{_prefix}/lib*/%{name}-3.4/ + + +desktop-file-install --vendor "" \ + --add-category Engineering \ --dir %{buildroot}%{_datadir}/applications \ %{SOURCE1} + %clean -rm -rf %{buildroot} +%{__rm} -rf %{buildroot} + %post touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_bindir}/update-desktop-database %{_datadir}/applications + %postun touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_bindir}/update-desktop-database %{_datadir}/applications + %files %defattr(-,root,root,-) -%doc CHANGES COPYRIGHT README* TODO examples/ +%doc CHANGES COPYRIGHT README* TODO %{_bindir}/%{name} %{_prefix}/lib*/%{name}-3.4/ -%{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/32x32/apps/%{name}.png %{_mandir}/man1/%{name}.1.gz + %Changelog +* Wed Jan 31 2007 Chitlesh Goorah - 3.4.26-18 +- Fix presence in Gnome menu + * Wed Aug 30 2006 Chitlesh Goorah - 3.4.26-17 - Rebuilt for FC6 devel --- xcircuit-3.4.26-LIBTOOL.patch DELETED --- From fedora-extras-commits at redhat.com Sat Feb 3 15:01:48 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Sat, 3 Feb 2007 10:01:48 -0500 Subject: rpms/skencil/FC-6 skencil-0.6.17-fonts.patch, 1.1, 1.2 skencil.spec, 1.13, 1.14 Message-ID: <200702031501.l13F1mwu031020@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/skencil/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30988 Modified Files: skencil-0.6.17-fonts.patch skencil.spec Log Message: skencil-0.6.17-fonts.patch: Index: skencil-0.6.17-fonts.patch =================================================================== RCS file: /cvs/extras/rpms/skencil/FC-6/skencil-0.6.17-fonts.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- skencil-0.6.17-fonts.patch 3 Feb 2007 13:13:07 -0000 1.1 +++ skencil-0.6.17-fonts.patch 3 Feb 2007 15:01:15 -0000 1.2 @@ -1,5 +1,5 @@ ---- skencil-0.6.17/Sketch/Base/config.py.fonts 2007-02-03 14:03:36.000000000 +0100 -+++ skencil-0.6.17/Sketch/Base/config.py 2007-02-03 14:09:52.000000000 +0100 +--- skencil-0.6.17/Sketch/Base/config.py.fonts 2003-11-29 23:26:13.000000000 +0100 ++++ skencil-0.6.17/Sketch/Base/config.py 2007-02-03 15:37:01.000000000 +0100 @@ -61,8 +61,10 @@ # # On platforms other than Linux this probably needs a few additional @@ -13,3 +13,170 @@ '/usr/lib/ghostscript/fonts'] +--- skencil-0.6.17/Resources/Fontmetrics/gsopt.sfd.fonts 2007-02-03 15:37:32.000000000 +0100 ++++ skencil-0.6.17/Resources/Fontmetrics/gsopt.sfd 2007-02-03 15:59:17.000000000 +0100 +@@ -1,9 +1,9 @@ + # optional ghostscript fonts +-Utopia-Bold,Utopia,Bold,-adobe-Utopia-bold-r-normal,iso8859-1,putb +-Utopia-BoldItalic,Utopia,Bold Italic,-adobe-Utopia-bold-i-normal,iso8859-1,putbi +-Utopia-Regular,Utopia,Regular,-adobe-Utopia-regular-r-normal,iso8859-1,putr +-Utopia-Italic,Utopia,Italic,-adobe-Utopia-regular-i-normal,iso8859-1,putri +-CharterBT-Bold,Bitstream Charter,Bold,-bitstream-Charter-bold-r-normal,iso8859-1,bchb +-CharterBT-BoldItalic,Bitstream Charter,Bold Italic,-bitstream-Charter-bold-i-normal,iso8859-1,bchbi +-CharterBT-Roman,Bitstream Charter,Roman,-bitstream-Charter-normal-r-normal,iso8859-1,bchr +-CharterBT-Italic,Bitstream Charter,Italic,-bitstream-Charter-normal-i-normal,iso8859-1,bchri ++Utopia-Bold,Utopia,Bold,-adobe-utopia-bold-r-normal,iso8859-1,putb ++Utopia-BoldItalic,Utopia,Bold Italic,-adobe-utopia-bold-i-normal,iso8859-1,putbi ++Utopia-Regular,Utopia,Regular,-adobe-utopia-regular-r-normal,iso8859-1,putr ++Utopia-Italic,Utopia,Italic,-adobe-utopia-regular-i-normal,iso8859-1,putri ++CharterBT-Bold,Bitstream Charter,Bold,-bitstream-charter-bold-r-normal,iso8859-1,bchb ++CharterBT-BoldItalic,Bitstream Charter,Bold Italic,-bitstream-charter-bold-i-normal,iso8859-1,bchbi ++CharterBT-Roman,Bitstream Charter,Roman,-bitstream-charter-medium-r-normal,iso8859-1,bchr ++CharterBT-Italic,Bitstream Charter,Italic,-bitstream-charter-medium-i-normal,iso8859-1,bchri +--- skencil-0.6.17/Resources/Fontmetrics/gs.sfd.fonts 2007-02-03 15:37:38.000000000 +0100 ++++ skencil-0.6.17/Resources/Fontmetrics/gs.sfd 2007-02-03 15:57:48.000000000 +0100 +@@ -1,36 +1,36 @@ + # The free versions of the standard postscript fonts shipped with ghostscript. +-URWGothicL-Book,URW Gothic L,Book,-urw-URW Gothic L-book-r-normal,iso8859-1,a010013l +-URWGothicL-Demi,URW Gothic L,Demi,-urw-URW Gothic L-demi-r-normal,iso8859-1,a010015l +-URWGothicL-BookObli,URW Gothic L,Book Oblique,-urw-URW Gothic L-book-o-normal,iso8859-1,a010033l +-URWGothicL-DemiObli,URW Gothic L,Demi Oblique,-urw-URW Gothic L-demi-o-normal,iso8859-1,a010035l +-URWBookmanL-Ligh,URW Bookman L,Light,-urw-URW Bookman L-regular-r-normal,iso8859-1,b018012l +-URWBookmanL-DemiBold,URW Bookman L,Demi Bold,-urw-URW Bookman L-bold-r-normal,iso8859-1,b018015l +-URWBookmanL-LighItal,URW Bookman L,Light Italic,-urw-URW Bookman L-regular-i-normal,iso8859-1,b018032l +-URWBookmanL-DemiBoldItal,URW Bookman L,Demi Bold Italic,-urw-URW Bookman L-bold-i-normal,iso8859-1,b018035l +-CenturySchL-Roma,Century Schoolbook L,Roman,-urw-Century Schoolbook L-medium-r-normal,iso8859-1,c059013l ++URWGothicL-Book,URW Gothic L,Book,-urw-urw gothic l-medium-r-normal,iso8859-1,a010013l ++URWGothicL-Demi,URW Gothic L,Demi,-urw-urw gothic L-semibold-r-normal,iso8859-1,a010015l ++URWGothicL-BookObli,URW Gothic L,Book Oblique,-urw-urw gothic l-medium-o-normal,iso8859-1,a010033l ++URWGothicL-DemiObli,URW Gothic L,Demi Oblique,-urw-urw gothic l-semibold-o-normal,iso8859-1,a010035l ++URWBookmanL-Ligh,URW Bookman L,Light,-urw-urw bookman l-medium-r-normal,iso8859-1,b018012l ++URWBookmanL-DemiBold,URW Bookman L,Demi Bold,-urw-urw bookman l-bold-r-normal,iso8859-1,b018015l ++URWBookmanL-LighItal,URW Bookman L,Light Italic,-urw-urw bookman l-regular-i-normal,iso8859-1,b018032l ++URWBookmanL-DemiBoldItal,URW Bookman L,Demi Bold Italic,-urw-urw bookman l-bold-i-normal,iso8859-1,b018035l ++CenturySchL-Roma,Century Schoolbook L,Roman,-urw-century schoolbook l-medium-r-normal,iso8859-1,c059013l + CenturySchL-Bold,Century Schoolbook L,Bold,-urw-Century Schoolbook L-bold-r-normal,iso8859-1,c059016l +-CenturySchL-Ital,Century Schoolbook L,Italic,-urw-Century Schoolbook L-regular-i-normal,iso8859-1,c059033l +-CenturySchL-BoldItal,Century Schoolbook L,Bold Italic,-urw-Century Schoolbook L-bold-i-normal,iso8859-1,c059036l +-Dingbats,Dingbats,Roman,-urw-Dingbats-regular-r-normal,adobe-fontspecific,d050000l +-NimbusSanL-Regu,Nimbus Sans L,Regular,-urw-Nimbus Sans L-regular-r-normal,iso8859-1,n019003l +-NimbusSanL-Bold,Nimbus Sans L,Bold,-urw-Nimbus Sans L-bold-r-normal,iso8859-1,n019004l +-NimbusSanL-ReguItal,Nimbus Sans L,Regular Italic,-urw-Nimbus Sans L-regular-i-normal,iso8859-1,n019023l +-NimbusSanL-BoldItal,Nimbus Sans L,Bold Italic,-urw-Nimbus Sans L-bold-i-normal,iso8859-1,n019024l +-NimbusSanL-ReguCond,Nimbus Sans L,Regular Condensed,-urw-Nimbus Sans L-regular-r-condensed,iso8859-1,n019043l +-NimbusSanL-BoldCond,Nimbus Sans L,Bold Condensed,-urw-Nimbus Sans L-bold-r-condensed,iso8859-1,n019044l +-NimbusSanL-ReguCondItal,Nimbus Sans L,Regular Condensed Italic,-urw-Nimbus Sans L-regular-i-condensed,iso8859-1,n019063l +-NimbusSanL-BoldCondItal,Nimbus Sans L,Bold Condensed Italic,-urw-Nimbus Sans L-bold-i-condensed,iso8859-1,n019064l +-NimbusRomNo9L-Regu,Nimbus Roman No9 L,Regular,-urw-Nimbus Roman No9 L-regular-r-normal,iso8859-1,n021003l +-NimbusRomNo9L-Medi,Nimbus Roman No9 L,Medium,-urw-Nimbus Roman No9 L-bold-r-normal,iso8859-1,n021004l +-NimbusRomNo9L-ReguItal,Nimbus Roman No9 L,Regular Italic,-urw-Nimbus Roman No9 L-regular-i-normal,iso8859-1,n021023l +-NimbusRomNo9L-MediItal,Nimbus Roman No9 L,Medium Italic,-urw-Nimbus Roman No9 L-bold-i-normal,iso8859-1,n021024l +-NimbusMonL-Regu,Nimbus Mono L,Regular,-urw-Nimbus Mono L-regular-r-normal,iso8859-1,n022003l +-NimbusMonL-Bold,Nimbus Mono L,Bold,-urw-Nimbus Mono L-bold-r-normal,iso8859-1,n022004l +-NimbusMonL-ReguObli,Nimbus Mono L,Regular Oblique,-urw-Nimbus Mono L-regular-o-normal,iso8859-1,n022023l +-NimbusMonL-BoldObli,Nimbus Mono L,Bold Oblique,-urw-Nimbus Mono L-bold-o-normal,iso8859-1,n022024l +-URWPalladioL-Roma,URW Palladio L,Roman,-urw-URW Palladio L-medium-r-normal,iso8859-1,p052003l +-URWPalladioL-Bold,URW Palladio L,Bold,-urw-URW Palladio L-bold-r-normal,iso8859-1,p052004l +-URWPalladioL-Ital,URW Palladio L,Italic,-urw-URW Palladio L-regular-i-normal,iso8859-1,p052023l +-URWPalladioL-BoldItal,URW Palladio L,Bold Italic,-urw-URW Palladio L-bold-i-normal,iso8859-1,p052024l +-StandardSymL,Standard Symbols L,Roman,-urw-Standard Symbols L-regular-r-normal,adobe-fontspecific,s050000l +-URWChanceryL-MediItal,URW Chancery L,Medium Italic,-urw-URW Chancery L-medium-i-normal,iso8859-1,z003034l ++CenturySchL-Ital,Century Schoolbook L,Italic,-urw-century schoolbook l-regular-i-normal,iso8859-1,c059033l ++CenturySchL-BoldItal,Century Schoolbook L,Bold Italic,-urw-century schoolbook l-bold-i-normal,iso8859-1,c059036l ++Dingbats,Dingbats,Roman,-urw-dingbats-medium-r-normal,adobe-fontspecific,d050000l ++NimbusSanL-Regu,Nimbus Sans L,Regular,-urw-nimbus sans l-medium-r-normal,iso8859-1,n019003l ++NimbusSanL-Bold,Nimbus Sans L,Bold,-urw-nimbus sans l-bold-r-normal,iso8859-1,n019004l ++NimbusSanL-ReguItal,Nimbus Sans L,Regular Italic,-urw-nimbus sans l-medium-i-normal,iso8859-1,n019023l ++NimbusSanL-BoldItal,Nimbus Sans L,Bold Italic,-urw-nimbus sans l-bold-i-normal,iso8859-1,n019024l ++NimbusSanL-ReguCond,Nimbus Sans L,Regular Condensed,-urw-nimbus sans l condensed-medium-r-condensed,iso8859-1,n019043l ++NimbusSanL-BoldCond,Nimbus Sans L,Bold Condensed,-urw-nimbus sans l condensed-bold-r-condensed,iso8859-1,n019044l ++NimbusSanL-ReguCondItal,Nimbus Sans L,Regular Condensed Italic,-urw-nimbus sans l condensed-medium-i-condensed,iso8859-1,n019063l ++NimbusSanL-BoldCondItal,Nimbus Sans L,Bold Condensed Italic,-urw-nimbus sans l condensed-bold-i-condensed,iso8859-1,n019064l ++NimbusRomNo9L-Regu,Nimbus Roman No9 L,Regular,-urw-nimbus roman no9 l-medium-r-normal,iso8859-1,n021003l ++NimbusRomNo9L-Medi,Nimbus Roman No9 L,Medium,-urw-nimbus roman no9 l-bold-r-normal,iso8859-1,n021004l ++NimbusRomNo9L-ReguItal,Nimbus Roman No9 L,Regular Italic,-urw-nimbus roman no9 l-medium-i-normal,iso8859-1,n021023l ++NimbusRomNo9L-MediItal,Nimbus Roman No9 L,Medium Italic,-urw-nimbus roman no9 l-bold-i-normal,iso8859-1,n021024l ++NimbusMonL-Regu,Nimbus Mono L,Regular,-urw-nimbus mono l-medium-r-normal,iso8859-1,n022003l ++NimbusMonL-Bold,Nimbus Mono L,Bold,-urw-nimbus mono L-bold-r-normal,iso8859-1,n022004l ++NimbusMonL-ReguObli,Nimbus Mono L,Regular Oblique,-urw-nimbus mono l-medium-o-normal,iso8859-1,n022023l ++NimbusMonL-BoldObli,Nimbus Mono L,Bold Oblique,-urw-nimbus mono l-bold-o-normal,iso8859-1,n022024l ++URWPalladioL-Roma,URW Palladio L,Roman,-urw-urw palladio l-medium-r-normal,iso8859-1,p052003l ++URWPalladioL-Bold,URW Palladio L,Bold,-urw-urw palladio l-bold-r-normal,iso8859-1,p052004l ++URWPalladioL-Ital,URW Palladio L,Italic,-urw-urw palladio l-medium-i-normal,iso8859-1,p052023l ++URWPalladioL-BoldItal,URW Palladio L,Bold Italic,-urw-urw palladio l-bold-i-normal,iso8859-1,p052024l ++StandardSymL,Standard Symbols L,Roman,-urw-standard symbols l-medium-r-normal,adobe-fontspecific,s050000l ++URWChanceryL-MediItal,URW Chancery L,Medium Italic,-urw-urw chancery l-medium-i-normal,iso8859-1,z003034l +--- skencil-0.6.17/Resources/Fontmetrics/std.sfd.fonts 2007-02-03 15:37:44.000000000 +0100 ++++ skencil-0.6.17/Resources/Fontmetrics/std.sfd 2007-02-03 15:48:24.000000000 +0100 +@@ -1,36 +1,36 @@ + # standard postscript fonts +-AvantGarde-DemiOblique,ITC Avant Garde Gothic,Demi Oblique,-adobe-ITC Avant Garde Gothic-demi-o-normal,iso8859-1,pagdo +-AvantGarde-Book,ITC Avant Garde Gothic,Book,-adobe-ITC Avant Garde Gothic-book-r-normal,iso8859-1,pagk +-AvantGarde-BookOblique,ITC Avant Garde Gothic,Book Oblique,-adobe-ITC Avant Garde Gothic-book-o-normal,iso8859-1,pagko +-Bookman-Demi,ITC Bookman,Demi,-adobe-ITC Bookman-demi-r-normal,iso8859-1,pbkd +-Bookman-DemiItalic,ITC Bookman,Demi Italic,-adobe-ITC Bookman-demi-i-normal,iso8859-1,pbkdi +-Bookman-Light,ITC Bookman,Light,-adobe-ITC Bookman-light-r-normal,iso8859-1,pbkl +-Bookman-LightItalic,ITC Bookman,Light Italic,-adobe-ITC Bookman-light-i-normal,iso8859-1,pbkli +-Courier-Bold,Courier,Bold,-adobe-Courier-bold-r-normal,iso8859-1,pcrb +-Courier-BoldOblique,Courier,Bold Oblique,-adobe-Courier-bold-o-normal,iso8859-1,pcrbo +-Courier,Courier,Roman,-adobe-Courier-medium-r-normal,iso8859-1,pcrr +-Courier-Oblique,Courier,Oblique,-adobe-Courier-medium-o-normal,iso8859-1,pcrro +-Helvetica-Bold,Helvetica,Bold,-adobe-Helvetica-bold-r-normal,iso8859-1,phvb +-Helvetica-Narrow-Bold,Helvetica,Narrow Bold,-adobe-Helvetica-bold-r-narrow,iso8859-1,phvbn +-Helvetica-BoldOblique,Helvetica,Bold Oblique,-adobe-Helvetica-bold-o-normal,iso8859-1,phvbo +-Helvetica-Narrow-BoldOblique,Helvetica,Narrow Bold Oblique,-adobe-Helvetica-bold-o-narrow,iso8859-1,phvbon +-Helvetica,Helvetica,Roman,-adobe-Helvetica-medium-r-normal,iso8859-1,phvr +-Helvetica-Narrow,Helvetica,Narrow,-adobe-Helvetica-medium-r-narrow,iso8859-1,phvrn +-Helvetica-Oblique,Helvetica,Oblique,-adobe-Helvetica-medium-o-normal,iso8859-1,phvro +-Helvetica-Narrow-Oblique,Helvetica,Narrow Oblique,-adobe-Helvetica-medium-o-narrow,iso8859-1,phvron +-NewCenturySchlbk-Bold,New Century Schoolbook,Bold,-adobe-New Century Schoolbook-bold-r-normal,iso8859-1,pncb +-NewCenturySchlbk-BoldItalic,New Century Schoolbook,Bold Italic,-adobe-New Century Schoolbook-bold-i-normal,iso8859-1,pncbi +-NewCenturySchlbk-Roman,New Century Schoolbook,Roman,-adobe-New Century Schoolbook-medium-r-normal,iso8859-1,pncr +-NewCenturySchlbk-Italic,New Century Schoolbook,Italic,-adobe-New Century Schoolbook-medium-i-normal,iso8859-1,pncri +-Palatino-Bold,Palatino,Bold,-adobe-Palatino-bold-r-normal,iso8859-1,pplb +-Palatino-BoldItalic,Palatino,Bold Italic,-adobe-Palatino-bold-i-normal,iso8859-1,pplbi +-Palatino-Roman,Palatino,Roman,-adobe-Palatino-medium-r-normal,iso8859-1,pplr +-Palatino-Italic,Palatino,Italic,-adobe-Palatino-medium-i-normal,iso8859-1,pplri +-Times-Bold,Times,Bold,-adobe-Times-bold-r-normal,iso8859-1,ptmb +-Times-BoldItalic,Times,Bold Italic,-adobe-Times-bold-i-normal,iso8859-1,ptmbi +-Times-Roman,Times,Roman,-adobe-Times-medium-r-normal,iso8859-1,ptmr +-Symbol,Symbol,Roman,-adobe-Symbol-medium-r-normal,adobe-fontspecific,psyr +-Times-Italic,Times,Italic,-adobe-Times-medium-i-normal,iso8859-1,ptmri +-ZapfChancery-MediumItalic,ITC Zapf Chancery,Medium Italic,-adobe-ITC Zapf Chancery-medium-i-normal,iso8859-1,pzcmi +-ZapfDingbats,ITC Zapf Dingbats,Roman,-adobe-ITC Zapf Dingbats-medium-r-normal,adobe-fontspecific,pzdr +-AvantGarde-Demi,ITC Avant Garde Gothic,Demi,-adobe-ITC Avant Garde Gothic-demi-r-normal,iso8859-1,pagd ++#AvantGarde-Demi,ITC Avant Garde Gothic,Demi,-adobe-ITC Avant Garde Gothic-demi-r-normal,iso8859-1,pagd ++#AvantGarde-DemiOblique,ITC Avant Garde Gothic,Demi Oblique,-adobe-ITC Avant Garde Gothic-demi-o-normal,iso8859-1,pagdo ++#AvantGarde-Book,ITC Avant Garde Gothic,Book,-adobe-ITC Avant Garde Gothic-book-r-normal,iso8859-1,pagk ++#AvantGarde-BookOblique,ITC Avant Garde Gothic,Book Oblique,-adobe-ITC Avant Garde Gothic-book-o-normal,iso8859-1,pagko ++#Bookman-Demi,ITC Bookman,Demi,-adobe-ITC Bookman-demi-r-normal,iso8859-1,pbkd ++#Bookman-DemiItalic,ITC Bookman,Demi Italic,-adobe-ITC Bookman-demi-i-normal,iso8859-1,pbkdi ++#Bookman-Light,ITC Bookman,Light,-adobe-ITC Bookman-light-r-normal,iso8859-1,pbkl ++#Bookman-LightItalic,ITC Bookman,Light Italic,-adobe-ITC Bookman-light-i-normal,iso8859-1,pbkli ++Courier-Bold,Courier,Bold,-adobe-courier-bold-r-normal,iso8859-1,pcrb ++Courier-BoldOblique,Courier,Bold Oblique,-adobe-courier-bold-o-normal,iso8859-1,pcrbo ++Courier,Courier,Roman,-adobe-courier-medium-r-normal,iso8859-1,pcrr ++Courier-Oblique,Courier,Oblique,-adobe-courier-medium-o-normal,iso8859-1,pcrro ++Helvetica-Bold,Helvetica,Bold,-adobe-helvetica-bold-r-normal,iso8859-1,phvb ++#Helvetica-Narrow-Bold,Helvetica,Narrow Bold,-adobe-helvetica-bold-r-narrow,iso8859-1,phvbn ++Helvetica-BoldOblique,Helvetica,Bold Oblique,-adobe-helvetica-bold-o-normal,iso8859-1,phvbo ++#Helvetica-Narrow-BoldOblique,Helvetica,Narrow Bold Oblique,-adobe-Helvetica-bold-o-narrow,iso8859-1,phvbon ++Helvetica,Helvetica,Roman,-adobe-helvetica-medium-r-normal,iso8859-1,phvr ++#Helvetica-Narrow,Helvetica,Narrow,-adobe-Helvetica-medium-r-narrow,iso8859-1,phvrn ++Helvetica-Oblique,Helvetica,Oblique,-adobe-helvetica-medium-o-normal,iso8859-1,phvro ++#Helvetica-Narrow-Oblique,Helvetica,Narrow Oblique,-adobe-Helvetica-medium-o-narrow,iso8859-1,phvron ++NewCenturySchlbk-Bold,New Century Schoolbook,Bold,-adobe-new century schoolbook-bold-r-normal,iso8859-1,pncb ++NewCenturySchlbk-BoldItalic,New Century Schoolbook,Bold Italic,-adobe-new century schoolbook-bold-i-normal,iso8859-1,pncbi ++NewCenturySchlbk-Roman,New Century Schoolbook,Roman,-adobe-new century schoolbook-medium-r-normal,iso8859-1,pncr ++NewCenturySchlbk-Italic,New Century Schoolbook,Italic,-adobe-new century schoolbook-medium-i-normal,iso8859-1,pncri ++#Palatino-Bold,Palatino,Bold,-adobe-Palatino-bold-r-normal,iso8859-1,pplb ++#Palatino-BoldItalic,Palatino,Bold Italic,-adobe-Palatino-bold-i-normal,iso8859-1,pplbi ++#Palatino-Roman,Palatino,Roman,-adobe-Palatino-medium-r-normal,iso8859-1,pplr ++#Palatino-Italic,Palatino,Italic,-adobe-Palatino-medium-i-normal,iso8859-1,pplri ++Times-Bold,Times,Bold,-adobe-times-bold-r-normal,iso8859-1,ptmb ++Times-BoldItalic,Times,Bold Italic,-adobe-times-bold-i-normal,iso8859-1,ptmbi ++Times-Roman,Times,Roman,-adobe-times-medium-r-normal,iso8859-1,ptmr ++Times-Italic,Times,Italic,-adobe-times-medium-i-normal,iso8859-1,ptmri ++Symbol,Symbol,Roman,-adobe-symbol-medium-r-normal,adobe-fontspecific,psyr ++#ZapfChancery-MediumItalic,ITC Zapf Chancery,Medium Italic,-adobe-ITC Zapf Chancery-medium-i-normal,iso8859-1,pzcmi ++#ZapfDingbats,ITC Zapf Dingbats,Roman,-adobe-ITC Zapf Dingbats-medium-r-normal,adobe-fontspecific,pzdr Index: skencil.spec =================================================================== RCS file: /cvs/extras/rpms/skencil/FC-6/skencil.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- skencil.spec 3 Feb 2007 13:13:07 -0000 1.13 +++ skencil.spec 3 Feb 2007 15:01:15 -0000 1.14 @@ -26,6 +26,8 @@ Requires: xorg-x11-fonts-Type1 Requires: urw-fonts Requires: ghostscript-fonts +Requires: xorg-x11-fonts-75dpi +Requires: xorg-x11-fonts-ISO8859-1-75dpi Requires(post): shared-mime-info, desktop-file-utils Requires(postun): shared-mime-info, desktop-file-utils From fedora-extras-commits at redhat.com Sat Feb 3 15:07:56 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Sat, 3 Feb 2007 10:07:56 -0500 Subject: rpms/skencil/FC-6 skencil.spec,1.14,1.15 Message-ID: <200702031507.l13F7uA2031098@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/skencil/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31076 Modified Files: skencil.spec Log Message: Index: skencil.spec =================================================================== RCS file: /cvs/extras/rpms/skencil/FC-6/skencil.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- skencil.spec 3 Feb 2007 15:01:15 -0000 1.14 +++ skencil.spec 3 Feb 2007 15:07:24 -0000 1.15 @@ -1,6 +1,6 @@ Name: skencil Version: 0.6.17 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Vector drawing program @@ -117,6 +117,9 @@ %changelog +* Sat Feb 3 2007 Gerard Milmeister - 0.6.17-10 +- fix font files + * Sat Feb 3 2007 Gerard Milmeister - 0.6.17-9 - fix font paths From fedora-extras-commits at redhat.com Sat Feb 3 15:09:41 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Sat, 3 Feb 2007 10:09:41 -0500 Subject: rpms/skencil/devel skencil.spec,1.12,1.13 Message-ID: <200702031509.l13F9f7l031152@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/skencil/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31123/devel Modified Files: skencil.spec Log Message: Index: skencil.spec =================================================================== RCS file: /cvs/extras/rpms/skencil/devel/skencil.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- skencil.spec 28 Aug 2006 09:20:12 -0000 1.12 +++ skencil.spec 3 Feb 2007 15:09:09 -0000 1.13 @@ -1,6 +1,6 @@ Name: skencil Version: 0.6.17 -Release: 8%{?dist} +Release: 10%{?dist} Summary: Vector drawing program @@ -9,6 +9,7 @@ URL: http://www.skencil.org Source0: http://dl.sf.net/sketch/skencil-0.6.17.tar.gz Source1: skencil-logo.png +Patch0: skencil-0.6.17-fonts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel @@ -22,6 +23,11 @@ Requires: tkinter Requires: python-imaging Requires: PyXML +Requires: xorg-x11-fonts-Type1 +Requires: urw-fonts +Requires: ghostscript-fonts +Requires: xorg-x11-fonts-75dpi +Requires: xorg-x11-fonts-ISO8859-1-75dpi Requires(post): shared-mime-info, desktop-file-utils Requires(postun): shared-mime-info, desktop-file-utils @@ -36,6 +42,7 @@ %prep %setup -q +%patch0 -p1 grep -rl lib/ . | xargs perl -pi -e's,lib/,%{_lib}/,g' grep -rl lib\' . | xargs perl -pi -es,lib\',%{_lib}\',g @@ -110,6 +117,12 @@ %changelog +* Sat Feb 3 2007 Gerard Milmeister - 0.6.17-10 +- fix font files + +* Sat Feb 3 2007 Gerard Milmeister - 0.6.17-9 +- fix font paths + * Mon Aug 28 2006 Gerard Milmeister - 0.6.17-8 - Rebuild for FE6 From fedora-extras-commits at redhat.com Sat Feb 3 15:10:08 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Sat, 3 Feb 2007 10:10:08 -0500 Subject: rpms/skencil/devel skencil-python2.4.patch,1.1,NONE Message-ID: <200702031510.l13FA8Dt031170@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/skencil/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31163 Removed Files: skencil-python2.4.patch Log Message: --- skencil-python2.4.patch DELETED --- From fedora-extras-commits at redhat.com Sat Feb 3 15:13:42 2007 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Sat, 3 Feb 2007 10:13:42 -0500 Subject: rpms/eggdrop/devel eggdrop.spec,1.5,1.6 Message-ID: <200702031513.l13FDgC2031349@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/extras/rpms/eggdrop/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31328 Modified Files: eggdrop.spec Log Message: Rebuild for tcl 8.5 Index: eggdrop.spec =================================================================== RCS file: /cvs/extras/rpms/eggdrop/devel/eggdrop.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- eggdrop.spec 25 Oct 2006 07:17:27 -0000 1.5 +++ eggdrop.spec 3 Feb 2007 15:13:10 -0000 1.6 @@ -1,11 +1,11 @@ Summary: The world's most popular Open Source IRC bot Name: eggdrop Version: 1.6.18 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/Communications URL: http://www.eggheads.org/ -Source: ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/eggdrop%{version}.tar.gz +Source: ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/%{name}%{version}.tar.gz Patch0: eggdrop-1.6.17-conf.patch Patch1: eggdrop-1.6.17-langdir.patch BuildRequires: tcl-devel >= 8.3, bind-devel, zlib-devel @@ -62,6 +62,9 @@ %{_mandir}/man?/* %changelog +* Sat Feb 03 2007 Robert Scheck 1.6.18-5 +- Rebuild for tcl 8.5 + * Wed Oct 25 2006 Robert Scheck 1.6.18-4 - Rebuild From fedora-extras-commits at redhat.com Sat Feb 3 15:14:59 2007 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Sat, 3 Feb 2007 10:14:59 -0500 Subject: rpms/eggdrop/FC-6 eggdrop.spec,1.5,1.6 Message-ID: <200702031514.l13FExhv031443@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/extras/rpms/eggdrop/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31408 Modified Files: eggdrop.spec Log Message: Rebuild Index: eggdrop.spec =================================================================== RCS file: /cvs/extras/rpms/eggdrop/FC-6/eggdrop.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- eggdrop.spec 25 Oct 2006 07:18:27 -0000 1.5 +++ eggdrop.spec 3 Feb 2007 15:14:27 -0000 1.6 @@ -1,11 +1,11 @@ Summary: The world's most popular Open Source IRC bot Name: eggdrop Version: 1.6.18 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/Communications URL: http://www.eggheads.org/ -Source: ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/eggdrop%{version}.tar.gz +Source: ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/%{name}%{version}.tar.gz Patch0: eggdrop-1.6.17-conf.patch Patch1: eggdrop-1.6.17-langdir.patch BuildRequires: tcl-devel >= 8.3, bind-devel, zlib-devel @@ -62,6 +62,9 @@ %{_mandir}/man?/* %changelog +* Sat Feb 03 2007 Robert Scheck 1.6.18-5 +- Rebuild for tcl 8.5 + * Wed Oct 25 2006 Robert Scheck 1.6.18-4 - Rebuild From fedora-extras-commits at redhat.com Sat Feb 3 15:15:42 2007 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 3 Feb 2007 10:15:42 -0500 Subject: rpms/clamav/devel clamav-0.70-user.patch, 1.1, NONE clamav-0.88.1-strncpy.patch, 1.1, NONE clamav-0.88.2-guys, please-read-the-compiler-warnings-before-doing-a-release.patch, 1.1, NONE Message-ID: <200702031515.l13FFgaj031514@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31502/devel Removed Files: clamav-0.70-user.patch clamav-0.88.1-strncpy.patch clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch Log Message: updated to 0.90rc3; these patches don't apply anymore --- clamav-0.70-user.patch DELETED --- --- clamav-0.88.1-strncpy.patch DELETED --- ***** Not enough context to create diffstat for file: clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,1.1,NONE ***** Not enough context to create diff for file: clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,1.1,NONE From fedora-extras-commits at redhat.com Sat Feb 3 15:16:13 2007 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Sat, 3 Feb 2007 10:16:13 -0500 Subject: rpms/eggdrop/FC-5 eggdrop.spec,1.5,1.6 Message-ID: <200702031516.l13FGDjK031559@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/extras/rpms/eggdrop/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31496 Modified Files: eggdrop.spec Log Message: Rebuild Index: eggdrop.spec =================================================================== RCS file: /cvs/extras/rpms/eggdrop/FC-5/eggdrop.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- eggdrop.spec 25 Oct 2006 07:19:25 -0000 1.5 +++ eggdrop.spec 3 Feb 2007 15:15:40 -0000 1.6 @@ -1,11 +1,11 @@ Summary: The world's most popular Open Source IRC bot Name: eggdrop Version: 1.6.18 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/Communications URL: http://www.eggheads.org/ -Source: ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/eggdrop%{version}.tar.gz +Source: ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/%{name}%{version}.tar.gz Patch0: eggdrop-1.6.17-conf.patch Patch1: eggdrop-1.6.17-langdir.patch BuildRequires: tcl-devel >= 8.3, bind-devel, zlib-devel @@ -62,6 +62,9 @@ %{_mandir}/man?/* %changelog +* Sat Feb 03 2007 Robert Scheck 1.6.18-5 +- Rebuild for tcl 8.5 + * Wed Oct 25 2006 Robert Scheck 1.6.18-4 - Rebuild From fedora-extras-commits at redhat.com Sat Feb 3 15:16:40 2007 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 3 Feb 2007 10:16:40 -0500 Subject: rpms/clamav/devel clamav.spec,1.45,1.46 Message-ID: <200702031516.l13FGevq031596@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31542/devel Modified Files: clamav.spec Log Message: - updated to 0.90rc3 - splitted mandatory parts from the data-file into a separate -filesystem subpackage - added a -data-empty subpackage to allow a setup where database is updated per cron-job and user does not want to download the large -data package with outdated virus definitations (#214949) - %ghost'ed the files downloaded by freshclam Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- clamav.spec 12 Dec 2006 08:17:53 -0000 1.45 +++ clamav.spec 3 Feb 2007 15:16:08 -0000 1.46 @@ -5,6 +5,8 @@ ## +%global rcver rc3 + %global username clamav %global homedir %_var/lib/clamav %global freshclamlog %_var/log/freshclam.log @@ -18,14 +20,14 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.88.7 -Release: %release_func 1 +Version: 0.90 +Release: %release_func 0.2.rc3 License: GPL Group: Applications/File URL: http://www.clamav.net -Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz -Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig +Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?rcver}.tar.gz +Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?rcver}.tar.gz.sig Source1: clamd-wrapper Source2: clamd.sysconfig Source3: clamd.logrotate @@ -33,9 +35,6 @@ Source6: clamav-update.logrotate Source7: clamd.SERVICE.init Source8: clamav-notify-servers -Patch0: clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch -Patch1: clamav-0.88.1-strncpy.patch -Patch20: clamav-0.70-user.patch Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch Patch23: clamav-0.88.4-visibility.patch @@ -45,6 +44,17 @@ BuildRequires: zlib-devel bzip2-devel gmp-devel tcp_wrappers curl-devel BuildRequires: bc +%package filesystem +Summary: Filesystem structure for clamav +Group: Applications/File +Provides: user(clamav) +Provides: group(clamav) +# Prevent version mix +Conflicts: %name < %version-%release +Conflicts: %name > %version-%release +BuildRequires: fedora-usermgmt-devel +%{?FE_USERADD_REQ} + %package lib Summary: Dynamic libraries for the Clam Antivirus scanner Group: System Environment/Libraries @@ -54,17 +64,25 @@ Summary: Header files and libraries for the Clam Antivirus scanner Group: Development/Libraries Source100: clamd-gen -Requires: clamav-lib = %version-%release +Requires: clamav-lib = %version-%release +Requires: clamav-filesystem = %version-%release Requires(pre): %_libdir/pkgconfig %package data Summary: Virus signature data for the Clam Antivirus scanner Group: Applications/File -Provides: data(clamav) -Provides: user(clamav) -Provides: group(clamav) -BuildRequires: fedora-usermgmt-devel -%{?FE_USERADD_REQ} +Requires(pre): clamav-filesystem = %version-%release +Requires(postun): clamav-filesystem = %version-%release +Provides: data(clamav) = full +Conflicts: data(clamav) < full +Conflicts: data(clamav) > full + +%package data-empty +Summary: Empty data package for the Clam Antivirus scanner +Group: Applications/File +Provides: data(clamav) = empty +Conflicts: data(clamav) < empty +Conflicts: data(clamav) > empty %package update Summary: Auto-updater for the Clam Antivirus scanner data-files @@ -72,7 +90,7 @@ Source200: freshclam-sleep Source201: freshclam.sysconfig Source202: clamav-update.cron -Requires: clamav-data = %version-%release +Requires: clamav-filesystem = %version-%release Requires(pre): /etc/cron.d Requires(postun): /etc/cron.d Requires(post): %__chown %__chmod @@ -83,7 +101,8 @@ Group: System Environment/Daemons Requires: init(clamav-server) Requires: data(clamav) -Requires: clamav-lib = %version-%release +Requires: clamav-filesystem = %version-%release +Requires: clamav-lib = %version-%release %package server-sysv Summary: SysV initscripts for clamav server @@ -129,6 +148,9 @@ (including signatures for popular polymorphic viruses, too) and is KEPT UP TO DATE. +%description filesystem +This package provides the filesystem structure and contains the +user-creation scripts required by clamav. %description lib This package contains dynamic libraries shared between applications @@ -141,7 +163,29 @@ %description data This package contains the virus-database needed by clamav. This database should be updated regularly; the 'clamav-update' package -ships a corresponding cron-job. +ships a corresponding cron-job. This package and the +'clamav-data-empty' package are mutually exclusive. + +Use -data when you want a working (but perhaps outdated) virus scanner +immediately after package installation. + +Use -data-empty when you are updating the virus database regulary and +do not want to download a >5MB sized rpm-package with outdated virus +definitions. + + +%description data-empty +This is an empty package to fulfill inter-package dependencies of the +clamav suite. This package and the 'clamav-data' package are mutually +exclusive. + +Use -data when you want a working (but perhaps outdated) virus scanner +immediately after package installation. + +Use -data-empty when you are updating the virus database regulary and +do not want to download a >5MB sized rpm-package with outdated virus +definitions. + %description update This package contains programs which can be used to update the clamav @@ -179,11 +223,8 @@ ## ------------------------------------------------------------ %prep -%setup -q -%patch0 -p1 -b '.guys,please-read-the-compiler-warnings-before-doing-a-release.patch' -%patch1 -p1 -b .strncpy +%setup -q -n %name-%version%{?rcver} -%patch20 -p1 -b .user %patch21 -p1 -b .path %patch22 -p1 -b .initoff %patch23 -p1 -b .visibility @@ -240,11 +281,16 @@ ${RPM_BUILD_ROOT}%_var/log \ ${RPM_BUILD_ROOT}%milterstatedir \ ${RPM_BUILD_ROOT}%pkgdatadir/template \ - ${RPM_BUILD_ROOT}%_initrddir + ${RPM_BUILD_ROOT}%_initrddir \ + ${RPM_BUILD_ROOT}%homedir/daily.inc rm -f ${RPM_BUILD_ROOT}%_sysconfdir/clamd.conf \ ${RPM_BUILD_ROOT}%_libdir/*.la +for i in COPYING daily.{db,fp,hdb,info,ndb,pdb,zmd}; do + touch ${RPM_BUILD_ROOT}%homedir/daily.inc/$i +done + ## prepare the server-files mkdir _doc_server @@ -290,10 +336,7 @@ cat <$RPM_BUILD_ROOT%_sysconfdir/sysconfig/clamav-milter -## The '-blo' options might be usefully here -- especially for testing; see -## "man 8 clamav-milter" for further options -CLAMAV_FLAGS='--max-children=2 -c /etc/clamd.d/milter.conf local:%milterstatedir/clamav.sock' -CLAMAV_USER='%milteruser' +CLAMAV_FLAGS='-lo -c /etc/clamd.d/milter.conf local:%milterstatedir/clamav.sock' EOF install -p -m755 contrib/init/RedHat/clamav-milter $RPM_BUILD_ROOT%_initrddir/clamav-milter @@ -307,11 +350,16 @@ ## ------------------------------------------------------------ -%pre data +%pre filesystem %__fe_groupadd 4 -r %username &>/dev/null || : %__fe_useradd 4 -r -s /sbin/nologin -d %homedir -M \ -c 'Clamav database update user' -g %username %username &>/dev/null || : +%postun filesystem +%__fe_userdel %username &>/dev/null || : +%__fe_groupdel %username &>/dev/null || : + + %post update test -e %freshclamlog || { touch %freshclamlog @@ -319,10 +367,6 @@ %__chown root:%username %freshclamlog } -%postun data -%__fe_userdel %username &>/dev/null || : -%__fe_groupdel %username &>/dev/null || : - %pre milter %__fe_groupadd 5 -r %milteruser &>/dev/null || : %__fe_useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ @@ -378,7 +422,6 @@ %_includedir/* %_libdir/*.*a %_libdir/*.so -%dir %pkgdatadir %pkgdatadir/template %pkgdatadir/clamd-gen %_libdir/pkgconfig/* @@ -386,14 +429,25 @@ ## ----------------------- +%files filesystem +%attr(-,%username,%username) %dir %homedir +%attr(-,%username,%username) %dir %homedir/daily.inc +%attr(-,root,root) %dir %pkgdatadir + +## ----------------------- + %files data %defattr(-,%username,%username,-) -%dir %homedir # use %%config to keep files which were updated by 'freshclam' # already. Without this tag, they would be overridden with older # versions whenever a new -data package is installed. %config %verify(not size md5 mtime) %homedir/*.cvd + +%files data-empty +%defattr(-,%username,%username,-) +%ghost %attr(0664,%username,%username) %homedir/main.cvd + ## ----------------------- %files update @@ -408,6 +462,16 @@ %ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog +%ghost %attr(0664,%username,%username) %homedir/daily.inc/COPYING +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.db +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.fp +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.hdb +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.info +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.ndb +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.pdb +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.zmd + + ## ----------------------- %files server @@ -415,7 +479,6 @@ %doc _doc_server/* %_mandir/man[58]/clamd* %_sbindir/* -%dir %pkgdatadir %pkgdatadir/clamd-wrapper %dir %_sysconfdir/clamd.d @@ -448,6 +511,15 @@ %changelog +* Sat Feb 3 2007 Enrico Scholz - 0.90-0.2.rc3 +- updated to 0.90rc3 +- splitted mandatory parts from the data-file into a separate -filesystem + subpackage +- added a -data-empty subpackage to allow a setup where database is + updated per cron-job and user does not want to download the large + -data package with outdated virus definitations (#214949) +- %%ghost'ed the files downloaded by freshclam + * Tue Dec 12 2006 Enrico Scholz - 0.88.7-1 - updated to 0.88.7 From fedora-extras-commits at redhat.com Sat Feb 3 15:29:00 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Sat, 3 Feb 2007 10:29:00 -0500 Subject: rpms/skencil/devel skencil-0.6.17-fonts.patch, NONE, 1.1 skencil.spec, 1.13, 1.14 Message-ID: <200702031529.l13FT0BO031989@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/skencil/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31953 Modified Files: skencil.spec Added Files: skencil-0.6.17-fonts.patch Log Message: skencil-0.6.17-fonts.patch: --- NEW FILE skencil-0.6.17-fonts.patch --- --- skencil-0.6.17/Sketch/Base/config.py.fonts 2003-11-29 23:26:13.000000000 +0100 +++ skencil-0.6.17/Sketch/Base/config.py 2007-02-03 15:37:01.000000000 +0100 @@ -61,8 +61,10 @@ # # On platforms other than Linux this probably needs a few additional # directories. (non-existing dirs are automatically removed) -font_path = ['/usr/X11R6/lib/X11/fonts/Type1', - '/usr/share/ghostscript/fonts', +font_path = ['/usr/share/X11/fonts/Type1', + '/usr/share/fonts/default/Type1', + '/usr/share/fonts/default/ghostscript', + '/usr/X11R6/lib/X11/fonts/Type1', '/usr/lib/ghostscript/fonts'] --- skencil-0.6.17/Resources/Fontmetrics/gsopt.sfd.fonts 2007-02-03 15:37:32.000000000 +0100 +++ skencil-0.6.17/Resources/Fontmetrics/gsopt.sfd 2007-02-03 15:59:17.000000000 +0100 @@ -1,9 +1,9 @@ # optional ghostscript fonts -Utopia-Bold,Utopia,Bold,-adobe-Utopia-bold-r-normal,iso8859-1,putb -Utopia-BoldItalic,Utopia,Bold Italic,-adobe-Utopia-bold-i-normal,iso8859-1,putbi -Utopia-Regular,Utopia,Regular,-adobe-Utopia-regular-r-normal,iso8859-1,putr -Utopia-Italic,Utopia,Italic,-adobe-Utopia-regular-i-normal,iso8859-1,putri -CharterBT-Bold,Bitstream Charter,Bold,-bitstream-Charter-bold-r-normal,iso8859-1,bchb -CharterBT-BoldItalic,Bitstream Charter,Bold Italic,-bitstream-Charter-bold-i-normal,iso8859-1,bchbi -CharterBT-Roman,Bitstream Charter,Roman,-bitstream-Charter-normal-r-normal,iso8859-1,bchr -CharterBT-Italic,Bitstream Charter,Italic,-bitstream-Charter-normal-i-normal,iso8859-1,bchri +Utopia-Bold,Utopia,Bold,-adobe-utopia-bold-r-normal,iso8859-1,putb +Utopia-BoldItalic,Utopia,Bold Italic,-adobe-utopia-bold-i-normal,iso8859-1,putbi +Utopia-Regular,Utopia,Regular,-adobe-utopia-regular-r-normal,iso8859-1,putr +Utopia-Italic,Utopia,Italic,-adobe-utopia-regular-i-normal,iso8859-1,putri +CharterBT-Bold,Bitstream Charter,Bold,-bitstream-charter-bold-r-normal,iso8859-1,bchb +CharterBT-BoldItalic,Bitstream Charter,Bold Italic,-bitstream-charter-bold-i-normal,iso8859-1,bchbi +CharterBT-Roman,Bitstream Charter,Roman,-bitstream-charter-medium-r-normal,iso8859-1,bchr +CharterBT-Italic,Bitstream Charter,Italic,-bitstream-charter-medium-i-normal,iso8859-1,bchri --- skencil-0.6.17/Resources/Fontmetrics/gs.sfd.fonts 2007-02-03 15:37:38.000000000 +0100 +++ skencil-0.6.17/Resources/Fontmetrics/gs.sfd 2007-02-03 15:57:48.000000000 +0100 @@ -1,36 +1,36 @@ # The free versions of the standard postscript fonts shipped with ghostscript. -URWGothicL-Book,URW Gothic L,Book,-urw-URW Gothic L-book-r-normal,iso8859-1,a010013l -URWGothicL-Demi,URW Gothic L,Demi,-urw-URW Gothic L-demi-r-normal,iso8859-1,a010015l -URWGothicL-BookObli,URW Gothic L,Book Oblique,-urw-URW Gothic L-book-o-normal,iso8859-1,a010033l -URWGothicL-DemiObli,URW Gothic L,Demi Oblique,-urw-URW Gothic L-demi-o-normal,iso8859-1,a010035l -URWBookmanL-Ligh,URW Bookman L,Light,-urw-URW Bookman L-regular-r-normal,iso8859-1,b018012l -URWBookmanL-DemiBold,URW Bookman L,Demi Bold,-urw-URW Bookman L-bold-r-normal,iso8859-1,b018015l -URWBookmanL-LighItal,URW Bookman L,Light Italic,-urw-URW Bookman L-regular-i-normal,iso8859-1,b018032l -URWBookmanL-DemiBoldItal,URW Bookman L,Demi Bold Italic,-urw-URW Bookman L-bold-i-normal,iso8859-1,b018035l -CenturySchL-Roma,Century Schoolbook L,Roman,-urw-Century Schoolbook L-medium-r-normal,iso8859-1,c059013l +URWGothicL-Book,URW Gothic L,Book,-urw-urw gothic l-medium-r-normal,iso8859-1,a010013l +URWGothicL-Demi,URW Gothic L,Demi,-urw-urw gothic L-semibold-r-normal,iso8859-1,a010015l +URWGothicL-BookObli,URW Gothic L,Book Oblique,-urw-urw gothic l-medium-o-normal,iso8859-1,a010033l +URWGothicL-DemiObli,URW Gothic L,Demi Oblique,-urw-urw gothic l-semibold-o-normal,iso8859-1,a010035l +URWBookmanL-Ligh,URW Bookman L,Light,-urw-urw bookman l-medium-r-normal,iso8859-1,b018012l +URWBookmanL-DemiBold,URW Bookman L,Demi Bold,-urw-urw bookman l-bold-r-normal,iso8859-1,b018015l +URWBookmanL-LighItal,URW Bookman L,Light Italic,-urw-urw bookman l-regular-i-normal,iso8859-1,b018032l +URWBookmanL-DemiBoldItal,URW Bookman L,Demi Bold Italic,-urw-urw bookman l-bold-i-normal,iso8859-1,b018035l +CenturySchL-Roma,Century Schoolbook L,Roman,-urw-century schoolbook l-medium-r-normal,iso8859-1,c059013l CenturySchL-Bold,Century Schoolbook L,Bold,-urw-Century Schoolbook L-bold-r-normal,iso8859-1,c059016l -CenturySchL-Ital,Century Schoolbook L,Italic,-urw-Century Schoolbook L-regular-i-normal,iso8859-1,c059033l -CenturySchL-BoldItal,Century Schoolbook L,Bold Italic,-urw-Century Schoolbook L-bold-i-normal,iso8859-1,c059036l -Dingbats,Dingbats,Roman,-urw-Dingbats-regular-r-normal,adobe-fontspecific,d050000l -NimbusSanL-Regu,Nimbus Sans L,Regular,-urw-Nimbus Sans L-regular-r-normal,iso8859-1,n019003l -NimbusSanL-Bold,Nimbus Sans L,Bold,-urw-Nimbus Sans L-bold-r-normal,iso8859-1,n019004l -NimbusSanL-ReguItal,Nimbus Sans L,Regular Italic,-urw-Nimbus Sans L-regular-i-normal,iso8859-1,n019023l -NimbusSanL-BoldItal,Nimbus Sans L,Bold Italic,-urw-Nimbus Sans L-bold-i-normal,iso8859-1,n019024l -NimbusSanL-ReguCond,Nimbus Sans L,Regular Condensed,-urw-Nimbus Sans L-regular-r-condensed,iso8859-1,n019043l -NimbusSanL-BoldCond,Nimbus Sans L,Bold Condensed,-urw-Nimbus Sans L-bold-r-condensed,iso8859-1,n019044l -NimbusSanL-ReguCondItal,Nimbus Sans L,Regular Condensed Italic,-urw-Nimbus Sans L-regular-i-condensed,iso8859-1,n019063l -NimbusSanL-BoldCondItal,Nimbus Sans L,Bold Condensed Italic,-urw-Nimbus Sans L-bold-i-condensed,iso8859-1,n019064l -NimbusRomNo9L-Regu,Nimbus Roman No9 L,Regular,-urw-Nimbus Roman No9 L-regular-r-normal,iso8859-1,n021003l -NimbusRomNo9L-Medi,Nimbus Roman No9 L,Medium,-urw-Nimbus Roman No9 L-bold-r-normal,iso8859-1,n021004l -NimbusRomNo9L-ReguItal,Nimbus Roman No9 L,Regular Italic,-urw-Nimbus Roman No9 L-regular-i-normal,iso8859-1,n021023l -NimbusRomNo9L-MediItal,Nimbus Roman No9 L,Medium Italic,-urw-Nimbus Roman No9 L-bold-i-normal,iso8859-1,n021024l -NimbusMonL-Regu,Nimbus Mono L,Regular,-urw-Nimbus Mono L-regular-r-normal,iso8859-1,n022003l -NimbusMonL-Bold,Nimbus Mono L,Bold,-urw-Nimbus Mono L-bold-r-normal,iso8859-1,n022004l -NimbusMonL-ReguObli,Nimbus Mono L,Regular Oblique,-urw-Nimbus Mono L-regular-o-normal,iso8859-1,n022023l -NimbusMonL-BoldObli,Nimbus Mono L,Bold Oblique,-urw-Nimbus Mono L-bold-o-normal,iso8859-1,n022024l -URWPalladioL-Roma,URW Palladio L,Roman,-urw-URW Palladio L-medium-r-normal,iso8859-1,p052003l -URWPalladioL-Bold,URW Palladio L,Bold,-urw-URW Palladio L-bold-r-normal,iso8859-1,p052004l -URWPalladioL-Ital,URW Palladio L,Italic,-urw-URW Palladio L-regular-i-normal,iso8859-1,p052023l -URWPalladioL-BoldItal,URW Palladio L,Bold Italic,-urw-URW Palladio L-bold-i-normal,iso8859-1,p052024l -StandardSymL,Standard Symbols L,Roman,-urw-Standard Symbols L-regular-r-normal,adobe-fontspecific,s050000l -URWChanceryL-MediItal,URW Chancery L,Medium Italic,-urw-URW Chancery L-medium-i-normal,iso8859-1,z003034l +CenturySchL-Ital,Century Schoolbook L,Italic,-urw-century schoolbook l-regular-i-normal,iso8859-1,c059033l +CenturySchL-BoldItal,Century Schoolbook L,Bold Italic,-urw-century schoolbook l-bold-i-normal,iso8859-1,c059036l +Dingbats,Dingbats,Roman,-urw-dingbats-medium-r-normal,adobe-fontspecific,d050000l +NimbusSanL-Regu,Nimbus Sans L,Regular,-urw-nimbus sans l-medium-r-normal,iso8859-1,n019003l +NimbusSanL-Bold,Nimbus Sans L,Bold,-urw-nimbus sans l-bold-r-normal,iso8859-1,n019004l +NimbusSanL-ReguItal,Nimbus Sans L,Regular Italic,-urw-nimbus sans l-medium-i-normal,iso8859-1,n019023l +NimbusSanL-BoldItal,Nimbus Sans L,Bold Italic,-urw-nimbus sans l-bold-i-normal,iso8859-1,n019024l +NimbusSanL-ReguCond,Nimbus Sans L,Regular Condensed,-urw-nimbus sans l condensed-medium-r-condensed,iso8859-1,n019043l +NimbusSanL-BoldCond,Nimbus Sans L,Bold Condensed,-urw-nimbus sans l condensed-bold-r-condensed,iso8859-1,n019044l +NimbusSanL-ReguCondItal,Nimbus Sans L,Regular Condensed Italic,-urw-nimbus sans l condensed-medium-i-condensed,iso8859-1,n019063l +NimbusSanL-BoldCondItal,Nimbus Sans L,Bold Condensed Italic,-urw-nimbus sans l condensed-bold-i-condensed,iso8859-1,n019064l +NimbusRomNo9L-Regu,Nimbus Roman No9 L,Regular,-urw-nimbus roman no9 l-medium-r-normal,iso8859-1,n021003l +NimbusRomNo9L-Medi,Nimbus Roman No9 L,Medium,-urw-nimbus roman no9 l-bold-r-normal,iso8859-1,n021004l +NimbusRomNo9L-ReguItal,Nimbus Roman No9 L,Regular Italic,-urw-nimbus roman no9 l-medium-i-normal,iso8859-1,n021023l +NimbusRomNo9L-MediItal,Nimbus Roman No9 L,Medium Italic,-urw-nimbus roman no9 l-bold-i-normal,iso8859-1,n021024l +NimbusMonL-Regu,Nimbus Mono L,Regular,-urw-nimbus mono l-medium-r-normal,iso8859-1,n022003l +NimbusMonL-Bold,Nimbus Mono L,Bold,-urw-nimbus mono L-bold-r-normal,iso8859-1,n022004l +NimbusMonL-ReguObli,Nimbus Mono L,Regular Oblique,-urw-nimbus mono l-medium-o-normal,iso8859-1,n022023l +NimbusMonL-BoldObli,Nimbus Mono L,Bold Oblique,-urw-nimbus mono l-bold-o-normal,iso8859-1,n022024l +URWPalladioL-Roma,URW Palladio L,Roman,-urw-urw palladio l-medium-r-normal,iso8859-1,p052003l +URWPalladioL-Bold,URW Palladio L,Bold,-urw-urw palladio l-bold-r-normal,iso8859-1,p052004l +URWPalladioL-Ital,URW Palladio L,Italic,-urw-urw palladio l-medium-i-normal,iso8859-1,p052023l +URWPalladioL-BoldItal,URW Palladio L,Bold Italic,-urw-urw palladio l-bold-i-normal,iso8859-1,p052024l +StandardSymL,Standard Symbols L,Roman,-urw-standard symbols l-medium-r-normal,adobe-fontspecific,s050000l +URWChanceryL-MediItal,URW Chancery L,Medium Italic,-urw-urw chancery l-medium-i-normal,iso8859-1,z003034l --- skencil-0.6.17/Resources/Fontmetrics/std.sfd.fonts 2007-02-03 15:37:44.000000000 +0100 +++ skencil-0.6.17/Resources/Fontmetrics/std.sfd 2007-02-03 15:48:24.000000000 +0100 @@ -1,36 +1,36 @@ # standard postscript fonts -AvantGarde-DemiOblique,ITC Avant Garde Gothic,Demi Oblique,-adobe-ITC Avant Garde Gothic-demi-o-normal,iso8859-1,pagdo -AvantGarde-Book,ITC Avant Garde Gothic,Book,-adobe-ITC Avant Garde Gothic-book-r-normal,iso8859-1,pagk -AvantGarde-BookOblique,ITC Avant Garde Gothic,Book Oblique,-adobe-ITC Avant Garde Gothic-book-o-normal,iso8859-1,pagko -Bookman-Demi,ITC Bookman,Demi,-adobe-ITC Bookman-demi-r-normal,iso8859-1,pbkd -Bookman-DemiItalic,ITC Bookman,Demi Italic,-adobe-ITC Bookman-demi-i-normal,iso8859-1,pbkdi -Bookman-Light,ITC Bookman,Light,-adobe-ITC Bookman-light-r-normal,iso8859-1,pbkl -Bookman-LightItalic,ITC Bookman,Light Italic,-adobe-ITC Bookman-light-i-normal,iso8859-1,pbkli -Courier-Bold,Courier,Bold,-adobe-Courier-bold-r-normal,iso8859-1,pcrb -Courier-BoldOblique,Courier,Bold Oblique,-adobe-Courier-bold-o-normal,iso8859-1,pcrbo -Courier,Courier,Roman,-adobe-Courier-medium-r-normal,iso8859-1,pcrr -Courier-Oblique,Courier,Oblique,-adobe-Courier-medium-o-normal,iso8859-1,pcrro -Helvetica-Bold,Helvetica,Bold,-adobe-Helvetica-bold-r-normal,iso8859-1,phvb -Helvetica-Narrow-Bold,Helvetica,Narrow Bold,-adobe-Helvetica-bold-r-narrow,iso8859-1,phvbn -Helvetica-BoldOblique,Helvetica,Bold Oblique,-adobe-Helvetica-bold-o-normal,iso8859-1,phvbo -Helvetica-Narrow-BoldOblique,Helvetica,Narrow Bold Oblique,-adobe-Helvetica-bold-o-narrow,iso8859-1,phvbon -Helvetica,Helvetica,Roman,-adobe-Helvetica-medium-r-normal,iso8859-1,phvr -Helvetica-Narrow,Helvetica,Narrow,-adobe-Helvetica-medium-r-narrow,iso8859-1,phvrn -Helvetica-Oblique,Helvetica,Oblique,-adobe-Helvetica-medium-o-normal,iso8859-1,phvro -Helvetica-Narrow-Oblique,Helvetica,Narrow Oblique,-adobe-Helvetica-medium-o-narrow,iso8859-1,phvron -NewCenturySchlbk-Bold,New Century Schoolbook,Bold,-adobe-New Century Schoolbook-bold-r-normal,iso8859-1,pncb -NewCenturySchlbk-BoldItalic,New Century Schoolbook,Bold Italic,-adobe-New Century Schoolbook-bold-i-normal,iso8859-1,pncbi -NewCenturySchlbk-Roman,New Century Schoolbook,Roman,-adobe-New Century Schoolbook-medium-r-normal,iso8859-1,pncr -NewCenturySchlbk-Italic,New Century Schoolbook,Italic,-adobe-New Century Schoolbook-medium-i-normal,iso8859-1,pncri -Palatino-Bold,Palatino,Bold,-adobe-Palatino-bold-r-normal,iso8859-1,pplb -Palatino-BoldItalic,Palatino,Bold Italic,-adobe-Palatino-bold-i-normal,iso8859-1,pplbi -Palatino-Roman,Palatino,Roman,-adobe-Palatino-medium-r-normal,iso8859-1,pplr -Palatino-Italic,Palatino,Italic,-adobe-Palatino-medium-i-normal,iso8859-1,pplri -Times-Bold,Times,Bold,-adobe-Times-bold-r-normal,iso8859-1,ptmb -Times-BoldItalic,Times,Bold Italic,-adobe-Times-bold-i-normal,iso8859-1,ptmbi -Times-Roman,Times,Roman,-adobe-Times-medium-r-normal,iso8859-1,ptmr -Symbol,Symbol,Roman,-adobe-Symbol-medium-r-normal,adobe-fontspecific,psyr -Times-Italic,Times,Italic,-adobe-Times-medium-i-normal,iso8859-1,ptmri -ZapfChancery-MediumItalic,ITC Zapf Chancery,Medium Italic,-adobe-ITC Zapf Chancery-medium-i-normal,iso8859-1,pzcmi -ZapfDingbats,ITC Zapf Dingbats,Roman,-adobe-ITC Zapf Dingbats-medium-r-normal,adobe-fontspecific,pzdr -AvantGarde-Demi,ITC Avant Garde Gothic,Demi,-adobe-ITC Avant Garde Gothic-demi-r-normal,iso8859-1,pagd +#AvantGarde-Demi,ITC Avant Garde Gothic,Demi,-adobe-ITC Avant Garde Gothic-demi-r-normal,iso8859-1,pagd +#AvantGarde-DemiOblique,ITC Avant Garde Gothic,Demi Oblique,-adobe-ITC Avant Garde Gothic-demi-o-normal,iso8859-1,pagdo +#AvantGarde-Book,ITC Avant Garde Gothic,Book,-adobe-ITC Avant Garde Gothic-book-r-normal,iso8859-1,pagk +#AvantGarde-BookOblique,ITC Avant Garde Gothic,Book Oblique,-adobe-ITC Avant Garde Gothic-book-o-normal,iso8859-1,pagko +#Bookman-Demi,ITC Bookman,Demi,-adobe-ITC Bookman-demi-r-normal,iso8859-1,pbkd +#Bookman-DemiItalic,ITC Bookman,Demi Italic,-adobe-ITC Bookman-demi-i-normal,iso8859-1,pbkdi +#Bookman-Light,ITC Bookman,Light,-adobe-ITC Bookman-light-r-normal,iso8859-1,pbkl +#Bookman-LightItalic,ITC Bookman,Light Italic,-adobe-ITC Bookman-light-i-normal,iso8859-1,pbkli +Courier-Bold,Courier,Bold,-adobe-courier-bold-r-normal,iso8859-1,pcrb +Courier-BoldOblique,Courier,Bold Oblique,-adobe-courier-bold-o-normal,iso8859-1,pcrbo +Courier,Courier,Roman,-adobe-courier-medium-r-normal,iso8859-1,pcrr +Courier-Oblique,Courier,Oblique,-adobe-courier-medium-o-normal,iso8859-1,pcrro +Helvetica-Bold,Helvetica,Bold,-adobe-helvetica-bold-r-normal,iso8859-1,phvb +#Helvetica-Narrow-Bold,Helvetica,Narrow Bold,-adobe-helvetica-bold-r-narrow,iso8859-1,phvbn +Helvetica-BoldOblique,Helvetica,Bold Oblique,-adobe-helvetica-bold-o-normal,iso8859-1,phvbo +#Helvetica-Narrow-BoldOblique,Helvetica,Narrow Bold Oblique,-adobe-Helvetica-bold-o-narrow,iso8859-1,phvbon +Helvetica,Helvetica,Roman,-adobe-helvetica-medium-r-normal,iso8859-1,phvr +#Helvetica-Narrow,Helvetica,Narrow,-adobe-Helvetica-medium-r-narrow,iso8859-1,phvrn +Helvetica-Oblique,Helvetica,Oblique,-adobe-helvetica-medium-o-normal,iso8859-1,phvro +#Helvetica-Narrow-Oblique,Helvetica,Narrow Oblique,-adobe-Helvetica-medium-o-narrow,iso8859-1,phvron +NewCenturySchlbk-Bold,New Century Schoolbook,Bold,-adobe-new century schoolbook-bold-r-normal,iso8859-1,pncb +NewCenturySchlbk-BoldItalic,New Century Schoolbook,Bold Italic,-adobe-new century schoolbook-bold-i-normal,iso8859-1,pncbi +NewCenturySchlbk-Roman,New Century Schoolbook,Roman,-adobe-new century schoolbook-medium-r-normal,iso8859-1,pncr +NewCenturySchlbk-Italic,New Century Schoolbook,Italic,-adobe-new century schoolbook-medium-i-normal,iso8859-1,pncri +#Palatino-Bold,Palatino,Bold,-adobe-Palatino-bold-r-normal,iso8859-1,pplb +#Palatino-BoldItalic,Palatino,Bold Italic,-adobe-Palatino-bold-i-normal,iso8859-1,pplbi +#Palatino-Roman,Palatino,Roman,-adobe-Palatino-medium-r-normal,iso8859-1,pplr +#Palatino-Italic,Palatino,Italic,-adobe-Palatino-medium-i-normal,iso8859-1,pplri +Times-Bold,Times,Bold,-adobe-times-bold-r-normal,iso8859-1,ptmb +Times-BoldItalic,Times,Bold Italic,-adobe-times-bold-i-normal,iso8859-1,ptmbi +Times-Roman,Times,Roman,-adobe-times-medium-r-normal,iso8859-1,ptmr +Times-Italic,Times,Italic,-adobe-times-medium-i-normal,iso8859-1,ptmri +Symbol,Symbol,Roman,-adobe-symbol-medium-r-normal,adobe-fontspecific,psyr +#ZapfChancery-MediumItalic,ITC Zapf Chancery,Medium Italic,-adobe-ITC Zapf Chancery-medium-i-normal,iso8859-1,pzcmi +#ZapfDingbats,ITC Zapf Dingbats,Roman,-adobe-ITC Zapf Dingbats-medium-r-normal,adobe-fontspecific,pzdr Index: skencil.spec =================================================================== RCS file: /cvs/extras/rpms/skencil/devel/skencil.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- skencil.spec 3 Feb 2007 15:09:09 -0000 1.13 +++ skencil.spec 3 Feb 2007 15:28:27 -0000 1.14 @@ -1,6 +1,6 @@ Name: skencil Version: 0.6.17 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Vector drawing program From fedora-extras-commits at redhat.com Sat Feb 3 15:30:08 2007 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Sat, 3 Feb 2007 10:30:08 -0500 Subject: rpms/moomps/devel moomps.spec,1.17,1.18 Message-ID: <200702031530.l13FU8eo032108@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moomps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31988 Modified Files: moomps.spec Log Message: prevent useless debug information package from being built. Index: moomps.spec =================================================================== RCS file: /cvs/extras/rpms/moomps/devel/moomps.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- moomps.spec 21 Nov 2006 21:51:22 -0000 1.17 +++ moomps.spec 3 Feb 2007 15:29:35 -0000 1.18 @@ -1,6 +1,6 @@ Name: moomps Version: 5.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Powerful modular monitoring service Group: Applications/System License: GPL @@ -13,6 +13,8 @@ Requires(post): /sbin/chkconfig Requires(postun): /sbin/service Requires: moodss >= 21.2, tclx >= 8.3 +# not architecture dependent, but installation paths differ on 64 bit architecture: +%define debug_package %nil %description moomps (Modular Object Oriented Multi-Purpose Service) is a modular @@ -80,6 +82,9 @@ %changelog +* Sat Feb 3 2007 Jean-Luc Fontaine 5.8-2 +- prevent useless debug information package from being built + * Sun Nov 12 2006 Jean-Luc Fontaine 5.8-1 - 5.8 upstream release - pass library directories to make also at install stage From fedora-extras-commits at redhat.com Sat Feb 3 15:33:39 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Sat, 3 Feb 2007 10:33:39 -0500 Subject: rpms/gforth/FC-6 gforth-0.6.2-buildpath.patch, NONE, 1.1 gforth.spec, 1.4, 1.5 Message-ID: <200702031533.l13FXdaj032251@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gforth/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32219 Modified Files: gforth.spec Added Files: gforth-0.6.2-buildpath.patch Log Message: gforth-0.6.2-buildpath.patch: --- NEW FILE gforth-0.6.2-buildpath.patch --- --- gforth-0.6.2/Makefile.in.buildpath 2007-02-03 16:25:33.000000000 +0100 +++ gforth-0.6.2/Makefile.in 2007-02-03 16:26:02.000000000 +0100 @@ -544,8 +544,6 @@ else \ echo ">>>>>Please install $(srcdir)/gforth.el in your .../emacs/site-lisp directory"; \ fi - -$(RM) gforth.fi - GFORTHD="./gforth-ditc -p $(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc --die-on-signal -i $(kernel_fi) $(STARTUP)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP) $(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION) $(INSTALL_DATA) install.TAGS $(datadir)/gforth/$(VERSION)/TAGS $(RM) gforth.fi install.TAGS Index: gforth.spec =================================================================== RCS file: /cvs/extras/rpms/gforth/FC-6/gforth.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gforth.spec 28 Aug 2006 00:53:41 -0000 1.4 +++ gforth.spec 3 Feb 2007 15:33:07 -0000 1.5 @@ -1,6 +1,6 @@ Name: gforth Version: 0.6.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Fast and portable implementation of the ANS Forth language Group: Development/Languages @@ -9,6 +9,7 @@ Source: http://www.complang.tuwien.ac.at/forth/gforth/gforth-0.6.2.tar.gz Patch0: gforth.patch Patch1: gforth-shebang.patch +Patch2: gforth-0.6.2-buildpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/install-info Requires(postun): /sbin/install-info @@ -33,6 +34,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build @@ -122,6 +124,9 @@ %changelog +* Sat Feb 3 2007 Gerard Milmeister - 0.6.2-8 +- patch to remove buildpath from binary + * Mon Aug 28 2006 Gerard Milmeister - 0.6.2-7 - Rebuild for FE6 From fedora-extras-commits at redhat.com Sat Feb 3 15:34:19 2007 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 3 Feb 2007 10:34:19 -0500 Subject: rpms/clamav/devel sources,1.22,1.23 Message-ID: <200702031534.l13FYJUO032283@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32258/devel Modified Files: sources Log Message: - updated to 0.90rc3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 12 Dec 2006 08:17:53 -0000 1.22 +++ sources 3 Feb 2007 15:33:47 -0000 1.23 @@ -1,2 +1,2 @@ -34a9d58cf5bcb04dbe3eb32b5367a3f8 clamav-0.88.7.tar.gz -b19286b26aafe255c7e1e1d0fc4d3797 clamav-0.88.7.tar.gz.sig +5af2bdbbb255829dd590609d900c1854 clamav-0.90rc3.tar.gz +978715ae312d5dda63a0591b0a4eae14 clamav-0.90rc3.tar.gz.sig From fedora-extras-commits at redhat.com Sat Feb 3 15:35:02 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Sat, 3 Feb 2007 10:35:02 -0500 Subject: rpms/gforth/devel gforth-0.6.2-buildpath.patch, NONE, 1.1 gforth.spec, 1.4, 1.5 Message-ID: <200702031535.l13FZ2Dd032323@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gforth/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32297/devel Modified Files: gforth.spec Added Files: gforth-0.6.2-buildpath.patch Log Message: gforth-0.6.2-buildpath.patch: --- NEW FILE gforth-0.6.2-buildpath.patch --- --- gforth-0.6.2/Makefile.in.buildpath 2007-02-03 16:25:33.000000000 +0100 +++ gforth-0.6.2/Makefile.in 2007-02-03 16:26:02.000000000 +0100 @@ -544,8 +544,6 @@ else \ echo ">>>>>Please install $(srcdir)/gforth.el in your .../emacs/site-lisp directory"; \ fi - -$(RM) gforth.fi - GFORTHD="./gforth-ditc -p $(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc --die-on-signal -i $(kernel_fi) $(STARTUP)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP) $(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION) $(INSTALL_DATA) install.TAGS $(datadir)/gforth/$(VERSION)/TAGS $(RM) gforth.fi install.TAGS Index: gforth.spec =================================================================== RCS file: /cvs/extras/rpms/gforth/devel/gforth.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gforth.spec 28 Aug 2006 00:53:41 -0000 1.4 +++ gforth.spec 3 Feb 2007 15:34:30 -0000 1.5 @@ -1,6 +1,6 @@ Name: gforth Version: 0.6.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Fast and portable implementation of the ANS Forth language Group: Development/Languages @@ -9,6 +9,7 @@ Source: http://www.complang.tuwien.ac.at/forth/gforth/gforth-0.6.2.tar.gz Patch0: gforth.patch Patch1: gforth-shebang.patch +Patch2: gforth-0.6.2-buildpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/install-info Requires(postun): /sbin/install-info @@ -33,6 +34,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build @@ -122,6 +124,9 @@ %changelog +* Sat Feb 3 2007 Gerard Milmeister - 0.6.2-8 +- patch to remove buildpath from binary + * Mon Aug 28 2006 Gerard Milmeister - 0.6.2-7 - Rebuild for FE6 From fedora-extras-commits at redhat.com Sat Feb 3 15:39:55 2007 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Sat, 3 Feb 2007 10:39:55 -0500 Subject: rpms/moomps/FC-6 moomps.spec,1.16,1.17 Message-ID: <200702031539.l13FdtPf032479@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moomps/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32440 Modified Files: moomps.spec Log Message: prevent useless debug information package from being built. Index: moomps.spec =================================================================== RCS file: /cvs/extras/rpms/moomps/FC-6/moomps.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- moomps.spec 21 Nov 2006 22:36:15 -0000 1.16 +++ moomps.spec 3 Feb 2007 15:39:22 -0000 1.17 @@ -1,6 +1,6 @@ Name: moomps Version: 5.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Powerful modular monitoring service Group: Applications/System License: GPL @@ -13,6 +13,8 @@ Requires(post): /sbin/chkconfig Requires(postun): /sbin/service Requires: moodss >= 21.2, tclx >= 8.3 +# not architecture dependent, but installation paths differ on 64 bit architecture: +%define debug_package %nil %description moomps (Modular Object Oriented Multi-Purpose Service) is a modular @@ -80,6 +82,9 @@ %changelog +* Sat Feb 3 2007 Jean-Luc Fontaine 5.8-2 +- prevent useless debug information package from being built + * Sun Nov 12 2006 Jean-Luc Fontaine 5.8-1 - 5.8 upstream release - pass library directories to make also at install stage From fedora-extras-commits at redhat.com Sat Feb 3 15:45:46 2007 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Sat, 3 Feb 2007 10:45:46 -0500 Subject: rpms/emacs-vm/FC-5 .cvsignore, 1.2, 1.3 emacs-vm.spec, 1.1, 1.2 sources, 1.2, 1.3 vm-stdlib-patch.diff, 1.1, NONE Message-ID: <200702031545.l13FjkCI000425@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-vm/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv310 Modified Files: .cvsignore emacs-vm.spec sources Removed Files: vm-stdlib-patch.diff Log Message: * Sat Feb 3 2007 Jonathan G. Underwood - 7.19-5 - Add patch from http://www.robf.de/Hacking/elisp/ (resolves bug 224501) - Ensure CFLAGS="$RPM_OPT_FLAGS" (bug 225101) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/emacs-vm/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Jun 2006 19:10:04 -0000 1.2 +++ .cvsignore 3 Feb 2007 15:45:14 -0000 1.3 @@ -1 +1,2 @@ vm-7.19.tar.gz +vm-7.19.070203.patch.gz Index: emacs-vm.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-vm/FC-5/emacs-vm.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- emacs-vm.spec 22 Jun 2006 19:10:04 -0000 1.1 +++ emacs-vm.spec 3 Feb 2007 15:45:14 -0000 1.2 @@ -1,12 +1,24 @@ +# Upstream vm (http://www.wonderworks.com/vm/) seems to be currently +# unmaintained. This package adds the patchset maintained by Robert +# Widhopf-Fenk +# (http://www.robf.de/Hacking/elisp/vm-7.19.patch.gz). Unfortunately, +# the patch set version number is not updated with each release, so I +# have manually added a minor version number to the patch +# .YYMMDD. Some functionality of the patch is currently unavailable, +# namely that associated with pgg.el (only available on emacs >=22) is +# only available on FC>6. Currently, since bbdb and grepmail are not +# packaged, functionality associated with those is also not available. +# More details at http://www.robf.de/Hacking/elisp/ + %define pkg vm Summary: Emacs VM mailreader Name: emacs-%{pkg} Version: 7.19 -Release: 3%{?dist} +Release: 5%{?dist} URL: http://www.wonderworks.com/vm/ Source0: http://www.seanet.com/~kylemonger/vm/%{pkg}-%{version}.tar.gz -Patch0: vm-stdlib-patch.diff +Patch0: vm-7.19.070203.patch.gz License: GPL Group: Applications/Internet BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -22,7 +34,8 @@ messages to folders, deleting messages and so on. There are other more advanced commands that do tasks like bursting and creating digests, message forwarding, and organizing message presentation -according to various criteria. +according to various criteria. This package includes Robert +widhopf-Fenk's patchset (http://www.robf.de/Hacking/elisp/). %package el Group: Applications/Internet @@ -36,20 +49,26 @@ %prep %setup -q -n %{pkg}-%{version} %patch0 -p1 +mv Makefile Makefile.bk +sed -e 's/mkdirhier/mkdir -p/g' Makefile.bk > Makefile %build %define pkgdir %{_datadir}/emacs/site-lisp/vm %define pixmapdir %{pkgdir}/pixmaps +export CFLAGS="$RPM_OPT_FLAGS" + make %{?_smp_mflags} all \ prefix=%{_prefix} \ INFODIR=%{_infodir} \ LISPDIR=%{pkgdir} \ BINDIR=%{_bindir} \ - PIXMAPDIR=%{pixmapdir} + PIXMAPDIR=%{pixmapdir} \ + EMACS=emacs %install rm -rf %{buildroot} +echo %{buildroot}%{_prefix} make install \ prefix=%{buildroot}%{_prefix} \ INFODIR=%{buildroot}%{_infodir} \ @@ -57,6 +76,8 @@ BINDIR=%{buildroot}%{_bindir} \ PIXMAPDIR=%{buildroot}%{pixmapdir} +cp *.el %{buildroot}%{pkgdir} + %define startd %{_datadir}/emacs/site-lisp/site-start.d/ %define initfile %{startd}/%{pkg}-mode-init.el @@ -93,8 +114,8 @@ %doc README COPYING %doc %{_infodir}/* %{_bindir}/* -%{_datadir}/emacs/site-lisp/vm/pixmaps/ -%{_datadir}/emacs/site-lisp/vm/*.elc +%{pixmapdir} +%{pkgdir}/*.elc %{initfile} %dir %{pkgdir} @@ -103,6 +124,13 @@ %{pkgdir}/*.el %changelog +* Sat Feb 3 2007 Jonathan G. Underwood - 7.19-5 +- Add patch from http://www.robf.de/Hacking/elisp/ (resolves bug 224501) +- Ensure CFLAGS="$RPM_OPT_FLAGS" (bug 225101) + +* Mon Aug 28 2006 Jonathan G. Underwood - 7.19-4 +- Bump release for FC-6 mass rebuild + * Tue Jun 20 2006 Jonathan G. Underwood - 7.19-3 - Change group to Applications/Internet - Add release tag to the Requires for the -el package Index: sources =================================================================== RCS file: /cvs/extras/rpms/emacs-vm/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Jun 2006 19:10:04 -0000 1.2 +++ sources 3 Feb 2007 15:45:14 -0000 1.3 @@ -1 +1,2 @@ 7866f6243e398d76ae32356a4af76fa3 vm-7.19.tar.gz +fadfef52b6b8eded9a84afdcd0282de9 vm-7.19.070203.patch.gz --- vm-stdlib-patch.diff DELETED --- From fedora-extras-commits at redhat.com Sat Feb 3 15:47:30 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Sat, 3 Feb 2007 10:47:30 -0500 Subject: rpms/gforth/devel gforth.spec,1.5,1.6 Message-ID: <200702031547.l13FlU8Q000566@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gforth/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv505 Modified Files: gforth.spec Log Message: Index: gforth.spec =================================================================== RCS file: /cvs/extras/rpms/gforth/devel/gforth.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gforth.spec 3 Feb 2007 15:34:30 -0000 1.5 +++ gforth.spec 3 Feb 2007 15:46:57 -0000 1.6 @@ -1,6 +1,6 @@ Name: gforth Version: 0.6.2 -Release: 8%{?dist} +Release: 10%{?dist} Summary: Fast and portable implementation of the ANS Forth language Group: Development/Languages @@ -70,6 +70,7 @@ touch $RPM_BUILD_ROOT$dir/gforth.el done +find $RPM_BUILD_ROOT -name TAGS | xargs rm -f %post /sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir 2>/dev/null || : From fedora-extras-commits at redhat.com Sat Feb 3 15:48:52 2007 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Sat, 3 Feb 2007 10:48:52 -0500 Subject: rpms/emacs-vm/FC-6 .cvsignore, 1.2, 1.3 emacs-vm.spec, 1.2, 1.3 sources, 1.2, 1.3 vm-stdlib-patch.diff, 1.1, NONE Message-ID: <200702031548.l13FmqAp000698@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-vm/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv625 Modified Files: .cvsignore emacs-vm.spec sources Removed Files: vm-stdlib-patch.diff Log Message: * Sat Feb 3 2007 Jonathan G. Underwood - 7.19-5 - Add patch from http://www.robf.de/Hacking/elisp/ (resolves bug 224501) - Ensure CFLAGS="$RPM_OPT_FLAGS" (bug 225101) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/emacs-vm/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Jun 2006 19:10:04 -0000 1.2 +++ .cvsignore 3 Feb 2007 15:48:20 -0000 1.3 @@ -1 +1,2 @@ vm-7.19.tar.gz +vm-7.19.070203.patch.gz Index: emacs-vm.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-vm/FC-6/emacs-vm.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- emacs-vm.spec 28 Aug 2006 00:07:58 -0000 1.2 +++ emacs-vm.spec 3 Feb 2007 15:48:20 -0000 1.3 @@ -1,12 +1,24 @@ +# Upstream vm (http://www.wonderworks.com/vm/) seems to be currently +# unmaintained. This package adds the patchset maintained by Robert +# Widhopf-Fenk +# (http://www.robf.de/Hacking/elisp/vm-7.19.patch.gz). Unfortunately, +# the patch set version number is not updated with each release, so I +# have manually added a minor version number to the patch +# .YYMMDD. Some functionality of the patch is currently unavailable, +# namely that associated with pgg.el (only available on emacs >=22) is +# only available on FC>6. Currently, since bbdb and grepmail are not +# packaged, functionality associated with those is also not available. +# More details at http://www.robf.de/Hacking/elisp/ + %define pkg vm Summary: Emacs VM mailreader Name: emacs-%{pkg} Version: 7.19 -Release: 4%{?dist} +Release: 5%{?dist} URL: http://www.wonderworks.com/vm/ Source0: http://www.seanet.com/~kylemonger/vm/%{pkg}-%{version}.tar.gz -Patch0: vm-stdlib-patch.diff +Patch0: vm-7.19.070203.patch.gz License: GPL Group: Applications/Internet BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -22,7 +34,8 @@ messages to folders, deleting messages and so on. There are other more advanced commands that do tasks like bursting and creating digests, message forwarding, and organizing message presentation -according to various criteria. +according to various criteria. This package includes Robert +widhopf-Fenk's patchset (http://www.robf.de/Hacking/elisp/). %package el Group: Applications/Internet @@ -36,20 +49,26 @@ %prep %setup -q -n %{pkg}-%{version} %patch0 -p1 +mv Makefile Makefile.bk +sed -e 's/mkdirhier/mkdir -p/g' Makefile.bk > Makefile %build %define pkgdir %{_datadir}/emacs/site-lisp/vm %define pixmapdir %{pkgdir}/pixmaps +export CFLAGS="$RPM_OPT_FLAGS" + make %{?_smp_mflags} all \ prefix=%{_prefix} \ INFODIR=%{_infodir} \ LISPDIR=%{pkgdir} \ BINDIR=%{_bindir} \ - PIXMAPDIR=%{pixmapdir} + PIXMAPDIR=%{pixmapdir} \ + EMACS=emacs %install rm -rf %{buildroot} +echo %{buildroot}%{_prefix} make install \ prefix=%{buildroot}%{_prefix} \ INFODIR=%{buildroot}%{_infodir} \ @@ -57,6 +76,8 @@ BINDIR=%{buildroot}%{_bindir} \ PIXMAPDIR=%{buildroot}%{pixmapdir} +cp *.el %{buildroot}%{pkgdir} + %define startd %{_datadir}/emacs/site-lisp/site-start.d/ %define initfile %{startd}/%{pkg}-mode-init.el @@ -93,8 +114,8 @@ %doc README COPYING %doc %{_infodir}/* %{_bindir}/* -%{_datadir}/emacs/site-lisp/vm/pixmaps/ -%{_datadir}/emacs/site-lisp/vm/*.elc +%{pixmapdir} +%{pkgdir}/*.elc %{initfile} %dir %{pkgdir} @@ -103,6 +124,10 @@ %{pkgdir}/*.el %changelog +* Sat Feb 3 2007 Jonathan G. Underwood - 7.19-5 +- Add patch from http://www.robf.de/Hacking/elisp/ (resolves bug 224501) +- Ensure CFLAGS="$RPM_OPT_FLAGS" (bug 225101) + * Mon Aug 28 2006 Jonathan G. Underwood - 7.19-4 - Bump release for FC-6 mass rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/emacs-vm/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Jun 2006 19:10:04 -0000 1.2 +++ sources 3 Feb 2007 15:48:20 -0000 1.3 @@ -1 +1,2 @@ 7866f6243e398d76ae32356a4af76fa3 vm-7.19.tar.gz +fadfef52b6b8eded9a84afdcd0282de9 vm-7.19.070203.patch.gz --- vm-stdlib-patch.diff DELETED --- From fedora-extras-commits at redhat.com Sat Feb 3 15:49:19 2007 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 3 Feb 2007 10:49:19 -0500 Subject: rpms/libtasn1/devel sources,1.8,1.9 libtasn1.spec,1.15,1.16 Message-ID: <200702031549.l13FnJVw000755@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libtasn1/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv656/devel Modified Files: sources libtasn1.spec Log Message: updated to 0.3.8 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libtasn1/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 5 Nov 2006 19:08:42 -0000 1.8 +++ sources 3 Feb 2007 15:48:46 -0000 1.9 @@ -1,2 +1,2 @@ -491e5434a2eaec6277b98f6b362210ba libtasn1-0.3.6.tar.gz.sig -1a373457a4e6ad3c1641a847e7c70cf4 libtasn1-0.3.6.tar.gz +5f83b9660b79dc956688aeae2ed36152 libtasn1-0.3.8.tar.gz +e0380889083b4c2f33e2786efdfe974e libtasn1-0.3.8.tar.gz.sig Index: libtasn1.spec =================================================================== RCS file: /cvs/extras/rpms/libtasn1/devel/libtasn1.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- libtasn1.spec 5 Nov 2006 19:08:42 -0000 1.15 +++ libtasn1.spec 3 Feb 2007 15:48:46 -0000 1.16 @@ -4,7 +4,7 @@ Summary: This is the ASN.1 library used in GNUTLS Name: libtasn1 -Version: 0.3.6 +Version: 0.3.8 Release: %release_func 1 License: LGPL @@ -110,6 +110,9 @@ %changelog +* Sat Feb 3 2007 Enrico Scholz - 0.3.8-1 +- updated to 0.3.8 + * Sun Nov 5 2006 Enrico Scholz - 0.3.6-1 - updated to 0.3.6 - BR valgrind From fedora-extras-commits at redhat.com Sat Feb 3 15:49:21 2007 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 3 Feb 2007 10:49:21 -0500 Subject: rpms/libtasn1/FC-6 sources,1.8,1.9 libtasn1.spec,1.15,1.16 Message-ID: <200702031549.l13FnLvK000759@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libtasn1/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv656/FC-6 Modified Files: sources libtasn1.spec Log Message: updated to 0.3.8 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libtasn1/FC-6/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 5 Nov 2006 19:08:44 -0000 1.8 +++ sources 3 Feb 2007 15:48:49 -0000 1.9 @@ -1,2 +1,2 @@ -491e5434a2eaec6277b98f6b362210ba libtasn1-0.3.6.tar.gz.sig -1a373457a4e6ad3c1641a847e7c70cf4 libtasn1-0.3.6.tar.gz +5f83b9660b79dc956688aeae2ed36152 libtasn1-0.3.8.tar.gz +e0380889083b4c2f33e2786efdfe974e libtasn1-0.3.8.tar.gz.sig Index: libtasn1.spec =================================================================== RCS file: /cvs/extras/rpms/libtasn1/FC-6/libtasn1.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- libtasn1.spec 5 Nov 2006 19:08:44 -0000 1.15 +++ libtasn1.spec 3 Feb 2007 15:48:49 -0000 1.16 @@ -4,7 +4,7 @@ Summary: This is the ASN.1 library used in GNUTLS Name: libtasn1 -Version: 0.3.6 +Version: 0.3.8 Release: %release_func 1 License: LGPL @@ -110,6 +110,9 @@ %changelog +* Sat Feb 3 2007 Enrico Scholz - 0.3.8-1 +- updated to 0.3.8 + * Sun Nov 5 2006 Enrico Scholz - 0.3.6-1 - updated to 0.3.6 - BR valgrind From fedora-extras-commits at redhat.com Sat Feb 3 15:49:23 2007 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 3 Feb 2007 10:49:23 -0500 Subject: rpms/libtasn1/FC-5 sources,1.8,1.9 libtasn1.spec,1.15,1.16 Message-ID: <200702031549.l13FnNxg000766@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libtasn1/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv656/FC-5 Modified Files: sources libtasn1.spec Log Message: updated to 0.3.8 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libtasn1/FC-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 5 Nov 2006 19:08:44 -0000 1.8 +++ sources 3 Feb 2007 15:48:51 -0000 1.9 @@ -1,2 +1,2 @@ -491e5434a2eaec6277b98f6b362210ba libtasn1-0.3.6.tar.gz.sig -1a373457a4e6ad3c1641a847e7c70cf4 libtasn1-0.3.6.tar.gz +5f83b9660b79dc956688aeae2ed36152 libtasn1-0.3.8.tar.gz +e0380889083b4c2f33e2786efdfe974e libtasn1-0.3.8.tar.gz.sig Index: libtasn1.spec =================================================================== RCS file: /cvs/extras/rpms/libtasn1/FC-5/libtasn1.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- libtasn1.spec 5 Nov 2006 19:08:45 -0000 1.15 +++ libtasn1.spec 3 Feb 2007 15:48:51 -0000 1.16 @@ -4,7 +4,7 @@ Summary: This is the ASN.1 library used in GNUTLS Name: libtasn1 -Version: 0.3.6 +Version: 0.3.8 Release: %release_func 1 License: LGPL @@ -110,6 +110,9 @@ %changelog +* Sat Feb 3 2007 Enrico Scholz - 0.3.8-1 +- updated to 0.3.8 + * Sun Nov 5 2006 Enrico Scholz - 0.3.6-1 - updated to 0.3.6 - BR valgrind From fedora-extras-commits at redhat.com Sat Feb 3 15:50:28 2007 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Sat, 3 Feb 2007 10:50:28 -0500 Subject: rpms/emacs-vm/devel .cvsignore, 1.2, 1.3 emacs-vm.spec, 1.2, 1.3 sources, 1.2, 1.3 vm-stdlib-patch.diff, 1.1, NONE Message-ID: <200702031550.l13FoSFw000928@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-vm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv823 Modified Files: .cvsignore emacs-vm.spec sources Removed Files: vm-stdlib-patch.diff Log Message: * Sat Feb 3 2007 Jonathan G. Underwood - 7.19-5 - Add patch from http://www.robf.de/Hacking/elisp/ (resolves bug 224501) - Ensure CFLAGS="$RPM_OPT_FLAGS" (bug 225101) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/emacs-vm/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Jun 2006 19:10:04 -0000 1.2 +++ .cvsignore 3 Feb 2007 15:49:56 -0000 1.3 @@ -1 +1,2 @@ vm-7.19.tar.gz +vm-7.19.070203.patch.gz Index: emacs-vm.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-vm/devel/emacs-vm.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- emacs-vm.spec 28 Aug 2006 00:07:58 -0000 1.2 +++ emacs-vm.spec 3 Feb 2007 15:49:56 -0000 1.3 @@ -1,12 +1,24 @@ +# Upstream vm (http://www.wonderworks.com/vm/) seems to be currently +# unmaintained. This package adds the patchset maintained by Robert +# Widhopf-Fenk +# (http://www.robf.de/Hacking/elisp/vm-7.19.patch.gz). Unfortunately, +# the patch set version number is not updated with each release, so I +# have manually added a minor version number to the patch +# .YYMMDD. Some functionality of the patch is currently unavailable, +# namely that associated with pgg.el (only available on emacs >=22) is +# only available on FC>6. Currently, since bbdb and grepmail are not +# packaged, functionality associated with those is also not available. +# More details at http://www.robf.de/Hacking/elisp/ + %define pkg vm Summary: Emacs VM mailreader Name: emacs-%{pkg} Version: 7.19 -Release: 4%{?dist} +Release: 5%{?dist} URL: http://www.wonderworks.com/vm/ Source0: http://www.seanet.com/~kylemonger/vm/%{pkg}-%{version}.tar.gz -Patch0: vm-stdlib-patch.diff +Patch0: vm-7.19.070203.patch.gz License: GPL Group: Applications/Internet BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -22,7 +34,8 @@ messages to folders, deleting messages and so on. There are other more advanced commands that do tasks like bursting and creating digests, message forwarding, and organizing message presentation -according to various criteria. +according to various criteria. This package includes Robert +widhopf-Fenk's patchset (http://www.robf.de/Hacking/elisp/). %package el Group: Applications/Internet @@ -36,20 +49,26 @@ %prep %setup -q -n %{pkg}-%{version} %patch0 -p1 +mv Makefile Makefile.bk +sed -e 's/mkdirhier/mkdir -p/g' Makefile.bk > Makefile %build %define pkgdir %{_datadir}/emacs/site-lisp/vm %define pixmapdir %{pkgdir}/pixmaps +export CFLAGS="$RPM_OPT_FLAGS" + make %{?_smp_mflags} all \ prefix=%{_prefix} \ INFODIR=%{_infodir} \ LISPDIR=%{pkgdir} \ BINDIR=%{_bindir} \ - PIXMAPDIR=%{pixmapdir} + PIXMAPDIR=%{pixmapdir} \ + EMACS=emacs %install rm -rf %{buildroot} +echo %{buildroot}%{_prefix} make install \ prefix=%{buildroot}%{_prefix} \ INFODIR=%{buildroot}%{_infodir} \ @@ -57,6 +76,8 @@ BINDIR=%{buildroot}%{_bindir} \ PIXMAPDIR=%{buildroot}%{pixmapdir} +cp *.el %{buildroot}%{pkgdir} + %define startd %{_datadir}/emacs/site-lisp/site-start.d/ %define initfile %{startd}/%{pkg}-mode-init.el @@ -93,8 +114,8 @@ %doc README COPYING %doc %{_infodir}/* %{_bindir}/* -%{_datadir}/emacs/site-lisp/vm/pixmaps/ -%{_datadir}/emacs/site-lisp/vm/*.elc +%{pixmapdir} +%{pkgdir}/*.elc %{initfile} %dir %{pkgdir} @@ -103,6 +124,10 @@ %{pkgdir}/*.el %changelog +* Sat Feb 3 2007 Jonathan G. Underwood - 7.19-5 +- Add patch from http://www.robf.de/Hacking/elisp/ (resolves bug 224501) +- Ensure CFLAGS="$RPM_OPT_FLAGS" (bug 225101) + * Mon Aug 28 2006 Jonathan G. Underwood - 7.19-4 - Bump release for FC-6 mass rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/emacs-vm/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Jun 2006 19:10:04 -0000 1.2 +++ sources 3 Feb 2007 15:49:56 -0000 1.3 @@ -1 +1,2 @@ 7866f6243e398d76ae32356a4af76fa3 vm-7.19.tar.gz +fadfef52b6b8eded9a84afdcd0282de9 vm-7.19.070203.patch.gz --- vm-stdlib-patch.diff DELETED --- From fedora-extras-commits at redhat.com Sat Feb 3 15:51:05 2007 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Sat, 3 Feb 2007 10:51:05 -0500 Subject: rpms/moomps/FC-5 moomps.spec,1.15,1.16 Message-ID: <200702031551.l13Fp5Tb000996@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moomps/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv922 Modified Files: moomps.spec Log Message: prevent useless debug information package from being built. Index: moomps.spec =================================================================== RCS file: /cvs/extras/rpms/moomps/FC-5/moomps.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- moomps.spec 21 Nov 2006 22:34:54 -0000 1.15 +++ moomps.spec 3 Feb 2007 15:50:33 -0000 1.16 @@ -1,6 +1,6 @@ Name: moomps Version: 5.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Powerful modular monitoring service Group: Applications/System License: GPL @@ -13,6 +13,8 @@ Requires(post): /sbin/chkconfig Requires(postun): /sbin/service Requires: moodss >= 21.2, tclx >= 8.3 +# not architecture dependent, but installation paths differ on 64 bit architecture: +%define debug_package %nil %description moomps (Modular Object Oriented Multi-Purpose Service) is a modular @@ -80,6 +82,9 @@ %changelog +* Sat Feb 3 2007 Jean-Luc Fontaine 5.8-2 +- prevent useless debug information package from being built + * Sun Nov 12 2006 Jean-Luc Fontaine 5.8-1 - 5.8 upstream release - pass library directories to make also at install stage From fedora-extras-commits at redhat.com Sat Feb 3 16:02:52 2007 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Sat, 3 Feb 2007 11:02:52 -0500 Subject: rpms/perl-SOAP-Lite/EL-4 perl-SOAP-Lite.spec,1.6,1.7 Message-ID: <200702031602.l13G2qtJ004492@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/perl-SOAP-Lite/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4461 Modified Files: perl-SOAP-Lite.spec Log Message: Changed bogus reqs Index: perl-SOAP-Lite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-SOAP-Lite/EL-4/perl-SOAP-Lite.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-SOAP-Lite.spec 11 Sep 2006 02:59:57 -0000 1.6 +++ perl-SOAP-Lite.spec 3 Feb 2007 16:02:19 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-SOAP-Lite Version: 0.68 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Client and server side SOAP implementation License: GPL or Artistic Group: Development/Libraries @@ -13,13 +13,8 @@ BuildRequires: perl-XML-Parser BuildArch: noarch -%define bogusreqs 'perl(MQClient::MQSeries)\ -perl(MQSeries)\ -perl(MQSeries::Message)\ -perl(MQSeries::Queue)\ -perl(MQSeries::QueueManager)\ -perl(Net::Jabber)' -%global reqfilt sh -c "%{__perl_requires} | %{__grep} -Fv %{bogusreqs}" +%define bogusreqs 'perl.MQClient.*\\|perl.Net..Jabber.' +%global reqfilt sh -c '%{__perl_requires} | %{__grep} -Ev "%{bogusreqs}"' %define __perl_requires %{reqfilt} %description @@ -69,6 +64,9 @@ %{_mandir}/man1/* %changelog +* Sat Jan 2 2007 Mike McGrath - 0.68-3 +- Changed the way this package removes bogus reqs for EL4 + * Sun Sep 10 2006 Mike McGrath - 0.68-1 - Rebuild From fedora-extras-commits at redhat.com Sat Feb 3 16:22:50 2007 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 3 Feb 2007 11:22:50 -0500 Subject: rpms/libextractor/devel sources, 1.3, 1.4 libextractor.spec, 1.3, 1.4 libextractor-0.5.17-nodebug.patch, 1.1, NONE Message-ID: <200702031622.l13GMo8g004864@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libextractor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4813/devel Modified Files: sources libextractor.spec Removed Files: libextractor-0.5.17-nodebug.patch Log Message: - updated to 0.5.17a - fixed URL - removed -debug patch and the fixups in %%prep which were fixed upstream too Index: sources =================================================================== RCS file: /cvs/extras/rpms/libextractor/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Jan 2007 12:47:06 -0000 1.3 +++ sources 3 Feb 2007 16:22:18 -0000 1.4 @@ -1 +1 @@ -716fb10d2bd397a4481013b3edb92b92 libextractor-0.5.17.tar.gz +10b67ec5387e2b819e928c14436e4635 libextractor-0.5.17a.tar.gz Index: libextractor.spec =================================================================== RCS file: /cvs/extras/rpms/libextractor/devel/libextractor.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libextractor.spec 2 Jan 2007 15:07:45 -0000 1.3 +++ libextractor.spec 3 Feb 2007 16:22:18 -0000 1.4 @@ -5,16 +5,15 @@ %{!?release_func:%global release_func() %1%{?dist}} Name: libextractor -Version: 0.5.17 -Release: %release_func 2 +Version: 0.5.17a +Release: %release_func 1 Summary: Simple library for keyword extraction Group: System Environment/Libraries License: GPL -URL: http://gnunet.org/libextractor +URL: http://gnunet.org/libextractor/ Source0: http://gnunet.org/libextractor/download/%name-%version.tar.gz Source1: README.fedora -Patch0: libextractor-0.5.17-nodebug.patch BuildRoot: %_tmppath/%name-%version-%release-root BuildRequires: gettext @@ -121,32 +120,8 @@ %prep %setup -q -%patch0 -p1 -b .nodebug install -pm644 %SOURCE1 . - -# remove the '4' suffix of the QtXXX libs -for i in configure{.ac,} src/plugins/Makefile.{am,in}; do - touch -r "$i" .timestamp - sed -i -e 's!Qt\(Svg\|Gui\|Core\)4!Qt\1!g' "$i" - touch -r .timestamp "$i" -done - -# fix empty datadir -for i in configure{.ac,}; do - touch -r "$i" .timestamp - sed -i -e '/^datadir=$/d' "$i" - touch -r .timestamp "$i" -done - -# fix pkgconfig path -for i in Makefile.{am,in}; do - touch -r "$i" .timestamp - sed -i -e 's!^\(pkgconfigdatadir[^=]*=\).*$!\1 $(libdir)/pkgconfig!' "$i" - touch -r .timestamp "$i" -done - - rm -f README.debian @@ -243,6 +218,12 @@ %changelog +* Sat Feb 3 2007 Enrico Scholz - 0.5.17a-1 +- updated to 0.5.17a +- fixed URL +- removed -debug patch and the fixups in %%prep which were fixed + upstream too + * Tue Jan 2 2007 Enrico Scholz - 0.5.17-2 - disabled debug messages - fixed pkgconfig installation dir --- libextractor-0.5.17-nodebug.patch DELETED --- From fedora-extras-commits at redhat.com Sat Feb 3 16:22:53 2007 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 3 Feb 2007 11:22:53 -0500 Subject: rpms/libextractor/FC-6 sources, 1.3, 1.4 libextractor.spec, 1.3, 1.4 libextractor-0.5.17-nodebug.patch, 1.1, NONE Message-ID: <200702031622.l13GMrZQ004868@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libextractor/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4813/FC-6 Modified Files: sources libextractor.spec Removed Files: libextractor-0.5.17-nodebug.patch Log Message: - updated to 0.5.17a - fixed URL - removed -debug patch and the fixups in %%prep which were fixed upstream too Index: sources =================================================================== RCS file: /cvs/extras/rpms/libextractor/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Jan 2007 12:47:06 -0000 1.3 +++ sources 3 Feb 2007 16:22:20 -0000 1.4 @@ -1 +1 @@ -716fb10d2bd397a4481013b3edb92b92 libextractor-0.5.17.tar.gz +10b67ec5387e2b819e928c14436e4635 libextractor-0.5.17a.tar.gz Index: libextractor.spec =================================================================== RCS file: /cvs/extras/rpms/libextractor/FC-6/libextractor.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libextractor.spec 2 Jan 2007 15:07:45 -0000 1.3 +++ libextractor.spec 3 Feb 2007 16:22:20 -0000 1.4 @@ -5,16 +5,15 @@ %{!?release_func:%global release_func() %1%{?dist}} Name: libextractor -Version: 0.5.17 -Release: %release_func 2 +Version: 0.5.17a +Release: %release_func 1 Summary: Simple library for keyword extraction Group: System Environment/Libraries License: GPL -URL: http://gnunet.org/libextractor +URL: http://gnunet.org/libextractor/ Source0: http://gnunet.org/libextractor/download/%name-%version.tar.gz Source1: README.fedora -Patch0: libextractor-0.5.17-nodebug.patch BuildRoot: %_tmppath/%name-%version-%release-root BuildRequires: gettext @@ -121,32 +120,8 @@ %prep %setup -q -%patch0 -p1 -b .nodebug install -pm644 %SOURCE1 . - -# remove the '4' suffix of the QtXXX libs -for i in configure{.ac,} src/plugins/Makefile.{am,in}; do - touch -r "$i" .timestamp - sed -i -e 's!Qt\(Svg\|Gui\|Core\)4!Qt\1!g' "$i" - touch -r .timestamp "$i" -done - -# fix empty datadir -for i in configure{.ac,}; do - touch -r "$i" .timestamp - sed -i -e '/^datadir=$/d' "$i" - touch -r .timestamp "$i" -done - -# fix pkgconfig path -for i in Makefile.{am,in}; do - touch -r "$i" .timestamp - sed -i -e 's!^\(pkgconfigdatadir[^=]*=\).*$!\1 $(libdir)/pkgconfig!' "$i" - touch -r .timestamp "$i" -done - - rm -f README.debian @@ -243,6 +218,12 @@ %changelog +* Sat Feb 3 2007 Enrico Scholz - 0.5.17a-1 +- updated to 0.5.17a +- fixed URL +- removed -debug patch and the fixups in %%prep which were fixed + upstream too + * Tue Jan 2 2007 Enrico Scholz - 0.5.17-2 - disabled debug messages - fixed pkgconfig installation dir --- libextractor-0.5.17-nodebug.patch DELETED --- From fedora-extras-commits at redhat.com Sat Feb 3 16:22:55 2007 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 3 Feb 2007 11:22:55 -0500 Subject: rpms/libextractor/FC-5 sources, 1.3, 1.4 libextractor.spec, 1.3, 1.4 libextractor-0.5.17-nodebug.patch, 1.1, NONE Message-ID: <200702031622.l13GMt0C004872@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libextractor/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4813/FC-5 Modified Files: sources libextractor.spec Removed Files: libextractor-0.5.17-nodebug.patch Log Message: - updated to 0.5.17a - fixed URL - removed -debug patch and the fixups in %%prep which were fixed upstream too Index: sources =================================================================== RCS file: /cvs/extras/rpms/libextractor/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Jan 2007 12:47:06 -0000 1.3 +++ sources 3 Feb 2007 16:22:23 -0000 1.4 @@ -1 +1 @@ -716fb10d2bd397a4481013b3edb92b92 libextractor-0.5.17.tar.gz +10b67ec5387e2b819e928c14436e4635 libextractor-0.5.17a.tar.gz Index: libextractor.spec =================================================================== RCS file: /cvs/extras/rpms/libextractor/FC-5/libextractor.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libextractor.spec 2 Jan 2007 15:07:45 -0000 1.3 +++ libextractor.spec 3 Feb 2007 16:22:23 -0000 1.4 @@ -5,16 +5,15 @@ %{!?release_func:%global release_func() %1%{?dist}} Name: libextractor -Version: 0.5.17 -Release: %release_func 2 +Version: 0.5.17a +Release: %release_func 1 Summary: Simple library for keyword extraction Group: System Environment/Libraries License: GPL -URL: http://gnunet.org/libextractor +URL: http://gnunet.org/libextractor/ Source0: http://gnunet.org/libextractor/download/%name-%version.tar.gz Source1: README.fedora -Patch0: libextractor-0.5.17-nodebug.patch BuildRoot: %_tmppath/%name-%version-%release-root BuildRequires: gettext @@ -121,32 +120,8 @@ %prep %setup -q -%patch0 -p1 -b .nodebug install -pm644 %SOURCE1 . - -# remove the '4' suffix of the QtXXX libs -for i in configure{.ac,} src/plugins/Makefile.{am,in}; do - touch -r "$i" .timestamp - sed -i -e 's!Qt\(Svg\|Gui\|Core\)4!Qt\1!g' "$i" - touch -r .timestamp "$i" -done - -# fix empty datadir -for i in configure{.ac,}; do - touch -r "$i" .timestamp - sed -i -e '/^datadir=$/d' "$i" - touch -r .timestamp "$i" -done - -# fix pkgconfig path -for i in Makefile.{am,in}; do - touch -r "$i" .timestamp - sed -i -e 's!^\(pkgconfigdatadir[^=]*=\).*$!\1 $(libdir)/pkgconfig!' "$i" - touch -r .timestamp "$i" -done - - rm -f README.debian @@ -243,6 +218,12 @@ %changelog +* Sat Feb 3 2007 Enrico Scholz - 0.5.17a-1 +- updated to 0.5.17a +- fixed URL +- removed -debug patch and the fixups in %%prep which were fixed + upstream too + * Tue Jan 2 2007 Enrico Scholz - 0.5.17-2 - disabled debug messages - fixed pkgconfig installation dir --- libextractor-0.5.17-nodebug.patch DELETED --- From fedora-extras-commits at redhat.com Sat Feb 3 16:43:12 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Sat, 3 Feb 2007 11:43:12 -0500 Subject: common cvs-import.sh,1.13,1.14 Message-ID: <200702031643.l13GhCPV005282@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5266 Modified Files: cvs-import.sh Log Message: remove default acl here.... This needs solved better. Index: cvs-import.sh =================================================================== RCS file: /cvs/extras/common/cvs-import.sh,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- cvs-import.sh 30 Jan 2007 22:12:30 -0000 1.13 +++ cvs-import.sh 3 Feb 2007 16:42:42 -0000 1.14 @@ -183,7 +183,6 @@ cvs -Q add $NAME $NAME/devel # handle the top level stuff cd $NAME - touch pkg.acl touch import.log cat >Makefile < Author: ensc Update of /cvs/extras/rpms/mimetic/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5571/FC-5 Added Files: mimetic-0.9.2-noconfigh.patch Removed Files: mimetic-0.9.1-noconfigh.patch Log Message: rediffed patches mimetic-0.9.2-noconfigh.patch: --- NEW FILE mimetic-0.9.2-noconfigh.patch --- --- mimetic-0.9.2/mimetic/os/file.h.noconfigh 2005-02-23 11:26:15.000000000 +0100 +++ mimetic-0.9.2/mimetic/os/file.h 2007-02-03 17:33:19.000000000 +0100 @@ -23,14 +23,14 @@ #include #include #include -#ifdef HAVE_MMAP +#if 1 #include #endif namespace mimetic { -#if HAVE_MMAP == 1 +#if 1 == 1 typedef MMFile File; #else typedef StdFile File; --- mimetic-0.9.2/mimetic/os/directory.h.noconfigh 2006-04-18 16:06:27.000000000 +0200 +++ mimetic-0.9.2/mimetic/os/directory.h 2007-02-03 17:33:57.000000000 +0100 @@ -3,7 +3,7 @@ #include #include #include -#ifdef HAVE_DIRENT_H +#if 1 #include #endif #include @@ -82,7 +82,7 @@ m_eoi == right.m_eoi && m_dirp->m_path == right.m_dirp->m_path && m_dirent && right.m_dirent && - #ifdef _DIRENT_HAVE_D_TYPE + #if 1 m_dirent->d_type == right.m_dirent->d_type && #endif std::string(m_dirent->d_name) == right.m_dirent->d_name; @@ -96,7 +96,7 @@ { m_de.name = dent->d_name; m_de.type = DirEntry::Unknown; - #ifdef _DIRENT_HAVE_D_TYPE + #if 1 switch(dent->d_type) { case DT_DIR: --- mimetic-0.9.2/mimetic/rfc822/messageid.h.noconfigh 2006-04-18 16:10:52.000000000 +0200 +++ mimetic-0.9.2/mimetic/rfc822/messageid.h 2007-02-03 17:34:23.000000000 +0100 @@ -15,12 +15,12 @@ ***************************************************************************/ #ifndef _MIMETIC_MESSAGEID_H_ #define _MIMETIC_MESSAGEID_H_ -#ifdef HAVE_STDINT_H +#if 1 #include #endif #include #include -#ifdef HAVE_INTTYPES_H +#if 1 #include #endif #include --- mimetic-0.9.2/mimetic/message.h.noconfigh 2006-10-09 15:38:30.000000000 +0200 +++ mimetic-0.9.2/mimetic/message.h 2007-02-03 17:33:19.000000000 +0100 @@ -21,7 +21,7 @@ #include #include #include -#ifdef HAVE_UNISTD_H +#if 1 #include #endif --- mimetic-0.9.1-noconfigh.patch DELETED --- From fedora-extras-commits at redhat.com Sat Feb 3 16:56:45 2007 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 3 Feb 2007 11:56:45 -0500 Subject: rpms/mimetic/FC-6 mimetic-0.9.2-noconfigh.patch, NONE, 1.1 mimetic-0.9.1-noconfigh.patch, 1.1, NONE Message-ID: <200702031656.l13GujI9005601@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/mimetic/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5571/FC-6 Added Files: mimetic-0.9.2-noconfigh.patch Removed Files: mimetic-0.9.1-noconfigh.patch Log Message: rediffed patches mimetic-0.9.2-noconfigh.patch: --- NEW FILE mimetic-0.9.2-noconfigh.patch --- --- mimetic-0.9.2/mimetic/os/file.h.noconfigh 2005-02-23 11:26:15.000000000 +0100 +++ mimetic-0.9.2/mimetic/os/file.h 2007-02-03 17:33:19.000000000 +0100 @@ -23,14 +23,14 @@ #include #include #include -#ifdef HAVE_MMAP +#if 1 #include #endif namespace mimetic { -#if HAVE_MMAP == 1 +#if 1 == 1 typedef MMFile File; #else typedef StdFile File; --- mimetic-0.9.2/mimetic/os/directory.h.noconfigh 2006-04-18 16:06:27.000000000 +0200 +++ mimetic-0.9.2/mimetic/os/directory.h 2007-02-03 17:33:57.000000000 +0100 @@ -3,7 +3,7 @@ #include #include #include -#ifdef HAVE_DIRENT_H +#if 1 #include #endif #include @@ -82,7 +82,7 @@ m_eoi == right.m_eoi && m_dirp->m_path == right.m_dirp->m_path && m_dirent && right.m_dirent && - #ifdef _DIRENT_HAVE_D_TYPE + #if 1 m_dirent->d_type == right.m_dirent->d_type && #endif std::string(m_dirent->d_name) == right.m_dirent->d_name; @@ -96,7 +96,7 @@ { m_de.name = dent->d_name; m_de.type = DirEntry::Unknown; - #ifdef _DIRENT_HAVE_D_TYPE + #if 1 switch(dent->d_type) { case DT_DIR: --- mimetic-0.9.2/mimetic/rfc822/messageid.h.noconfigh 2006-04-18 16:10:52.000000000 +0200 +++ mimetic-0.9.2/mimetic/rfc822/messageid.h 2007-02-03 17:34:23.000000000 +0100 @@ -15,12 +15,12 @@ ***************************************************************************/ #ifndef _MIMETIC_MESSAGEID_H_ #define _MIMETIC_MESSAGEID_H_ -#ifdef HAVE_STDINT_H +#if 1 #include #endif #include #include -#ifdef HAVE_INTTYPES_H +#if 1 #include #endif #include --- mimetic-0.9.2/mimetic/message.h.noconfigh 2006-10-09 15:38:30.000000000 +0200 +++ mimetic-0.9.2/mimetic/message.h 2007-02-03 17:33:19.000000000 +0100 @@ -21,7 +21,7 @@ #include #include #include -#ifdef HAVE_UNISTD_H +#if 1 #include #endif --- mimetic-0.9.1-noconfigh.patch DELETED --- From fedora-extras-commits at redhat.com Sat Feb 3 16:56:52 2007 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 3 Feb 2007 11:56:52 -0500 Subject: rpms/mimetic/devel mimetic-0.9.2-noconfigh.patch, NONE, 1.1 mimetic-0.9.1-noconfigh.patch, 1.1, NONE Message-ID: <200702031656.l13GuqP8005618@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/mimetic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5571/devel Added Files: mimetic-0.9.2-noconfigh.patch Removed Files: mimetic-0.9.1-noconfigh.patch Log Message: rediffed patches mimetic-0.9.2-noconfigh.patch: --- NEW FILE mimetic-0.9.2-noconfigh.patch --- --- mimetic-0.9.2/mimetic/os/file.h.noconfigh 2005-02-23 11:26:15.000000000 +0100 +++ mimetic-0.9.2/mimetic/os/file.h 2007-02-03 17:33:19.000000000 +0100 @@ -23,14 +23,14 @@ #include #include #include -#ifdef HAVE_MMAP +#if 1 #include #endif namespace mimetic { -#if HAVE_MMAP == 1 +#if 1 == 1 typedef MMFile File; #else typedef StdFile File; --- mimetic-0.9.2/mimetic/os/directory.h.noconfigh 2006-04-18 16:06:27.000000000 +0200 +++ mimetic-0.9.2/mimetic/os/directory.h 2007-02-03 17:33:57.000000000 +0100 @@ -3,7 +3,7 @@ #include #include #include -#ifdef HAVE_DIRENT_H +#if 1 #include #endif #include @@ -82,7 +82,7 @@ m_eoi == right.m_eoi && m_dirp->m_path == right.m_dirp->m_path && m_dirent && right.m_dirent && - #ifdef _DIRENT_HAVE_D_TYPE + #if 1 m_dirent->d_type == right.m_dirent->d_type && #endif std::string(m_dirent->d_name) == right.m_dirent->d_name; @@ -96,7 +96,7 @@ { m_de.name = dent->d_name; m_de.type = DirEntry::Unknown; - #ifdef _DIRENT_HAVE_D_TYPE + #if 1 switch(dent->d_type) { case DT_DIR: --- mimetic-0.9.2/mimetic/rfc822/messageid.h.noconfigh 2006-04-18 16:10:52.000000000 +0200 +++ mimetic-0.9.2/mimetic/rfc822/messageid.h 2007-02-03 17:34:23.000000000 +0100 @@ -15,12 +15,12 @@ ***************************************************************************/ #ifndef _MIMETIC_MESSAGEID_H_ #define _MIMETIC_MESSAGEID_H_ -#ifdef HAVE_STDINT_H +#if 1 #include #endif #include #include -#ifdef HAVE_INTTYPES_H +#if 1 #include #endif #include --- mimetic-0.9.2/mimetic/message.h.noconfigh 2006-10-09 15:38:30.000000000 +0200 +++ mimetic-0.9.2/mimetic/message.h 2007-02-03 17:33:19.000000000 +0100 @@ -21,7 +21,7 @@ #include #include #include -#ifdef HAVE_UNISTD_H +#if 1 #include #endif --- mimetic-0.9.1-noconfigh.patch DELETED --- From fedora-extras-commits at redhat.com Sat Feb 3 16:58:55 2007 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 3 Feb 2007 11:58:55 -0500 Subject: rpms/mimetic/devel sources,1.4,1.5 mimetic.spec,1.6,1.7 Message-ID: <200702031658.l13GwtwH005708@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/mimetic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5657/devel Modified Files: sources mimetic.spec Log Message: - updated to 0.9.2; rediffed patches - build the library with '-Wl,--as-needed' Index: sources =================================================================== RCS file: /cvs/extras/rpms/mimetic/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Jul 2006 19:03:52 -0000 1.4 +++ sources 3 Feb 2007 16:58:23 -0000 1.5 @@ -1,2 +1 @@ -4a36d2a7873927758f39b195751ea064 mimetic-0.9.1.tar.gz - +7ca93c189732b67dc139d10cf770ba98 mimetic-0.9.2.tar.gz Index: mimetic.spec =================================================================== RCS file: /cvs/extras/rpms/mimetic/devel/mimetic.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mimetic.spec 15 Sep 2006 18:03:55 -0000 1.6 +++ mimetic.spec 3 Feb 2007 16:58:23 -0000 1.7 @@ -3,16 +3,16 @@ %{!?release_func:%global release_func() %1%{?dist}} Name: mimetic -Version: 0.9.1 -Release: %release_func 2 +Version: 0.9.2 +Release: %release_func 1 Summary: A full featured MIME library written in C++ Group: System Environment/Libraries License: GPL URL: http://codesink.org/mimetic_mime_library.html Source0: http://codesink.org/download/%name-%version.tar.gz -Patch0: mimetic-0.9.1-noconfigh.patch -BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n) +Patch0: mimetic-0.9.2-noconfigh.patch +BuildRoot: %_tmppath/%name-%version-%release-root BuildRequires: doxygen @@ -47,6 +47,8 @@ %build %configure --disable-static +sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool + %__make %{?_smp_mflags} %__make docs -C doc @@ -56,9 +58,6 @@ %__make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%_libdir/*.la -echo "\ -// cleared by the Fedora Extras package; content causes conflicts -// with autoconf/automake 'config.h' files else" > $RPM_BUILD_ROOT%_includedir/%name/config.h %check @@ -87,6 +86,10 @@ %changelog +* Sat Feb 3 2007 Enrico Scholz - 0.9.2-1 +- updated to 0.9.2; rediffed patches +- build the library with '-Wl,--as-needed' + * Fri Sep 15 2006 Enrico Scholz - 0.9.1-2 - rebuilt From fedora-extras-commits at redhat.com Sat Feb 3 16:58:57 2007 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 3 Feb 2007 11:58:57 -0500 Subject: rpms/mimetic/FC-6 sources,1.4,1.5 mimetic.spec,1.6,1.7 Message-ID: <200702031658.l13Gwv65005712@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/mimetic/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5657/FC-6 Modified Files: sources mimetic.spec Log Message: - updated to 0.9.2; rediffed patches - build the library with '-Wl,--as-needed' Index: sources =================================================================== RCS file: /cvs/extras/rpms/mimetic/FC-6/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Jul 2006 19:03:52 -0000 1.4 +++ sources 3 Feb 2007 16:58:25 -0000 1.5 @@ -1,2 +1 @@ -4a36d2a7873927758f39b195751ea064 mimetic-0.9.1.tar.gz - +7ca93c189732b67dc139d10cf770ba98 mimetic-0.9.2.tar.gz Index: mimetic.spec =================================================================== RCS file: /cvs/extras/rpms/mimetic/FC-6/mimetic.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mimetic.spec 15 Sep 2006 18:03:55 -0000 1.6 +++ mimetic.spec 3 Feb 2007 16:58:25 -0000 1.7 @@ -3,16 +3,16 @@ %{!?release_func:%global release_func() %1%{?dist}} Name: mimetic -Version: 0.9.1 -Release: %release_func 2 +Version: 0.9.2 +Release: %release_func 1 Summary: A full featured MIME library written in C++ Group: System Environment/Libraries License: GPL URL: http://codesink.org/mimetic_mime_library.html Source0: http://codesink.org/download/%name-%version.tar.gz -Patch0: mimetic-0.9.1-noconfigh.patch -BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n) +Patch0: mimetic-0.9.2-noconfigh.patch +BuildRoot: %_tmppath/%name-%version-%release-root BuildRequires: doxygen @@ -47,6 +47,8 @@ %build %configure --disable-static +sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool + %__make %{?_smp_mflags} %__make docs -C doc @@ -56,9 +58,6 @@ %__make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%_libdir/*.la -echo "\ -// cleared by the Fedora Extras package; content causes conflicts -// with autoconf/automake 'config.h' files else" > $RPM_BUILD_ROOT%_includedir/%name/config.h %check @@ -87,6 +86,10 @@ %changelog +* Sat Feb 3 2007 Enrico Scholz - 0.9.2-1 +- updated to 0.9.2; rediffed patches +- build the library with '-Wl,--as-needed' + * Fri Sep 15 2006 Enrico Scholz - 0.9.1-2 - rebuilt From fedora-extras-commits at redhat.com Sat Feb 3 16:59:00 2007 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 3 Feb 2007 11:59:00 -0500 Subject: rpms/mimetic/FC-5 sources,1.4,1.5 mimetic.spec,1.5,1.6 Message-ID: <200702031659.l13Gx0da005716@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/mimetic/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5657/FC-5 Modified Files: sources mimetic.spec Log Message: - updated to 0.9.2; rediffed patches - build the library with '-Wl,--as-needed' Index: sources =================================================================== RCS file: /cvs/extras/rpms/mimetic/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Jul 2006 18:59:33 -0000 1.4 +++ sources 3 Feb 2007 16:58:28 -0000 1.5 @@ -1 +1 @@ -4a36d2a7873927758f39b195751ea064 mimetic-0.9.1.tar.gz +7ca93c189732b67dc139d10cf770ba98 mimetic-0.9.2.tar.gz Index: mimetic.spec =================================================================== RCS file: /cvs/extras/rpms/mimetic/FC-5/mimetic.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mimetic.spec 9 Jul 2006 18:59:33 -0000 1.5 +++ mimetic.spec 3 Feb 2007 16:58:28 -0000 1.6 @@ -3,7 +3,7 @@ %{!?release_func:%global release_func() %1%{?dist}} Name: mimetic -Version: 0.9.1 +Version: 0.9.2 Release: %release_func 1 Summary: A full featured MIME library written in C++ @@ -11,8 +11,8 @@ License: GPL URL: http://codesink.org/mimetic_mime_library.html Source0: http://codesink.org/download/%name-%version.tar.gz -Patch0: mimetic-0.9.1-noconfigh.patch -BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n) +Patch0: mimetic-0.9.2-noconfigh.patch +BuildRoot: %_tmppath/%name-%version-%release-root BuildRequires: doxygen @@ -47,6 +47,8 @@ %build %configure --disable-static +sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool + %__make %{?_smp_mflags} %__make docs -C doc @@ -56,9 +58,6 @@ %__make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%_libdir/*.la -echo "\ -// cleared by the Fedora Extras package; content causes conflicts -// with autoconf/automake 'config.h' files else" > $RPM_BUILD_ROOT%_includedir/%name/config.h %check @@ -87,6 +86,10 @@ %changelog +* Sat Feb 3 2007 Enrico Scholz - 0.9.2-1 +- updated to 0.9.2; rediffed patches +- build the library with '-Wl,--as-needed' + * Sun Apr 16 2006 Enrico Scholz - 0.9.1-1 - updated to 0.9.1 - rediffed -noconfigh patch and cover new #ifdef's From fedora-extras-commits at redhat.com Sat Feb 3 17:33:40 2007 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 3 Feb 2007 12:33:40 -0500 Subject: rpms/xmlrpc-c/FC-5 .cvsignore, 1.3, 1.4 0001-make-cmake-transition.txt, 1.2, 1.3 sources, 1.5, 1.6 xmlrpc-c.spec, 1.5, 1.6 xmlrpc-c-1.05-typo.patch, 1.1, NONE Message-ID: <200702031733.l13HXeIE010086@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/xmlrpc-c/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9945/FC-5 Modified Files: .cvsignore 0001-make-cmake-transition.txt sources xmlrpc-c.spec Removed Files: xmlrpc-c-1.05-typo.patch Log Message: - updated to 1.06.09 - removed -typo patch since applied upstream Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xmlrpc-c/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 4 Jun 2006 16:38:35 -0000 1.3 +++ .cvsignore 3 Feb 2007 17:33:07 -0000 1.4 @@ -1 +1,2 @@ xmlrpc-c-*.tgz +x.patch Index: 0001-make-cmake-transition.txt =================================================================== RCS file: /cvs/extras/rpms/xmlrpc-c/FC-5/0001-make-cmake-transition.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- 0001-make-cmake-transition.txt 31 Oct 2006 16:06:42 -0000 1.2 +++ 0001-make-cmake-transition.txt 3 Feb 2007 17:33:07 -0000 1.3 @@ -68,7 +68,7 @@ +include(CheckIncludeFile) +include(CheckFunctionExists) + -+set(XMLRPC_C_VERSION "1.06.06" CACHE STRING "Version of xmlrpc-c") ++set(XMLRPC_C_VERSION "1.06.09" CACHE STRING "Version of xmlrpc-c") +set(XMLRPC_C_LIBVERSION "3.6.4") +set(XMLRPC_C_SOVERSION "3") + Index: sources =================================================================== RCS file: /cvs/extras/rpms/xmlrpc-c/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 31 Oct 2006 16:06:43 -0000 1.5 +++ sources 3 Feb 2007 17:33:07 -0000 1.6 @@ -1 +1,2 @@ -ed508e56d11cb56188cf44a87d410f6c xmlrpc-c-1.06.06.tgz +c559f6b3a46f70a7942aca7c6dd44b46 xmlrpc-c-1.06.09.tgz + Index: xmlrpc-c.spec =================================================================== RCS file: /cvs/extras/rpms/xmlrpc-c/FC-5/xmlrpc-c.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xmlrpc-c.spec 31 Oct 2006 16:06:43 -0000 1.5 +++ xmlrpc-c.spec 3 Feb 2007 17:33:07 -0000 1.6 @@ -4,13 +4,12 @@ Summary: A lightweight RPC library based on XML and HTTP Name: xmlrpc-c -Version: 1.06.06 +Version: 1.06.09 Release: %release_func 1 License: BSD/PSF -- see COPYING Group: System Environment/Libraries URL: http://xmlrpc-c.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/xmlrpc-c/%name-%version.tgz -Patch3: xmlrpc-c-1.05-typo.patch Patch6: xmlrpc-c-1.06.04-sizet.patch Patch100: http://ensc.de/xmlrpc-c/0001-make-cmake-transition.txt BuildRoot: %_tmppath/%name-%version-%release-root @@ -54,7 +53,6 @@ %prep %setup -q -%patch3 -p1 -b .typo %patch6 -p1 -b .sizet cat %PATCH100 | patch -p1 @@ -123,6 +121,10 @@ %changelog +* Sat Feb 3 2007 Enrico Scholz - 1.06.09-1 +- updated to 1.06.09 +- removed -typo patch since applied upstream + * Tue Oct 31 2006 Enrico Scholz - 1.06.06-1 - updated to 1.06.06 --- xmlrpc-c-1.05-typo.patch DELETED --- From fedora-extras-commits at redhat.com Sat Feb 3 17:33:42 2007 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 3 Feb 2007 12:33:42 -0500 Subject: rpms/xmlrpc-c/FC-6 .cvsignore, 1.3, 1.4 0001-make-cmake-transition.txt, 1.2, 1.3 sources, 1.6, 1.7 xmlrpc-c.spec, 1.11, 1.12 xmlrpc-c-1.05-typo.patch, 1.1, NONE Message-ID: <200702031733.l13HXgGR010099@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/xmlrpc-c/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9945/FC-6 Modified Files: .cvsignore 0001-make-cmake-transition.txt sources xmlrpc-c.spec Removed Files: xmlrpc-c-1.05-typo.patch Log Message: - updated to 1.06.09 - removed -typo patch since applied upstream Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xmlrpc-c/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 4 Jun 2006 16:21:22 -0000 1.3 +++ .cvsignore 3 Feb 2007 17:33:10 -0000 1.4 @@ -1 +1,2 @@ xmlrpc-c-*.tgz +x.patch Index: 0001-make-cmake-transition.txt =================================================================== RCS file: /cvs/extras/rpms/xmlrpc-c/FC-6/0001-make-cmake-transition.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- 0001-make-cmake-transition.txt 31 Oct 2006 15:05:14 -0000 1.2 +++ 0001-make-cmake-transition.txt 3 Feb 2007 17:33:10 -0000 1.3 @@ -68,7 +68,7 @@ +include(CheckIncludeFile) +include(CheckFunctionExists) + -+set(XMLRPC_C_VERSION "1.06.06" CACHE STRING "Version of xmlrpc-c") ++set(XMLRPC_C_VERSION "1.06.09" CACHE STRING "Version of xmlrpc-c") +set(XMLRPC_C_LIBVERSION "3.6.4") +set(XMLRPC_C_SOVERSION "3") + Index: sources =================================================================== RCS file: /cvs/extras/rpms/xmlrpc-c/FC-6/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 31 Oct 2006 15:05:14 -0000 1.6 +++ sources 3 Feb 2007 17:33:10 -0000 1.7 @@ -1 +1,2 @@ -ed508e56d11cb56188cf44a87d410f6c xmlrpc-c-1.06.06.tgz +c559f6b3a46f70a7942aca7c6dd44b46 xmlrpc-c-1.06.09.tgz + Index: xmlrpc-c.spec =================================================================== RCS file: /cvs/extras/rpms/xmlrpc-c/FC-6/xmlrpc-c.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- xmlrpc-c.spec 31 Oct 2006 15:05:14 -0000 1.11 +++ xmlrpc-c.spec 3 Feb 2007 17:33:10 -0000 1.12 @@ -4,13 +4,12 @@ Summary: A lightweight RPC library based on XML and HTTP Name: xmlrpc-c -Version: 1.06.06 +Version: 1.06.09 Release: %release_func 1 License: BSD/PSF -- see COPYING Group: System Environment/Libraries URL: http://xmlrpc-c.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/xmlrpc-c/%name-%version.tgz -Patch3: xmlrpc-c-1.05-typo.patch Patch6: xmlrpc-c-1.06.04-sizet.patch Patch100: http://ensc.de/xmlrpc-c/0001-make-cmake-transition.txt BuildRoot: %_tmppath/%name-%version-%release-root @@ -54,7 +53,6 @@ %prep %setup -q -%patch3 -p1 -b .typo %patch6 -p1 -b .sizet cat %PATCH100 | patch -p1 @@ -123,6 +121,10 @@ %changelog +* Sat Feb 3 2007 Enrico Scholz - 1.06.09-1 +- updated to 1.06.09 +- removed -typo patch since applied upstream + * Tue Oct 31 2006 Enrico Scholz - 1.06.06-1 - updated to 1.06.06 --- xmlrpc-c-1.05-typo.patch DELETED --- From fedora-extras-commits at redhat.com Sat Feb 3 17:33:44 2007 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 3 Feb 2007 12:33:44 -0500 Subject: rpms/xmlrpc-c/devel .cvsignore, 1.3, 1.4 0001-make-cmake-transition.txt, 1.1, 1.2 sources, 1.5, 1.6 xmlrpc-c.spec, 1.11, 1.12 xmlrpc-c-1.05-typo.patch, 1.1, NONE Message-ID: <200702031733.l13HXiWQ010110@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/xmlrpc-c/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9945/devel Modified Files: .cvsignore 0001-make-cmake-transition.txt sources xmlrpc-c.spec Removed Files: xmlrpc-c-1.05-typo.patch Log Message: - updated to 1.06.09 - removed -typo patch since applied upstream Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xmlrpc-c/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 4 Jun 2006 16:21:22 -0000 1.3 +++ .cvsignore 3 Feb 2007 17:33:12 -0000 1.4 @@ -1 +1,2 @@ xmlrpc-c-*.tgz +x.patch Index: 0001-make-cmake-transition.txt =================================================================== RCS file: /cvs/extras/rpms/xmlrpc-c/devel/0001-make-cmake-transition.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 0001-make-cmake-transition.txt 2 Oct 2006 15:02:03 -0000 1.1 +++ 0001-make-cmake-transition.txt 3 Feb 2007 17:33:12 -0000 1.2 @@ -68,7 +68,7 @@ +include(CheckIncludeFile) +include(CheckFunctionExists) + -+set(XMLRPC_C_VERSION "1.06.05" CACHE STRING "Version of xmlrpc-c") ++set(XMLRPC_C_VERSION "1.06.09" CACHE STRING "Version of xmlrpc-c") +set(XMLRPC_C_LIBVERSION "3.6.4") +set(XMLRPC_C_SOVERSION "3") + Index: sources =================================================================== RCS file: /cvs/extras/rpms/xmlrpc-c/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 20 Sep 2006 16:48:17 -0000 1.5 +++ sources 3 Feb 2007 17:33:12 -0000 1.6 @@ -1 +1 @@ -69f3644da7b8e9d13482c82838a4005a xmlrpc-c-1.06.05.tgz +c559f6b3a46f70a7942aca7c6dd44b46 xmlrpc-c-1.06.09.tgz Index: xmlrpc-c.spec =================================================================== RCS file: /cvs/extras/rpms/xmlrpc-c/devel/xmlrpc-c.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- xmlrpc-c.spec 6 Nov 2006 14:01:36 -0000 1.11 +++ xmlrpc-c.spec 3 Feb 2007 17:33:12 -0000 1.12 @@ -4,13 +4,12 @@ Summary: A lightweight RPC library based on XML and HTTP Name: xmlrpc-c -Version: 1.06.05 -Release: %release_func 3 +Version: 1.06.09 +Release: %release_func 1 License: BSD/PSF -- see COPYING Group: System Environment/Libraries URL: http://xmlrpc-c.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/xmlrpc-c/%name-%version.tgz -Patch3: xmlrpc-c-1.05-typo.patch Patch6: xmlrpc-c-1.06.04-sizet.patch Patch100: http://ensc.de/xmlrpc-c/0001-make-cmake-transition.txt BuildRoot: %_tmppath/%name-%version-%release-root @@ -54,7 +53,6 @@ %prep %setup -q -%patch3 -p1 -b .typo %patch6 -p1 -b .sizet cat %PATCH100 | patch -p1 @@ -123,6 +121,10 @@ %changelog +* Sat Feb 3 2007 Enrico Scholz - 1.06.09-1 +- updated to 1.06.09 +- removed -typo patch since applied upstream + * Mon Nov 6 2006 Jindrich Novy - 1.06.05-3 - rebuild against the new curl --- xmlrpc-c-1.05-typo.patch DELETED --- From fedora-extras-commits at redhat.com Sat Feb 3 18:14:49 2007 From: fedora-extras-commits at redhat.com (Jakub Hrozek (jhrozek)) Date: Sat, 3 Feb 2007 13:14:49 -0500 Subject: rpms/dwdiff - New directory Message-ID: <200702031814.l13IEnCa015686@cvs-int.fedora.redhat.com> Author: jhrozek Update of /cvs/extras/rpms/dwdiff In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15681/dwdiff Log Message: Directory /cvs/extras/rpms/dwdiff added to the repository From fedora-extras-commits at redhat.com Sat Feb 3 18:14:56 2007 From: fedora-extras-commits at redhat.com (Jakub Hrozek (jhrozek)) Date: Sat, 3 Feb 2007 13:14:56 -0500 Subject: rpms/dwdiff/devel - New directory Message-ID: <200702031814.l13IEuAK015700@cvs-int.fedora.redhat.com> Author: jhrozek Update of /cvs/extras/rpms/dwdiff/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15681/dwdiff/devel Log Message: Directory /cvs/extras/rpms/dwdiff/devel added to the repository From fedora-extras-commits at redhat.com Sat Feb 3 19:09:27 2007 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 3 Feb 2007 14:09:27 -0500 Subject: rpms/cups-pdf/devel cups_pdf-2.4.4.te, NONE, 1.1 .cvsignore, 1.2, 1.3 cups-pdf.spec, 1.1, 1.2 sources, 1.2, 1.3 cups_pdf-2.4.2.te, 1.1, NONE Message-ID: <200702031909.l13J9R6E019435@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/cups-pdf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19408 Modified Files: .cvsignore cups-pdf.spec sources Added Files: cups_pdf-2.4.4.te Removed Files: cups_pdf-2.4.2.te Log Message: update to 2.4.4 --- NEW FILE cups_pdf-2.4.4.te --- policy_module(cups_pdf,2.4.4) require { class dir { add_name create getattr remove_name search setattr write }; class file { create getattr read setattr unlink write }; type cupsd_t; type home_root_t; type user_home_dir_t; type user_home_t; type print_spool_t; } allow cupsd_t home_root_t:dir { getattr search }; allow cupsd_t user_home_dir_t:dir { getattr search }; allow cupsd_t user_home_t:dir { add_name create getattr remove_name search setattr write }; allow cupsd_t user_home_t:file { create getattr read setattr unlink write }; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cups-pdf/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 14 Nov 2006 05:46:25 -0000 1.2 +++ .cvsignore 3 Feb 2007 19:08:55 -0000 1.3 @@ -1 +1 @@ -cups-pdf_2.4.2.tar.gz +cups-pdf_2.4.4.tar.gz Index: cups-pdf.spec =================================================================== RCS file: /cvs/extras/rpms/cups-pdf/devel/cups-pdf.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cups-pdf.spec 14 Nov 2006 05:46:25 -0000 1.1 +++ cups-pdf.spec 3 Feb 2007 19:08:55 -0000 1.2 @@ -4,8 +4,8 @@ Summary: Extension for creating pdf-Files with CUPS Summary(fr): Extension de CUPS pour cr??er des fichiers PDF Name: cups-pdf -Version: 2.4.2 -Release: 2%{?dist} +Version: 2.4.4 +Release: 1%{?dist} Group: Applications/Publishing Source0: http://www.physik.uni-wuerzburg.de/~vrbehr/cups-pdf/src/%{name}_%{version}.tar.gz Source1: INSTALL.cups-pdf @@ -134,6 +134,9 @@ fi %changelog +* Sat Feb 03 2007 Remi Collet 2.4.4-1 +- update to 2.4.4 + * Mon Nov 13 2006 Remi Collet 2.4.2-2 - review comments (URL, INSTALL.fedora as Source2, descr. rewrap) Index: sources =================================================================== RCS file: /cvs/extras/rpms/cups-pdf/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 14 Nov 2006 05:46:25 -0000 1.2 +++ sources 3 Feb 2007 19:08:55 -0000 1.3 @@ -1 +1 @@ -97b21ab9dc98659bfce17da921ee2790 cups-pdf_2.4.2.tar.gz +4b01f0505e20c8a29a1cf9e6e772b56b cups-pdf_2.4.4.tar.gz --- cups_pdf-2.4.2.te DELETED --- From fedora-extras-commits at redhat.com Sat Feb 3 19:35:44 2007 From: fedora-extras-commits at redhat.com (David Lutterkort (lutter)) Date: Sat, 3 Feb 2007 14:35:44 -0500 Subject: rpms/puppet/devel .cvsignore, 1.10, 1.11 puppet.spec, 1.10, 1.11 sources, 1.10, 1.11 Message-ID: <200702031935.l13JZi2h019818@cvs-int.fedora.redhat.com> Author: lutter Update of /cvs/extras/rpms/puppet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19784 Modified Files: .cvsignore puppet.spec sources Log Message: New version 0.22.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/puppet/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 6 Jan 2007 00:22:27 -0000 1.10 +++ .cvsignore 3 Feb 2007 19:35:12 -0000 1.11 @@ -1 +1 @@ -puppet-0.22.0.tgz +puppet-0.22.1.tgz Index: puppet.spec =================================================================== RCS file: /cvs/extras/rpms/puppet/devel/puppet.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- puppet.spec 6 Jan 2007 00:22:27 -0000 1.10 +++ puppet.spec 3 Feb 2007 19:35:12 -0000 1.11 @@ -7,7 +7,7 @@ Summary: A network tool for managing many disparate systems Name: puppet -Version: 0.22.0 +Version: 0.22.1 Release: 1%{?dist} License: GPL Group: System Environment/Base @@ -134,6 +134,9 @@ %{__rm} -rf %{buildroot} %changelog +* Sat Feb 3 2007 David Lutterkort - 0.22.1-1 +- New version + * Fri Jan 5 2007 David Lutterkort - 0.22.0-1 - New version Index: sources =================================================================== RCS file: /cvs/extras/rpms/puppet/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 6 Jan 2007 00:22:27 -0000 1.10 +++ sources 3 Feb 2007 19:35:12 -0000 1.11 @@ -1 +1 @@ -9d60a93ba44467f551088fc20686edba puppet-0.22.0.tgz +ce1ce40b5dda8c2068aa8c804f0617bf puppet-0.22.1.tgz From fedora-extras-commits at redhat.com Sat Feb 3 19:40:45 2007 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 3 Feb 2007 14:40:45 -0500 Subject: rpms/cups-pdf/FC-6 cups_pdf-2.4.4.te, NONE, 1.1 .cvsignore, 1.2, 1.3 cups-pdf.spec, 1.1, 1.2 sources, 1.2, 1.3 cups_pdf-2.4.2.te, 1.1, NONE Message-ID: <200702031940.l13Jej8a019921@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/cups-pdf/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19884 Modified Files: .cvsignore cups-pdf.spec sources Added Files: cups_pdf-2.4.4.te Removed Files: cups_pdf-2.4.2.te Log Message: update to 2.4.4 --- NEW FILE cups_pdf-2.4.4.te --- policy_module(cups_pdf,2.4.4) require { class dir { add_name create getattr remove_name search setattr write }; class file { create getattr read setattr unlink write }; type cupsd_t; type home_root_t; type user_home_dir_t; type user_home_t; type print_spool_t; } allow cupsd_t home_root_t:dir { getattr search }; allow cupsd_t user_home_dir_t:dir { getattr search }; allow cupsd_t user_home_t:dir { add_name create getattr remove_name search setattr write }; allow cupsd_t user_home_t:file { create getattr read setattr unlink write }; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cups-pdf/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 14 Nov 2006 05:46:25 -0000 1.2 +++ .cvsignore 3 Feb 2007 19:40:12 -0000 1.3 @@ -1 +1 @@ -cups-pdf_2.4.2.tar.gz +cups-pdf_2.4.4.tar.gz Index: cups-pdf.spec =================================================================== RCS file: /cvs/extras/rpms/cups-pdf/FC-6/cups-pdf.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cups-pdf.spec 14 Nov 2006 05:46:25 -0000 1.1 +++ cups-pdf.spec 3 Feb 2007 19:40:12 -0000 1.2 @@ -4,8 +4,8 @@ Summary: Extension for creating pdf-Files with CUPS Summary(fr): Extension de CUPS pour cr??er des fichiers PDF Name: cups-pdf -Version: 2.4.2 -Release: 2%{?dist} +Version: 2.4.4 +Release: 1%{?dist} Group: Applications/Publishing Source0: http://www.physik.uni-wuerzburg.de/~vrbehr/cups-pdf/src/%{name}_%{version}.tar.gz Source1: INSTALL.cups-pdf @@ -134,6 +134,9 @@ fi %changelog +* Sat Feb 03 2007 Remi Collet 2.4.4-1 +- update to 2.4.4 + * Mon Nov 13 2006 Remi Collet 2.4.2-2 - review comments (URL, INSTALL.fedora as Source2, descr. rewrap) Index: sources =================================================================== RCS file: /cvs/extras/rpms/cups-pdf/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 14 Nov 2006 05:46:25 -0000 1.2 +++ sources 3 Feb 2007 19:40:12 -0000 1.3 @@ -1 +1 @@ -97b21ab9dc98659bfce17da921ee2790 cups-pdf_2.4.2.tar.gz +4b01f0505e20c8a29a1cf9e6e772b56b cups-pdf_2.4.4.tar.gz --- cups_pdf-2.4.2.te DELETED --- From fedora-extras-commits at redhat.com Sat Feb 3 19:43:35 2007 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 3 Feb 2007 14:43:35 -0500 Subject: rpms/cups-pdf/FC-5 cups_pdf-2.4.4.te, NONE, 1.1 .cvsignore, 1.2, 1.3 cups-pdf.spec, 1.1, 1.2 sources, 1.2, 1.3 cups_pdf-2.4.2.te, 1.1, NONE Message-ID: <200702031943.l13JhZEJ020051@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/cups-pdf/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19997 Modified Files: .cvsignore cups-pdf.spec sources Added Files: cups_pdf-2.4.4.te Removed Files: cups_pdf-2.4.2.te Log Message: update to 2.4.4 --- NEW FILE cups_pdf-2.4.4.te --- policy_module(cups_pdf,2.4.4) require { class dir { add_name create getattr remove_name search setattr write }; class file { create getattr read setattr unlink write }; type cupsd_t; type home_root_t; type user_home_dir_t; type user_home_t; type print_spool_t; } allow cupsd_t home_root_t:dir { getattr search }; allow cupsd_t user_home_dir_t:dir { getattr search }; allow cupsd_t user_home_t:dir { add_name create getattr remove_name search setattr write }; allow cupsd_t user_home_t:file { create getattr read setattr unlink write }; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cups-pdf/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 14 Nov 2006 05:46:25 -0000 1.2 +++ .cvsignore 3 Feb 2007 19:43:03 -0000 1.3 @@ -1 +1 @@ -cups-pdf_2.4.2.tar.gz +cups-pdf_2.4.4.tar.gz Index: cups-pdf.spec =================================================================== RCS file: /cvs/extras/rpms/cups-pdf/FC-5/cups-pdf.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cups-pdf.spec 14 Nov 2006 05:46:25 -0000 1.1 +++ cups-pdf.spec 3 Feb 2007 19:43:03 -0000 1.2 @@ -4,8 +4,8 @@ Summary: Extension for creating pdf-Files with CUPS Summary(fr): Extension de CUPS pour cr??er des fichiers PDF Name: cups-pdf -Version: 2.4.2 -Release: 2%{?dist} +Version: 2.4.4 +Release: 1%{?dist} Group: Applications/Publishing Source0: http://www.physik.uni-wuerzburg.de/~vrbehr/cups-pdf/src/%{name}_%{version}.tar.gz Source1: INSTALL.cups-pdf @@ -134,6 +134,9 @@ fi %changelog +* Sat Feb 03 2007 Remi Collet 2.4.4-1 +- update to 2.4.4 + * Mon Nov 13 2006 Remi Collet 2.4.2-2 - review comments (URL, INSTALL.fedora as Source2, descr. rewrap) Index: sources =================================================================== RCS file: /cvs/extras/rpms/cups-pdf/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 14 Nov 2006 05:46:25 -0000 1.2 +++ sources 3 Feb 2007 19:43:03 -0000 1.3 @@ -1 +1 @@ -97b21ab9dc98659bfce17da921ee2790 cups-pdf_2.4.2.tar.gz +4b01f0505e20c8a29a1cf9e6e772b56b cups-pdf_2.4.4.tar.gz --- cups_pdf-2.4.2.te DELETED --- From fedora-extras-commits at redhat.com Sat Feb 3 19:43:40 2007 From: fedora-extras-commits at redhat.com (David Lutterkort (lutter)) Date: Sat, 3 Feb 2007 14:43:40 -0500 Subject: rpms/puppet/FC-6 .cvsignore, 1.10, 1.11 puppet.spec, 1.10, 1.11 sources, 1.10, 1.11 Message-ID: <200702031943.l13JheGu020056@cvs-int.fedora.redhat.com> Author: lutter Update of /cvs/extras/rpms/puppet/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20022 Modified Files: .cvsignore puppet.spec sources Log Message: New version 0.22.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/puppet/FC-6/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 6 Jan 2007 00:34:25 -0000 1.10 +++ .cvsignore 3 Feb 2007 19:43:07 -0000 1.11 @@ -1 +1 @@ -puppet-0.22.0.tgz +puppet-0.22.1.tgz Index: puppet.spec =================================================================== RCS file: /cvs/extras/rpms/puppet/FC-6/puppet.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- puppet.spec 6 Jan 2007 00:34:25 -0000 1.10 +++ puppet.spec 3 Feb 2007 19:43:07 -0000 1.11 @@ -7,7 +7,7 @@ Summary: A network tool for managing many disparate systems Name: puppet -Version: 0.22.0 +Version: 0.22.1 Release: 1%{?dist} License: GPL Group: System Environment/Base @@ -134,6 +134,9 @@ %{__rm} -rf %{buildroot} %changelog +* Sat Feb 3 2007 David Lutterkort - 0.22.1-1 +- New version + * Fri Jan 5 2007 David Lutterkort - 0.22.0-1 - New version Index: sources =================================================================== RCS file: /cvs/extras/rpms/puppet/FC-6/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 6 Jan 2007 00:34:25 -0000 1.10 +++ sources 3 Feb 2007 19:43:07 -0000 1.11 @@ -1 +1 @@ -9d60a93ba44467f551088fc20686edba puppet-0.22.0.tgz +ce1ce40b5dda8c2068aa8c804f0617bf puppet-0.22.1.tgz From fedora-extras-commits at redhat.com Sat Feb 3 19:44:46 2007 From: fedora-extras-commits at redhat.com (David Lutterkort (lutter)) Date: Sat, 3 Feb 2007 14:44:46 -0500 Subject: rpms/puppet/FC-5 .cvsignore, 1.10, 1.11 puppet.spec, 1.10, 1.11 sources, 1.10, 1.11 Message-ID: <200702031944.l13JikeH020168@cvs-int.fedora.redhat.com> Author: lutter Update of /cvs/extras/rpms/puppet/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20144 Modified Files: .cvsignore puppet.spec sources Log Message: New version 0.22.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/puppet/FC-5/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 6 Jan 2007 00:41:26 -0000 1.10 +++ .cvsignore 3 Feb 2007 19:44:14 -0000 1.11 @@ -1 +1 @@ -puppet-0.22.0.tgz +puppet-0.22.1.tgz Index: puppet.spec =================================================================== RCS file: /cvs/extras/rpms/puppet/FC-5/puppet.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- puppet.spec 6 Jan 2007 00:41:26 -0000 1.10 +++ puppet.spec 3 Feb 2007 19:44:14 -0000 1.11 @@ -7,7 +7,7 @@ Summary: A network tool for managing many disparate systems Name: puppet -Version: 0.22.0 +Version: 0.22.1 Release: 1%{?dist} License: GPL Group: System Environment/Base @@ -134,6 +134,9 @@ %{__rm} -rf %{buildroot} %changelog +* Sat Feb 3 2007 David Lutterkort - 0.22.1-1 +- New version + * Fri Jan 5 2007 David Lutterkort - 0.22.0-1 - New version Index: sources =================================================================== RCS file: /cvs/extras/rpms/puppet/FC-5/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 6 Jan 2007 00:41:26 -0000 1.10 +++ sources 3 Feb 2007 19:44:14 -0000 1.11 @@ -1 +1 @@ -9d60a93ba44467f551088fc20686edba puppet-0.22.0.tgz +ce1ce40b5dda8c2068aa8c804f0617bf puppet-0.22.1.tgz From fedora-extras-commits at redhat.com Sat Feb 3 20:10:18 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 3 Feb 2007 15:10:18 -0500 Subject: rpms/kpolynome import.log,1.3,1.4 Message-ID: <200702032010.l13KAIeS023678@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/kpolynome In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23640 Modified Files: import.log Log Message: auto-import kpolynome-0.1.2-8 on branch FC-5 from kpolynome-0.1.2-8.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/kpolynome/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 11 Sep 2006 06:27:42 -0000 1.3 +++ import.log 3 Feb 2007 20:09:46 -0000 1.4 @@ -1,2 +1,3 @@ kpolynome-0_1_2-6:HEAD:kpolynome-0.1.2-6.src.rpm:1156614747 kpolynome-0_1_2-7:HEAD:kpolynome-0.1.2-7.src.rpm:1157956312 +kpolynome-0_1_2-8:FC-5:kpolynome-0.1.2-8.src.rpm:1170533412 From fedora-extras-commits at redhat.com Sat Feb 3 20:10:21 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 3 Feb 2007 15:10:21 -0500 Subject: rpms/kpolynome/FC-5 kpolynome.spec,1.1,1.2 Message-ID: <200702032010.l13KALAR023681@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/kpolynome/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23640/FC-5 Modified Files: kpolynome.spec Log Message: auto-import kpolynome-0.1.2-8 on branch FC-5 from kpolynome-0.1.2-8.src.rpm Index: kpolynome.spec =================================================================== RCS file: /cvs/extras/rpms/kpolynome/FC-5/kpolynome.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kpolynome.spec 26 Aug 2006 15:49:13 -0000 1.1 +++ kpolynome.spec 3 Feb 2007 20:09:48 -0000 1.2 @@ -1,7 +1,7 @@ Name: kpolynome #Version 0.1-2 second upstream release Version: 0.1.2 -Release: 6%{?dist} +Release: 8%{?dist} Summary: A polynome calculation program for KDE License: GPL @@ -11,12 +11,8 @@ Patch0: kpolynome-0.1-2-desktop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: autoconf, automake, kdelibs-devel, desktop-file-utils +BuildRequires: automake, kdelibs-devel, desktop-file-utils -Requires(post): %{_bindir}/gtk-update-icon-cache -Requires(post): %{_bindir}/update-desktop-database -Requires(postun): %{_bindir}/gtk-update-icon-cache -Requires(postun): %{_bindir}/update-desktop-database %description KPolynome is a program to calculate mathematical polynomes @@ -40,42 +36,46 @@ chmod 644 doc/{en,hu}/index.docbook # Fix absolute symlink -rm -f %{buildroot}%{_docdir}/HTML/??/%{name}/common +%{__rm} -f %{buildroot}%{_docdir}/HTML/??/%{name}/common -desktop-file-install --vendor fedora \ - --add-category "Engineering" \ - --add-category "X-Fedora" \ +desktop-file-install --vendor "" \ + --remove-category "Science" \ --delete-original \ --dir %{buildroot}%{_datadir}/applications/ \ %{buildroot}%{_datadir}/applnk/Edutainment/Mathematics/%{name}.desktop -rm -rf %{buildroot}%{_docdir}/HTML/ +%{__rm} -rf %{buildroot}%{_docdir}/HTML/ #No translations %clean -rm -rf %{buildroot} +%{__rm} -rf %{buildroot} %post touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -%{_bindir}/update-desktop-database %{_datadir}/applications +%{_bindir}/update-desktop-database %{_datadir}/applications || : %postun touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -%{_bindir}/update-desktop-database %{_datadir}/applications +%{_bindir}/update-desktop-database %{_datadir}/applications || : %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog TODO doc/en doc/hu %{_bindir}/%{name} -%dir %{_datadir}/apps/%{name} -%{_datadir}/apps/%{name}/%{name}ui.rc -%{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/apps/%{name} +%{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/??x??/apps/%{name}.png %Changelog +* Sat Feb 03 2007 Chitlesh Goorah - 0.1.2-8 +- rebuilt and fixed duplicates in the kmenu + +* Mon Sep 11 2006 Chitlesh Goorah - 0.1.2-7 +- Rebuild for FC-6 devel + * Sat Aug 26 2006 Chitlesh Goorah - 0.1.2-6 - Replaced $$RPM_BUILD_ROOT by %%{buildroot} - Removed requires: kdelibs From fedora-extras-commits at redhat.com Sat Feb 3 20:21:28 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 3 Feb 2007 15:21:28 -0500 Subject: rpms/kpolynome/FC-6 kpolynome.spec,1.2,1.3 Message-ID: <200702032021.l13KLSYj023855@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/kpolynome/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23817/FC-6 Modified Files: kpolynome.spec Log Message: auto-import kpolynome-0.1.2-8 on branch FC-6 from kpolynome-0.1.2-8.src.rpm Index: kpolynome.spec =================================================================== RCS file: /cvs/extras/rpms/kpolynome/FC-6/kpolynome.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kpolynome.spec 11 Sep 2006 06:27:43 -0000 1.2 +++ kpolynome.spec 3 Feb 2007 20:20:55 -0000 1.3 @@ -1,7 +1,7 @@ Name: kpolynome #Version 0.1-2 second upstream release Version: 0.1.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A polynome calculation program for KDE License: GPL @@ -38,9 +38,8 @@ # Fix absolute symlink %{__rm} -f %{buildroot}%{_docdir}/HTML/??/%{name}/common -desktop-file-install --vendor fedora \ - --add-category "Engineering" \ - --add-category "X-Fedora" \ +desktop-file-install --vendor "" \ + --remove-category "Science" \ --delete-original \ --dir %{buildroot}%{_datadir}/applications/ \ %{buildroot}%{_datadir}/applnk/Edutainment/Mathematics/%{name}.desktop @@ -50,7 +49,7 @@ #No translations %clean -rm -rf %{buildroot} +%{__rm} -rf %{buildroot} %post touch --no-create %{_datadir}/icons/hicolor || : @@ -67,10 +66,13 @@ %doc AUTHORS COPYING ChangeLog TODO doc/en doc/hu %{_bindir}/%{name} %{_datadir}/apps/%{name} -%{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/??x??/apps/%{name}.png %Changelog +* Sat Feb 03 2007 Chitlesh Goorah - 0.1.2-8 +- rebuilt and fixed duplicates in the kmenu + * Mon Sep 11 2006 Chitlesh Goorah - 0.1.2-7 - Rebuild for FC-6 devel From fedora-extras-commits at redhat.com Sat Feb 3 20:21:25 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 3 Feb 2007 15:21:25 -0500 Subject: rpms/kpolynome import.log,1.4,1.5 Message-ID: <200702032021.l13KLP3P023851@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/kpolynome In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23817 Modified Files: import.log Log Message: auto-import kpolynome-0.1.2-8 on branch FC-6 from kpolynome-0.1.2-8.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/kpolynome/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 3 Feb 2007 20:09:46 -0000 1.4 +++ import.log 3 Feb 2007 20:20:53 -0000 1.5 @@ -1,3 +1,4 @@ kpolynome-0_1_2-6:HEAD:kpolynome-0.1.2-6.src.rpm:1156614747 kpolynome-0_1_2-7:HEAD:kpolynome-0.1.2-7.src.rpm:1157956312 kpolynome-0_1_2-8:FC-5:kpolynome-0.1.2-8.src.rpm:1170533412 +kpolynome-0_1_2-8:FC-6:kpolynome-0.1.2-8.src.rpm:1170534079 From fedora-extras-commits at redhat.com Sat Feb 3 20:24:54 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 3 Feb 2007 15:24:54 -0500 Subject: rpms/kpolynome/devel kpolynome.spec,1.2,1.3 Message-ID: <200702032024.l13KOs3I023953@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/kpolynome/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23918/devel Modified Files: kpolynome.spec Log Message: auto-import kpolynome-0.1.2-8 on branch devel from kpolynome-0.1.2-8.src.rpm Index: kpolynome.spec =================================================================== RCS file: /cvs/extras/rpms/kpolynome/devel/kpolynome.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kpolynome.spec 11 Sep 2006 06:27:43 -0000 1.2 +++ kpolynome.spec 3 Feb 2007 20:24:22 -0000 1.3 @@ -1,7 +1,7 @@ Name: kpolynome #Version 0.1-2 second upstream release Version: 0.1.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A polynome calculation program for KDE License: GPL @@ -38,9 +38,8 @@ # Fix absolute symlink %{__rm} -f %{buildroot}%{_docdir}/HTML/??/%{name}/common -desktop-file-install --vendor fedora \ - --add-category "Engineering" \ - --add-category "X-Fedora" \ +desktop-file-install --vendor "" \ + --remove-category "Science" \ --delete-original \ --dir %{buildroot}%{_datadir}/applications/ \ %{buildroot}%{_datadir}/applnk/Edutainment/Mathematics/%{name}.desktop @@ -50,7 +49,7 @@ #No translations %clean -rm -rf %{buildroot} +%{__rm} -rf %{buildroot} %post touch --no-create %{_datadir}/icons/hicolor || : @@ -67,10 +66,13 @@ %doc AUTHORS COPYING ChangeLog TODO doc/en doc/hu %{_bindir}/%{name} %{_datadir}/apps/%{name} -%{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/??x??/apps/%{name}.png %Changelog +* Sat Feb 03 2007 Chitlesh Goorah - 0.1.2-8 +- rebuilt and fixed duplicates in the kmenu + * Mon Sep 11 2006 Chitlesh Goorah - 0.1.2-7 - Rebuild for FC-6 devel From fedora-extras-commits at redhat.com Sat Feb 3 20:24:52 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 3 Feb 2007 15:24:52 -0500 Subject: rpms/kpolynome import.log,1.5,1.6 Message-ID: <200702032024.l13KOqPk023950@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/kpolynome In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23918 Modified Files: import.log Log Message: auto-import kpolynome-0.1.2-8 on branch devel from kpolynome-0.1.2-8.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/kpolynome/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 3 Feb 2007 20:20:53 -0000 1.5 +++ import.log 3 Feb 2007 20:24:19 -0000 1.6 @@ -2,3 +2,4 @@ kpolynome-0_1_2-7:HEAD:kpolynome-0.1.2-7.src.rpm:1157956312 kpolynome-0_1_2-8:FC-5:kpolynome-0.1.2-8.src.rpm:1170533412 kpolynome-0_1_2-8:FC-6:kpolynome-0.1.2-8.src.rpm:1170534079 +kpolynome-0_1_2-8:HEAD:kpolynome-0.1.2-8.src.rpm:1170534286 From fedora-extras-commits at redhat.com Sat Feb 3 20:44:05 2007 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sat, 3 Feb 2007 15:44:05 -0500 Subject: rpms/bcfg2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 bcfg2-serverinitsubsys.patch, NONE, 1.1 bcfg2.spec, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702032044.l13Ki5mO024340@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/bcfg2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24329 Added Files: .cvsignore Makefile bcfg2-serverinitsubsys.patch bcfg2.spec sources Log Message: Setting up bcfg2 --- NEW FILE .cvsignore --- bcfg2-0.8.7.3.tar.gz ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' bcfg2-serverinitsubsys.patch: --- NEW FILE bcfg2-serverinitsubsys.patch --- --- debian/buildsys/common/bcfg2-server.init.orig 2006-12-20 08:54:22.000000000 -0600 +++ debian/buildsys/common/bcfg2-server.init 2006-12-20 09:02:00.000000000 -0600 @@ -40,6 +40,7 @@ if [ "$STATUS" = 0 ] then l_msg "bcfg2-server" + touch /var/lock/subsys/bcfg2-server else l_fail "bcfg2-server" fi @@ -51,6 +52,7 @@ STATUS=$? if [ "$STATUS" = 0 ]; then l_msg "bcfg2-server" + rm -f /var/lock/subsys/bcfg2-server exit 0 else l_fail "bcfg2-server" --- NEW FILE bcfg2.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: bcfg2 Version: 0.8.7.3 Release: 2%{?dist} Summary: Configuration management system Group: Applications/System License: BSD URL: http://trac.mcs.anl.gov/projects/bcfg2 Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-%{version}.tar.gz Patch0: bcfg2-serverinitsubsys.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel Requires: python-lxml Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service Requires(postun): /sbin/service %description Bcfg2 helps system administrators produce a consistent, reproducible, and verifiable description of their environment, and offers visualization and reporting tools to aid in day-to-day administrative tasks. It is the fifth generation of configuration management tools developed in the Mathematics and Computer Science Division of Argonne National Laboratory. It is based on an operational model in which the specification can be used to validate and optionally change the state of clients, but in a feature unique to bcfg2 the client's response to the specification can also be used to assess the completeness of the specification. Using this feature, bcfg2 provides an objective measure of how good a job an administrator has done in specifying the configuration of client systems. Bcfg2 is therefore built to help administrators construct an accurate, comprehensive specification. Bcfg2 has been designed from the ground up to support gentle reconciliation between the specification and current client states. It is designed to gracefully cope with manual system modifications. Finally, due to the rapid pace of updates on modern networks, client systems are constantly changing; if required in your environment, Bcfg2 can enable the construction of complex change management and deployment strategies. %package server Summary: Configuration management server Group: System Environment/Daemons Requires: bcfg2 = %{version}-%{release} Requires: /usr/sbin/sendmail Requires: /usr/bin/openssl Requires: gamin-python Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service Requires(postun): /sbin/service %description server Configuration management server %prep %setup -q %patch0 -p0 -b .serverinitsubsys # fixup some paths %{__perl} -pi -e 's@/etc/default@%{_sysconfdir}/sysconfig at g' debian/buildsys/common/bcfg2.init %{__perl} -pi -e 's@/etc/default@%{_sysconfdir}/sysconfig at g' tools/bcfg2-cron %{__perl} -pi -e 's@/usr/lib/bcfg2@%{_libexecdir}@g' debian/bcfg2.cron.daily %{__perl} -pi -e 's@/usr/lib/bcfg2@%{_libexecdir}@g' debian/bcfg2.cron.hourly # don't start servers by default %{__perl} -pi -e 's at chkconfig: (\d+)@chkconfig: -@' debian/buildsys/common/bcfg2.init %{__perl} -pi -e 's at chkconfig: (\d+)@chkconfig: -@' debian/buildsys/common/bcfg2-server.init # get rid of extraneous shebangs for f in `find src/lib -name \*.py` do %{__sed} -i -e '/^#!/,1d' $f done %build %{__python} setup.py build %install rm -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot} mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_initrddir} mkdir -p %{buildroot}%{_sysconfdir}/cron.daily mkdir -p %{buildroot}%{_sysconfdir}/cron.hourly mkdir -p %{buildroot}%{_sysconfdir}/sysconfig mkdir -p %{buildroot}%{_libexecdir} mkdir -p %{buildroot}%{_var}/lib/bcfg2 mv %{buildroot}%{_bindir}/bcfg2* %{buildroot}%{_sbindir} install -m 755 debian/buildsys/common/bcfg2.init %{buildroot}%{_initrddir}/bcfg2 install -m 755 debian/buildsys/common/bcfg2-server.init %{buildroot}%{_initrddir}/bcfg2-server install -m 755 debian/bcfg2.cron.daily %{buildroot}%{_sysconfdir}/cron.daily/bcfg2 install -m 755 debian/bcfg2.cron.hourly %{buildroot}%{_sysconfdir}/cron.hourly/bcfg2 install -m 755 tools/bcfg2-cron %{buildroot}%{_libexecdir}/bcfg2-cron install -m 644 debian/bcfg2.default %{buildroot}%{_sysconfdir}/sysconfig/bcfg2 touch %{buildroot}%{_sysconfdir}/bcfg2.conf touch %{buildroot}%{_sysconfdir}/bcfg2.key %clean rm -rf %{buildroot} %post /sbin/chkconfig --add bcfg2 %preun if [ $1 = 0 ]; then /sbin/service bcfg2 stop >/dev/null 2>&1 || : /sbin/chkconfig --del bcfg2 fi %postun if [ "$1" -ge "1" ]; then /sbin/service bcfg2 condrestart >/dev/null 2>&1 || : fi %post server /sbin/chkconfig --add bcfg2-server %preun server if [ $1 = 0 ]; then /sbin/service bcfg2-server stop >/dev/null 2>&1 || : /sbin/chkconfig --del bcfg2-server fi %postun server if [ "$1" -ge "1" ]; then /sbin/service bcfg2-server condrestart >/dev/null 2>&1 || : fi %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog doc examples COPYRIGHT README %ghost %attr(600,root,root) %config(noreplace) %{_sysconfdir}/bcfg2.conf %config(noreplace) %{_sysconfdir}/sysconfig/bcfg2 %{_sysconfdir}/cron.daily/bcfg2 %{_sysconfdir}/cron.hourly/bcfg2 %{_initrddir}/bcfg2 %dir %{python_sitelib}/Bcfg2 %{python_sitelib}/Bcfg2/__init__.* %{python_sitelib}/Bcfg2/Client %{python_sitelib}/Bcfg2/Logging.* %{python_sitelib}/Bcfg2/Options.* %{_sbindir}/bcfg2 %{_mandir}/man1/bcfg2.1* %{_mandir}/man5/bcfg2.conf.5* %{_libexecdir}/bcfg2-cron %files server %defattr(-,root,root,-) %ghost %attr(600,root,root) %config(noreplace) %{_sysconfdir}/bcfg2.key %{_initrddir}/bcfg2-server %{python_sitelib}/Bcfg2/Server %{_datadir}/bcfg2 %{_sbindir}/bcfg2-admin %{_sbindir}/bcfg2-build-reports %{_sbindir}/bcfg2-info %{_sbindir}/bcfg2-ping-sweep %{_sbindir}/bcfg2-query %{_sbindir}/bcfg2-repo-validate %{_sbindir}/bcfg2-server %{_mandir}/man8/bcfg2-build-reports.8* %{_mandir}/man8/bcfg2-info.8* %{_mandir}/man8/bcfg2-repo-validate.8* %{_mandir}/man8/bcfg2-server.8* %dir %{_var}/lib/bcfg2 %changelog * Tue Jan 9 2007 Jeffrey C. Ollie - 0.8.7.3-2 - Merge client back into base package. * Wed Dec 27 2006 Jeffrey C. Ollie - 0.8.7.3-1 - Update to 0.8.7.3 * Fri Dec 22 2006 Jeffrey C. Ollie - 0.8.7.1-5 - Server needs client library files too so put them in main package * Wed Dec 20 2006 Jeffrey C. Ollie - 0.8.7.1-4 - Yes, actually we need to require openssl * Wed Dec 20 2006 Jeffrey C. Ollie - 0.8.7.1-3 - Don't generate SSL cert in post script, it only needs to be done on the server and is handled by the bcfg2-admin tool. - Move the /etc/bcfg2.key file to the server package - Don't install a sample copy of the config file, just ghost it - Require gamin-python for the server package - Don't require openssl - Make the client a separate package so you don't have to have the client if you don't want it * Wed Dec 20 2006 Jeffrey C. Ollie - 0.8.7.1-2 - Add more documentation * Mon Dec 18 2006 Jeffrey C. Ollie - 0.8.7.1-1 - First version for Fedora Extras --- NEW FILE sources --- 375d99b8282befa975e93930ce51041c bcfg2-0.8.7.3.tar.gz From fedora-extras-commits at redhat.com Sat Feb 3 20:49:28 2007 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sat, 3 Feb 2007 15:49:28 -0500 Subject: comps comps-fe5.xml.in, 1.247, 1.248 comps-fe6.xml.in, 1.290, 1.291 comps-fe7.xml.in, 1.98, 1.99 Message-ID: <200702032049.l13KnSPm024412@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24390/comps Modified Files: comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in Log Message: Add OpenArena entry. Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.247 retrieving revision 1.248 diff -u -r1.247 -r1.248 --- comps-fe5.xml.in 29 Jan 2007 03:58:03 -0000 1.247 +++ comps-fe5.xml.in 3 Feb 2007 20:48:58 -0000 1.248 @@ -388,6 +388,7 @@ nexuiz njam oneko + openarena overgod pachi pengupop Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.290 retrieving revision 1.291 diff -u -r1.290 -r1.291 --- comps-fe6.xml.in 2 Feb 2007 17:11:14 -0000 1.290 +++ comps-fe6.xml.in 3 Feb 2007 20:48:58 -0000 1.291 @@ -446,6 +446,7 @@ nexuiz njam oneko + openarena overgod pachi pengupop Index: comps-fe7.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe7.xml.in,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- comps-fe7.xml.in 2 Feb 2007 17:11:14 -0000 1.98 +++ comps-fe7.xml.in 3 Feb 2007 20:48:58 -0000 1.99 @@ -446,6 +446,7 @@ nexuiz njam oneko + openarena overgod pachi pengupop From fedora-extras-commits at redhat.com Sat Feb 3 21:13:34 2007 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 3 Feb 2007 16:13:34 -0500 Subject: rpms/gpgme/devel gpgme-1.1.3-config_extras.patch, NONE, 1.1 gpgme.spec, 1.20, 1.21 gpgme-1.1.2-config_extras.patch, 1.2, NONE Message-ID: <200702032113.l13LDYPx027899@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gpgme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27864 Modified Files: gpgme.spec Added Files: gpgme-1.1.3-config_extras.patch Removed Files: gpgme-1.1.2-config_extras.patch Log Message: * Sat Feb 03 2007 Rex Dieter 1.1.3-1 - gpgme-1.1.3 gpgme-1.1.3-config_extras.patch: --- NEW FILE gpgme-1.1.3-config_extras.patch --- --- gpgme-1.1.3/gpgme/gpgme-config.in.config_extras 2007-01-29 14:16:20.000000000 -0600 +++ gpgme-1.1.3/gpgme/gpgme-config.in 2007-02-03 14:57:01.000000000 -0600 @@ -19,21 +19,21 @@ # Configure libgpg-error. gpg_error_cflags="@GPG_ERROR_CFLAGS@" -gpg_error_libs="@GPG_ERROR_LIBS@" +#gpg_error_libs="@GPG_ERROR_LIBS@" # Configure thread packages. thread_modules="" @HAVE_PTH_TRUE at thread_modules="$thread_modules pth" -libs_pth="@PTH_LDFLAGS@ @PTH_LIBS@" +#libs_pth="@PTH_LDFLAGS@ @PTH_LIBS@" cflags_pth="@PTH_CFLAGS@" @HAVE_PTHREAD_TRUE at thread_modules="$thread_modules pthread" -libs_pthread="-lpthread" +#libs_pthread="-lpthread" cflags_pthread="" # Configure glib. -libs_glib="@GLIB_LIBS@" +#libs_glib="@GLIB_LIBS@" cflags_glib="@GLIB_CFLAGS@" with_glib= Index: gpgme.spec =================================================================== RCS file: /cvs/extras/rpms/gpgme/devel/gpgme.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- gpgme.spec 3 Oct 2006 13:11:01 -0000 1.20 +++ gpgme.spec 3 Feb 2007 21:13:02 -0000 1.21 @@ -1,8 +1,8 @@ Name: gpgme Summary: GnuPG Made Easy - high level crypto API -Version: 1.1.2 -Release: 6%{?dist}.1 +Version: 1.1.3 +Release: 1%{?dist} License: LGPL Group: Applications/System @@ -11,7 +11,7 @@ Source1: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2.sig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: gpgme-1.1.2-config_extras.patch +Patch1: gpgme-1.1.3-config_extras.patch BuildRequires: gnupg >= 1.2.2 BuildRequires: gnupg2 >= 1.9.6 @@ -60,8 +60,10 @@ make install DESTDIR=$RPM_BUILD_ROOT +# unpackaged files rm -f $RPM_BUILD_ROOT%{_infodir}/dir rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -rf $RPM_BUILD_ROOT%{_datadir}/common-lisp/source/gpgme/ %check || : @@ -86,6 +88,7 @@ fi + %files %defattr(-,root,root,-) %doc AUTHORS COPYING* ChangeLog NEWS README* THANKS TODO VERSION @@ -100,7 +103,12 @@ %{_infodir}/gpgme.info* + + %changelog +* Sat Feb 03 2007 Rex Dieter 1.1.3-1 +- gpgme-1.1.3 + * Tue Oct 03 2006 Rex Dieter - respin --- gpgme-1.1.2-config_extras.patch DELETED --- From fedora-extras-commits at redhat.com Sat Feb 3 21:14:23 2007 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 3 Feb 2007 16:14:23 -0500 Subject: rpms/gpgme/devel .cvsignore,1.6,1.7 sources,1.6,1.7 Message-ID: <200702032114.l13LEN2E027946@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gpgme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27906 Modified Files: .cvsignore sources Log Message: * Sat Feb 03 2007 Rex Dieter 1.1.3-1 - gpgme-1.1.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gpgme/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 3 Mar 2006 13:00:38 -0000 1.6 +++ .cvsignore 3 Feb 2007 21:13:51 -0000 1.7 @@ -1,2 +1,4 @@ gpgme-1.1.2.tar.bz2 gpgme-1.1.2.tar.bz2.sig +gpgme-1.1.3.tar.bz2 +gpgme-1.1.3.tar.bz2.sig Index: sources =================================================================== RCS file: /cvs/extras/rpms/gpgme/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 3 Mar 2006 13:00:38 -0000 1.6 +++ sources 3 Feb 2007 21:13:51 -0000 1.7 @@ -1,2 +1,2 @@ -7c2333679035a5f37e99630a156a40ca gpgme-1.1.2.tar.bz2 -5b786d78d322ea0778eea5ae67c087b4 gpgme-1.1.2.tar.bz2.sig +ea87bba8843ef68fd7677519cc99b607 gpgme-1.1.3.tar.bz2 +18c93e68d8fc9da1be22456f4a20c891 gpgme-1.1.3.tar.bz2.sig From fedora-extras-commits at redhat.com Sat Feb 3 21:14:39 2007 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sat, 3 Feb 2007 16:14:39 -0500 Subject: comps comps-fe5.xml.in, 1.248, 1.249 comps-fe6.xml.in, 1.291, 1.292 comps-fe7.xml.in, 1.99, 1.100 Message-ID: <200702032114.l13LEdDn027988@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27927/comps Modified Files: comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in Log Message: Add fonts-chinese, fonts-japanese, and fonts-korean. Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.248 retrieving revision 1.249 diff -u -r1.248 -r1.249 --- comps-fe5.xml.in 3 Feb 2007 20:48:58 -0000 1.248 +++ comps-fe5.xml.in 3 Feb 2007 21:14:09 -0000 1.249 @@ -74,6 +74,9 @@ dejavu-fonts-experimental devilspie efont-unicode-bdf + fonts-chinese + fonts-japanese + fonts-korean freefont lineak-defaultplugin lineak-xosdplugin Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.291 retrieving revision 1.292 diff -u -r1.291 -r1.292 --- comps-fe6.xml.in 3 Feb 2007 20:48:58 -0000 1.291 +++ comps-fe6.xml.in 3 Feb 2007 21:14:09 -0000 1.292 @@ -77,6 +77,9 @@ dejavu-fonts-experimental devilspie efont-unicode-bdf + fonts-chinese + fonts-japanese + fonts-korean freefont FreeWnn kinput2 Index: comps-fe7.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe7.xml.in,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- comps-fe7.xml.in 3 Feb 2007 20:48:58 -0000 1.99 +++ comps-fe7.xml.in 3 Feb 2007 21:14:09 -0000 1.100 @@ -77,6 +77,9 @@ dejavu-fonts-experimental devilspie efont-unicode-bdf + fonts-chinese + fonts-japanese + fonts-korean freefont FreeWnn kinput2 From fedora-extras-commits at redhat.com Sat Feb 3 21:46:46 2007 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 3 Feb 2007 16:46:46 -0500 Subject: rpms/ladspa-swh-plugins/devel swh-plugins-0.4.15-fPIC.patch, NONE, 1.1 ladspa-swh-plugins.spec, 1.2, 1.3 Message-ID: <200702032146.l13LkkXE028352@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/ladspa-swh-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28332 Modified Files: ladspa-swh-plugins.spec Added Files: swh-plugins-0.4.15-fPIC.patch Log Message: Compile everything with -fPIC. swh-plugins-0.4.15-fPIC.patch: --- NEW FILE swh-plugins-0.4.15-fPIC.patch --- --- util/Makefile.in~ 2006-08-08 08:48:04.000000000 -0700 +++ util/Makefile.in 2007-02-03 13:21:45.000000000 -0800 @@ -297,20 +297,20 @@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/rms.Po at am__quote@ .c.o: - at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ + at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(COMPILE) -c $< + at am__fastdepCC_FALSE@ $(LTCOMPILE) -c $< .c.obj: - at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ + at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + at am__fastdepCC_FALSE@ $(LTCOMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ Index: ladspa-swh-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/ladspa-swh-plugins/devel/ladspa-swh-plugins.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ladspa-swh-plugins.spec 7 Jan 2007 06:24:52 -0000 1.2 +++ ladspa-swh-plugins.spec 3 Feb 2007 21:46:14 -0000 1.3 @@ -3,11 +3,12 @@ Summary: A set of audio plugins for LADSPA Name: ladspa-%{pkgname} Version: 0.4.15 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Applications/Multimedia Source: http://plugin.org.uk/releases/0.4.15/swh-plugins-0.4.15.tar.gz Patch0: swh-plugins-0.4.14-Makefile.in.patch +Patch1: swh-plugins-0.4.15-fPIC.patch URL: http://plugin.org.uk/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -16,9 +17,6 @@ Obsoletes: %{pkgname} < 0.4.15-5 Provides: %{pkgname} = %{version}-%{release} -Requires(post): policycoreutils -Requires(postun): policycoreutils - %description A set of audio plugins for LADSPA (see http://plugin.org.uk/ for more details). @@ -26,6 +24,7 @@ %prep %setup -q -n %{pkgname}-%{version} %patch0 -p0 +%patch1 -p0 %build CFLAGS="$RPM_OPT_FLAGS" %configure --disable-static @@ -36,18 +35,6 @@ %{__make} DESTDIR=%{buildroot} install %find_lang %{pkgname} -%post -# Set SELinux file context in the policy -semanage fcontext -f -- -a -t textrel_shlib_t '%{_libdir}/ladspa/sc4m_1916.so' 2>/dev/null || : -# Actually change the context -chcon -R -t textrel_shlib_t %{_libdir}/ladspa/sc4m_1916.so || : - -%postun -# SELinux support -if [ $1 -eq 0 ]; then # final removal - semanage fcontext -f -- -d -t textrel_shlib_t %{_libdir}/ladspa/sc4m_1916.so || : -fi - %clean %{__rm} -rf %{buildroot} @@ -58,6 +45,10 @@ %{_datadir}/ladspa/rdf/* %changelog +* Sat Feb 03 2007 Anthony Green 0.4.15-7 +- Remove SELinux bits and compile with fPIC instead. + See bugzilla 225060 and %%patch1. + * Sat Jan 06 2007 Anthony Green 0.4.15-6 - Add SELinux bits for sc4m_1916.so. - Add policycoreutils dependencies. From fedora-extras-commits at redhat.com Sat Feb 3 21:48:23 2007 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 3 Feb 2007 16:48:23 -0500 Subject: rpms/ladspa-swh-plugins/FC-6 swh-plugins-0.4.15-fPIC.patch, NONE, 1.1 ladspa-swh-plugins.spec, 1.2, 1.3 Message-ID: <200702032148.l13LmNad028423@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/ladspa-swh-plugins/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28401 Modified Files: ladspa-swh-plugins.spec Added Files: swh-plugins-0.4.15-fPIC.patch Log Message: Compile everything with -fPIC. swh-plugins-0.4.15-fPIC.patch: --- NEW FILE swh-plugins-0.4.15-fPIC.patch --- --- util/Makefile.in~ 2006-08-08 08:48:04.000000000 -0700 +++ util/Makefile.in 2007-02-03 13:21:45.000000000 -0800 @@ -297,20 +297,20 @@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/rms.Po at am__quote@ .c.o: - at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ + at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(COMPILE) -c $< + at am__fastdepCC_FALSE@ $(LTCOMPILE) -c $< .c.obj: - at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ + at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + at am__fastdepCC_FALSE@ $(LTCOMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ Index: ladspa-swh-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/ladspa-swh-plugins/FC-6/ladspa-swh-plugins.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ladspa-swh-plugins.spec 7 Jan 2007 06:23:18 -0000 1.2 +++ ladspa-swh-plugins.spec 3 Feb 2007 21:47:50 -0000 1.3 @@ -3,11 +3,12 @@ Summary: A set of audio plugins for LADSPA Name: ladspa-%{pkgname} Version: 0.4.15 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Applications/Multimedia Source: http://plugin.org.uk/releases/0.4.15/swh-plugins-0.4.15.tar.gz Patch0: swh-plugins-0.4.14-Makefile.in.patch +Patch1: swh-plugins-0.4.15-fPIC.patch URL: http://plugin.org.uk/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -16,9 +17,6 @@ Obsoletes: %{pkgname} < 0.4.15-5 Provides: %{pkgname} = %{version}-%{release} -Requires(post): policycoreutils -Requires(postun): policycoreutils - %description A set of audio plugins for LADSPA (see http://plugin.org.uk/ for more details). @@ -26,6 +24,7 @@ %prep %setup -q -n %{pkgname}-%{version} %patch0 -p0 +%patch1 -p0 %build CFLAGS="$RPM_OPT_FLAGS" %configure --disable-static @@ -36,18 +35,6 @@ %{__make} DESTDIR=%{buildroot} install %find_lang %{pkgname} -%post -# Set SELinux file context in the policy -semanage fcontext -f -- -a -t textrel_shlib_t '%{_libdir}/ladspa/sc4m_1916.so' 2>/dev/null || : -# Actually change the context -chcon -R -t textrel_shlib_t %{_libdir}/ladspa/sc4m_1916.so || : - -%postun -# SELinux support -if [ $1 -eq 0 ]; then # final removal - semanage fcontext -f -- -d -t textrel_shlib_t %{_libdir}/ladspa/sc4m_1916.so || : -fi - %clean %{__rm} -rf %{buildroot} @@ -58,6 +45,10 @@ %{_datadir}/ladspa/rdf/* %changelog +* Sat Feb 03 2007 Anthony Green 0.4.15-7 +- Remove SELinux bits and compile with fPIC instead. + See bugzilla 225060 and %%patch1. + * Sat Jan 06 2007 Anthony Green 0.4.15-6 - Add SELinux bits for sc4m_1916.so. - Add policycoreutils dependencies. From fedora-extras-commits at redhat.com Sat Feb 3 22:24:51 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 3 Feb 2007 17:24:51 -0500 Subject: rpms/kpolynome import.log,1.6,1.7 Message-ID: <200702032224.l13MOp4A032203@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/kpolynome In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32165 Modified Files: import.log Log Message: auto-import kpolynome-0.1.2-9 on branch devel from kpolynome-0.1.2-9.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/kpolynome/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 3 Feb 2007 20:24:19 -0000 1.6 +++ import.log 3 Feb 2007 22:24:18 -0000 1.7 @@ -3,3 +3,4 @@ kpolynome-0_1_2-8:FC-5:kpolynome-0.1.2-8.src.rpm:1170533412 kpolynome-0_1_2-8:FC-6:kpolynome-0.1.2-8.src.rpm:1170534079 kpolynome-0_1_2-8:HEAD:kpolynome-0.1.2-8.src.rpm:1170534286 +kpolynome-0_1_2-9:HEAD:kpolynome-0.1.2-9.src.rpm:1170541485 From fedora-extras-commits at redhat.com Sat Feb 3 22:24:53 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 3 Feb 2007 17:24:53 -0500 Subject: rpms/kpolynome/devel kpolynome-0.1.2-autotools.patch, NONE, 1.1 kpolynome.spec, 1.3, 1.4 Message-ID: <200702032224.l13MOrOC032206@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/kpolynome/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32165/devel Modified Files: kpolynome.spec Added Files: kpolynome-0.1.2-autotools.patch Log Message: auto-import kpolynome-0.1.2-9 on branch devel from kpolynome-0.1.2-9.src.rpm kpolynome-0.1.2-autotools.patch: --- NEW FILE kpolynome-0.1.2-autotools.patch --- --- admin/cvs.sh 2005-04-06 22:51:55.000000000 +0200 +++ cvs.sh 2007-02-03 22:26:20.000000000 +0100 @@ -32,7 +32,7 @@ required_autoconf_version="2.53 or newer" AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1` case $AUTOCONF_VERSION in - Autoconf*2.5* | autoconf*2.5* ) : ;; + Autoconf*2.6* | autoconf*2.6* ) : ;; "" ) echo "*** AUTOCONF NOT FOUND!." echo "*** KDE requires autoconf $required_autoconf_version" @@ -44,10 +44,10 @@ exit 1 ;; esac - + AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1` case $AUTOHEADER_VERSION in - Autoconf*2.5* | autoheader*2.5* ) : ;; + Autoconf*2.6* | autoheader*2.6* ) : ;; "" ) echo "*** AUTOHEADER NOT FOUND!." echo "*** KDE requires autoheader $required_autoconf_version" @@ -70,7 +70,7 @@ echo "*** KDE requires automake $required_automake_version" exit 1 ;; - automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*) : ;; + automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*) : ;; "" ) echo "*** AUTOMAKE NOT FOUND!." echo "*** KDE requires automake $required_automake_version" @@ -93,7 +93,7 @@ cvs() { check_autotool_versions -acinclude_m4 +acinclude_m4 ### Make new subdirs and configure.in. ### The make calls could be optimized away here, @@ -105,7 +105,7 @@ if test -r Makefile.am.in; then echo "*** Creating Makefile.am" - if grep '\$(top_srcdir)/Makefile.am:' $makefile_am >/dev/null; then + if grep '\$(top_srcdir)/Makefile.am:' $makefile_am >/dev/null; then strip_makefile $MAKE -f $makefile_wo top_srcdir=. ./Makefile.am || exit 1 else @@ -114,7 +114,7 @@ fi configure_files echo "*** Creating configure.in" - if grep '\$(top_srcdir)/configure.in:' $makefile_am >/dev/null; then + if grep '\$(top_srcdir)/configure.in:' $makefile_am >/dev/null; then strip_makefile $MAKE -f $makefile_wo top_srcdir=. ./configure.in || exit 1 else @@ -166,7 +166,7 @@ create_subdirs if test -r Makefile.am.in; then - if grep '\$(top_srcdir)/Makefile.am:' $makefile_am >/dev/null; then + if grep '\$(top_srcdir)/Makefile.am:' $makefile_am >/dev/null; then strip_makefile $MAKE -f $makefile_wo top_srcdir=. ./Makefile.am || exit 1 else @@ -174,7 +174,7 @@ fi fi configure_files - if grep '\$(top_srcdir)/configure.in:' $makefile_am >/dev/null; then + if grep '\$(top_srcdir)/configure.in:' $makefile_am >/dev/null; then strip_makefile $MAKE -f $makefile_wo top_srcdir=. ./configure.in || exit 1 else @@ -237,7 +237,7 @@ test -f configure.files || { echo "need configure.files for configure.in"; exit 1; } list=`fgrep -v "configure.in.bot" < configure.files | fgrep -v "configure.in.mid"` : > configure.in.new -for file in $list; do +for file in $list; do echo "dnl =======================================================" >> configure.in.new echo "dnl FILE: $file" >> configure.in.new echo "dnl =======================================================" >> configure.in.new @@ -271,7 +271,7 @@ done fi -for topleveldir in $topleveldirs; do +for topleveldir in $topleveldirs; do if test -f $topleveldir/configure.in; then continue fi @@ -288,7 +288,7 @@ files=`cat configure.files` list=`egrep '^dnl AC_OUTPUT\(.*\)' $files | sed -e "s#^.*dnl AC_OUTPUT(\(.*\))#\1#"` -for file in $list; do +for file in $list; do echo "AC_CONFIG_FILES([ $file ])" >> configure.in.new done @@ -315,10 +315,10 @@ VERSION="\"3.4.0\"" fi if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then - modulename=`pwd`; + modulename=`pwd`; modulename=`basename $modulename` esc_VERSION=`echo $VERSION | sed -e "s#[^.0-9a-zA-Z]##g"` - modulename=`echo $modulename | sed -e "s#-$esc_VERSION##"` + modulename=`echo $modulename | sed -e "s#-$esc_VERSION##"` fi if test -n "$kde_use_qt_param"; then @@ -371,7 +371,7 @@ create_subdirs() { -if grep '\$(top_srcdir)/subdirs:' $makefile_am >/dev/null; then +if grep '\$(top_srcdir)/subdirs:' $makefile_am >/dev/null; then # as many modules contain rules to create subdirs without any # dependencies make won't create it unless there is no file. # so we check if that's a dummy rule or one that works @@ -383,7 +383,7 @@ $MAKE -f $makefile_wo top_srcdir=. ./subdirs || exit 1 if test -f subdirs.cvs.sh.$$; then if test -s subdirs; then - rm subdirs.cvs.sh.$$ + rm subdirs.cvs.sh.$$ else mv subdirs.cvs.sh.$$ subdirs fi @@ -420,7 +420,7 @@ echo $d >> ./_SUBDIRS done -(for d in $dirs; do +(for d in $dirs; do list=`sed -ne "s#^COMPILE_BEFORE_$d""[ ]*=[ ]*##p" $makefile_am | head -n 1` for s in $list; do echo $s $d @@ -467,7 +467,7 @@ adds=`ls -d -1 $adds 2>/dev/null` fgrep -v '$(top_srcdir)/acinclude.m4:' Makefile.am.in > Makefile.am.in.adds str='$(top_srcdir)/acinclude.m4:' - for add in $adds; do + for add in $adds; do str="$str \$(top_srcdir)/$add" done echo $str >> Makefile.am.in.adds @@ -487,7 +487,7 @@ { echo "*** Creating acinclude.m4" adds= - if grep '\$(top_srcdir)/acinclude.m4:' $makefile_am >/dev/null; then + if grep '\$(top_srcdir)/acinclude.m4:' $makefile_am >/dev/null; then strip_makefile rm -f acinclude.m4 adds=`grep '\$(top_srcdir)/acinclude.m4:' $makefile_wo | sed -e 's,^[^:]*: *,,; s,\$(top_srcdir),.,g'` Index: kpolynome.spec =================================================================== RCS file: /cvs/extras/rpms/kpolynome/devel/kpolynome.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kpolynome.spec 3 Feb 2007 20:24:22 -0000 1.3 +++ kpolynome.spec 3 Feb 2007 22:24:21 -0000 1.4 @@ -1,7 +1,7 @@ Name: kpolynome #Version 0.1-2 second upstream release Version: 0.1.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A polynome calculation program for KDE License: GPL @@ -9,6 +9,7 @@ URL: http://sourceforge.net/projects/%{name} Source: http://sourceforge.net/projects/%{name}/%{name}-0.1-2.tar.gz Patch0: kpolynome-0.1-2-desktop.patch +Patch1: %{name}-%{version}-autotools.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: automake, kdelibs-devel, desktop-file-utils @@ -21,6 +22,13 @@ %prep %setup -q -n %{name}-0.1 +# fix for autoconf >= 2.6 & automake >= 2.10 on admin/cvs.sh +%if "%{?fedora}" > "6" +%patch1 -p0 -b .autotools +%endif + +%{__make} -f admin/Makefile.common cvs + %patch0 -p0 -b %{name}.desktop %build @@ -70,6 +78,9 @@ %{_datadir}/icons/hicolor/??x??/apps/%{name}.png %Changelog +* Sat Feb 03 2007 Chitlesh Goorah - 0.1.2-9 +- Rebuild for FC-7 devel with autotools patched + * Sat Feb 03 2007 Chitlesh Goorah - 0.1.2-8 - rebuilt and fixed duplicates in the kmenu From fedora-extras-commits at redhat.com Sat Feb 3 22:29:12 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 3 Feb 2007 17:29:12 -0500 Subject: rpms/katapult import.log,1.10,1.11 Message-ID: <200702032229.l13MTCYR032415@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/katapult In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32383 Modified Files: import.log Log Message: auto-import katapult-0.3.1.4-4 on branch FC-5 from katapult-0.3.1.4-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/katapult/import.log,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- import.log 5 Nov 2006 13:18:27 -0000 1.10 +++ import.log 3 Feb 2007 22:28:40 -0000 1.11 @@ -7,3 +7,4 @@ katapult-0_3_1_4-3:FC-5:katapult-0.3.1.4-3.src.rpm:1162732144 katapult-0_3_1_4-3:FC-6:katapult-0.3.1.4-3.src.rpm:1162732830 katapult-0_3_1_4-3:HEAD:katapult-0.3.1.4-3.src.rpm:1162732958 +katapult-0_3_1_4-4:FC-5:katapult-0.3.1.4-4.src.rpm:1170541746 From fedora-extras-commits at redhat.com Sat Feb 3 22:29:14 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 3 Feb 2007 17:29:14 -0500 Subject: rpms/katapult/FC-5 katapult.spec,1.4,1.5 Message-ID: <200702032229.l13MTEN4032418@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/katapult/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32383/FC-5 Modified Files: katapult.spec Log Message: auto-import katapult-0.3.1.4-4 on branch FC-5 from katapult-0.3.1.4-4.src.rpm Index: katapult.spec =================================================================== RCS file: /cvs/extras/rpms/katapult/FC-5/katapult.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- katapult.spec 5 Nov 2006 13:05:00 -0000 1.4 +++ katapult.spec 3 Feb 2007 22:28:42 -0000 1.5 @@ -2,12 +2,12 @@ Name: katapult Version: 0.3.1.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Faster access to applications, bookmarks, and other items License: GPL Group: User Interface/Desktops -URL: http://www.thekatapult.org.uk/ +URL: http://sourceforge.net/projects/katapult Source0: http://prdownloads.sourceforge.net/%{name}/%{name}_%{version}.orig.tar.gz @@ -33,13 +33,14 @@ %{__make} DESTDIR=%{buildroot} install desktop-file-install --vendor fedora \ - --add-category X-Fedora \ - --add-category System \ - --delete-original \ + --add-category X-Fedora \ + --add-category System \ + --remove-category System \ + --delete-original \ --dir %{buildroot}%{_datadir}/applications/ \ %{buildroot}%{_datadir}/applications/kde/%{name}.desktop -%{__rm} -f %{buildroot}%{_libdir}/*.la +%{__rm} -f %{buildroot}%{_libdir}/lib%{name}.la %find_lang %{name} @@ -72,10 +73,13 @@ %{_icondir}/hicolor/??x??/apps/%{name}.png %{_icondir}/hicolor/scalable/apps/%{name}.svgz %{_libdir}/kde3/* -%{_libdir}/lib%{name}.so* +%{_libdir}/lib%{name}.* %Changelog +* Sat Feb 03 2007 Chitlesh Goorah - 0.3.1.4-4 +- fixed multiple entries on kmenu + * Sat Nov 04 2006 Chitlesh Goorah - 0.3.1.4-3 - Added gettext as BR instead of intltool From fedora-extras-commits at redhat.com Sat Feb 3 22:30:30 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 3 Feb 2007 17:30:30 -0500 Subject: rpms/katapult import.log,1.11,1.12 Message-ID: <200702032230.l13MUUA9032592@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/katapult In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32544 Modified Files: import.log Log Message: auto-import katapult-0.3.1.4-4 on branch FC-6 from katapult-0.3.1.4-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/katapult/import.log,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- import.log 3 Feb 2007 22:28:40 -0000 1.11 +++ import.log 3 Feb 2007 22:29:58 -0000 1.12 @@ -8,3 +8,4 @@ katapult-0_3_1_4-3:FC-6:katapult-0.3.1.4-3.src.rpm:1162732830 katapult-0_3_1_4-3:HEAD:katapult-0.3.1.4-3.src.rpm:1162732958 katapult-0_3_1_4-4:FC-5:katapult-0.3.1.4-4.src.rpm:1170541746 +katapult-0_3_1_4-4:FC-6:katapult-0.3.1.4-4.src.rpm:1170541824 From fedora-extras-commits at redhat.com Sat Feb 3 22:30:33 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 3 Feb 2007 17:30:33 -0500 Subject: rpms/katapult/FC-6 katapult.spec,1.4,1.5 Message-ID: <200702032230.l13MUX2f032595@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/katapult/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32544/FC-6 Modified Files: katapult.spec Log Message: auto-import katapult-0.3.1.4-4 on branch FC-6 from katapult-0.3.1.4-4.src.rpm Index: katapult.spec =================================================================== RCS file: /cvs/extras/rpms/katapult/FC-6/katapult.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- katapult.spec 5 Nov 2006 13:16:18 -0000 1.4 +++ katapult.spec 3 Feb 2007 22:30:00 -0000 1.5 @@ -2,12 +2,12 @@ Name: katapult Version: 0.3.1.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Faster access to applications, bookmarks, and other items License: GPL Group: User Interface/Desktops -URL: http://www.thekatapult.org.uk/ +URL: http://sourceforge.net/projects/katapult Source0: http://prdownloads.sourceforge.net/%{name}/%{name}_%{version}.orig.tar.gz @@ -33,13 +33,14 @@ %{__make} DESTDIR=%{buildroot} install desktop-file-install --vendor fedora \ - --add-category X-Fedora \ - --add-category System \ - --delete-original \ + --add-category X-Fedora \ + --add-category System \ + --remove-category System \ + --delete-original \ --dir %{buildroot}%{_datadir}/applications/ \ %{buildroot}%{_datadir}/applications/kde/%{name}.desktop -%{__rm} -f %{buildroot}%{_libdir}/*.la +%{__rm} -f %{buildroot}%{_libdir}/lib%{name}.la %find_lang %{name} @@ -72,10 +73,13 @@ %{_icondir}/hicolor/??x??/apps/%{name}.png %{_icondir}/hicolor/scalable/apps/%{name}.svgz %{_libdir}/kde3/* -%{_libdir}/lib%{name}.so* +%{_libdir}/lib%{name}.* %Changelog +* Sat Feb 03 2007 Chitlesh Goorah - 0.3.1.4-4 +- fixed multiple entries on kmenu + * Sat Nov 04 2006 Chitlesh Goorah - 0.3.1.4-3 - Added gettext as BR instead of intltool From fedora-extras-commits at redhat.com Sat Feb 3 22:31:19 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Sat, 3 Feb 2007 17:31:19 -0500 Subject: rpms/wibble - New directory Message-ID: <200702032231.l13MVJeA032658@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/wibble In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32653/wibble Log Message: Directory /cvs/extras/rpms/wibble added to the repository From fedora-extras-commits at redhat.com Sat Feb 3 22:31:26 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Sat, 3 Feb 2007 17:31:26 -0500 Subject: rpms/wibble/devel - New directory Message-ID: <200702032231.l13MVQG5032672@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/wibble/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32653/wibble/devel Log Message: Directory /cvs/extras/rpms/wibble/devel added to the repository From fedora-extras-commits at redhat.com Sat Feb 3 22:32:42 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 3 Feb 2007 17:32:42 -0500 Subject: rpms/katapult import.log,1.12,1.13 Message-ID: <200702032232.l13MWgIe000342@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/katapult In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32757 Modified Files: import.log Log Message: auto-import katapult-0.3.1.4-4 on branch devel from katapult-0.3.1.4-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/katapult/import.log,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- import.log 3 Feb 2007 22:29:58 -0000 1.12 +++ import.log 3 Feb 2007 22:32:10 -0000 1.13 @@ -9,3 +9,4 @@ katapult-0_3_1_4-3:HEAD:katapult-0.3.1.4-3.src.rpm:1162732958 katapult-0_3_1_4-4:FC-5:katapult-0.3.1.4-4.src.rpm:1170541746 katapult-0_3_1_4-4:FC-6:katapult-0.3.1.4-4.src.rpm:1170541824 +katapult-0_3_1_4-4:HEAD:katapult-0.3.1.4-4.src.rpm:1170541957 From fedora-extras-commits at redhat.com Sat Feb 3 22:32:44 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 3 Feb 2007 17:32:44 -0500 Subject: rpms/katapult/devel katapult.spec,1.4,1.5 Message-ID: <200702032232.l13MWi3a000345@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/katapult/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32757/devel Modified Files: katapult.spec Log Message: auto-import katapult-0.3.1.4-4 on branch devel from katapult-0.3.1.4-4.src.rpm Index: katapult.spec =================================================================== RCS file: /cvs/extras/rpms/katapult/devel/katapult.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- katapult.spec 5 Nov 2006 13:18:27 -0000 1.4 +++ katapult.spec 3 Feb 2007 22:32:12 -0000 1.5 @@ -2,12 +2,12 @@ Name: katapult Version: 0.3.1.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Faster access to applications, bookmarks, and other items License: GPL Group: User Interface/Desktops -URL: http://www.thekatapult.org.uk/ +URL: http://sourceforge.net/projects/katapult Source0: http://prdownloads.sourceforge.net/%{name}/%{name}_%{version}.orig.tar.gz @@ -33,13 +33,14 @@ %{__make} DESTDIR=%{buildroot} install desktop-file-install --vendor fedora \ - --add-category X-Fedora \ - --add-category System \ - --delete-original \ + --add-category X-Fedora \ + --add-category System \ + --remove-category System \ + --delete-original \ --dir %{buildroot}%{_datadir}/applications/ \ %{buildroot}%{_datadir}/applications/kde/%{name}.desktop -%{__rm} -f %{buildroot}%{_libdir}/*.la +%{__rm} -f %{buildroot}%{_libdir}/lib%{name}.la %find_lang %{name} @@ -72,10 +73,13 @@ %{_icondir}/hicolor/??x??/apps/%{name}.png %{_icondir}/hicolor/scalable/apps/%{name}.svgz %{_libdir}/kde3/* -%{_libdir}/lib%{name}.so* +%{_libdir}/lib%{name}.* %Changelog +* Sat Feb 03 2007 Chitlesh Goorah - 0.3.1.4-4 +- fixed multiple entries on kmenu + * Sat Nov 04 2006 Chitlesh Goorah - 0.3.1.4-3 - Added gettext as BR instead of intltool From fedora-extras-commits at redhat.com Sat Feb 3 22:40:32 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 3 Feb 2007 17:40:32 -0500 Subject: rpms/kdmtheme import.log,1.6,1.7 Message-ID: <200702032240.l13MeWNu000748@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/kdmtheme In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv705 Modified Files: import.log Log Message: auto-import kdmtheme-1.1.2-5 on branch FC-5 from kdmtheme-1.1.2-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/kdmtheme/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 3 Nov 2006 20:47:35 -0000 1.6 +++ import.log 3 Feb 2007 22:39:59 -0000 1.7 @@ -3,3 +3,4 @@ kdmtheme-1_1_2-4:FC-5:kdmtheme-1.1.2-4.src.rpm:1162586799 kdmtheme-1_1_2-4:FC-6:kdmtheme-1.1.2-4.src.rpm:1162586901 kdmtheme-1_1_2-4:HEAD:kdmtheme-1.1.2-4.src.rpm:1162587102 +kdmtheme-1_1_2-5:FC-5:kdmtheme-1.1.2-5.src.rpm:1170542424 From fedora-extras-commits at redhat.com Sat Feb 3 22:40:34 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 3 Feb 2007 17:40:34 -0500 Subject: rpms/kdmtheme/FC-5 kdmtheme.spec,1.2,1.3 Message-ID: <200702032240.l13MeYY3000751@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/kdmtheme/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv705/FC-5 Modified Files: kdmtheme.spec Log Message: auto-import kdmtheme-1.1.2-5 on branch FC-5 from kdmtheme-1.1.2-5.src.rpm Index: kdmtheme.spec =================================================================== RCS file: /cvs/extras/rpms/kdmtheme/FC-5/kdmtheme.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kdmtheme.spec 3 Nov 2006 20:42:31 -0000 1.2 +++ kdmtheme.spec 3 Feb 2007 22:40:02 -0000 1.3 @@ -1,6 +1,6 @@ Name: kdmtheme Version: 1.1.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Theme Manager for KDM License: GPL @@ -21,7 +21,10 @@ %prep %setup -q +%{__rm} -rf autom4te.cache + %build + %configure \ --enable-new-ldflags \ --disable-debug \ @@ -38,30 +41,22 @@ %{__rm} -f %{buildroot}%{_docdir}/HTML/en/%{name}/common ln -s ../common %{buildroot}%{_docdir}/HTML/en/%{name}/common -desktop-file-install --vendor fedora \ - --add-category X-Fedora \ - --add-category System \ - --delete-original \ - --dir %{buildroot}%{_datadir}/applications/ \ - %{buildroot}%{_datadir}/applications/kde/%{name}.desktop - -sed -i -e 's|Exec=kcmshell kdmtheme|Exec=kcmshell fedora-kdmtheme|' %{buildroot}%{_datadir}/applications/fedora-%{name}.desktop - -%{__rm} %{buildroot}%{_docdir}/HTML/*/%{name}/common - %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README -%{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/applications/kde/%{name}.desktop %{_libdir}/kde3/kcm_%{name}.la %{_libdir}/kde3/kcm_%{name}.so %{_docdir}/HTML/*/%{name}/ %Changelog +* Sat Feb 03 2007 Chitlesh Goorah - 1.1.2-5 +- Minors fixes + * Fri Nov 03 2006 Chitlesh Goorah - 1.1.2-4 - fixed proper kcmshell call From fedora-extras-commits at redhat.com Sat Feb 3 22:42:48 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 3 Feb 2007 17:42:48 -0500 Subject: rpms/kdmtheme/FC-6 kdmtheme.spec,1.3,1.4 Message-ID: <200702032242.l13MgmRh000856@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/kdmtheme/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv821/FC-6 Modified Files: kdmtheme.spec Log Message: auto-import kdmtheme-1.1.2-5 on branch FC-6 from kdmtheme-1.1.2-5.src.rpm Index: kdmtheme.spec =================================================================== RCS file: /cvs/extras/rpms/kdmtheme/FC-6/kdmtheme.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kdmtheme.spec 3 Nov 2006 20:44:24 -0000 1.3 +++ kdmtheme.spec 3 Feb 2007 22:42:16 -0000 1.4 @@ -1,6 +1,6 @@ Name: kdmtheme Version: 1.1.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Theme Manager for KDM License: GPL @@ -21,7 +21,10 @@ %prep %setup -q +%{__rm} -rf autom4te.cache + %build + %configure \ --enable-new-ldflags \ --disable-debug \ @@ -38,30 +41,22 @@ %{__rm} -f %{buildroot}%{_docdir}/HTML/en/%{name}/common ln -s ../common %{buildroot}%{_docdir}/HTML/en/%{name}/common -desktop-file-install --vendor fedora \ - --add-category X-Fedora \ - --add-category System \ - --delete-original \ - --dir %{buildroot}%{_datadir}/applications/ \ - %{buildroot}%{_datadir}/applications/kde/%{name}.desktop - -sed -i -e 's|Exec=kcmshell kdmtheme|Exec=kcmshell fedora-kdmtheme|' %{buildroot}%{_datadir}/applications/fedora-%{name}.desktop - -%{__rm} %{buildroot}%{_docdir}/HTML/*/%{name}/common - %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README -%{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/applications/kde/%{name}.desktop %{_libdir}/kde3/kcm_%{name}.la %{_libdir}/kde3/kcm_%{name}.so %{_docdir}/HTML/*/%{name}/ %Changelog +* Sat Feb 03 2007 Chitlesh Goorah - 1.1.2-5 +- Minors fixes + * Fri Nov 03 2006 Chitlesh Goorah - 1.1.2-4 - fixed proper kcmshell call From fedora-extras-commits at redhat.com Sat Feb 3 22:42:46 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 3 Feb 2007 17:42:46 -0500 Subject: rpms/kdmtheme import.log,1.7,1.8 Message-ID: <200702032242.l13MgkUu000853@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/kdmtheme In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv821 Modified Files: import.log Log Message: auto-import kdmtheme-1.1.2-5 on branch FC-6 from kdmtheme-1.1.2-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/kdmtheme/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 3 Feb 2007 22:39:59 -0000 1.7 +++ import.log 3 Feb 2007 22:42:13 -0000 1.8 @@ -4,3 +4,4 @@ kdmtheme-1_1_2-4:FC-6:kdmtheme-1.1.2-4.src.rpm:1162586901 kdmtheme-1_1_2-4:HEAD:kdmtheme-1.1.2-4.src.rpm:1162587102 kdmtheme-1_1_2-5:FC-5:kdmtheme-1.1.2-5.src.rpm:1170542424 +kdmtheme-1_1_2-5:FC-6:kdmtheme-1.1.2-5.src.rpm:1170542557 From fedora-extras-commits at redhat.com Sat Feb 3 22:44:59 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 3 Feb 2007 17:44:59 -0500 Subject: rpms/kdmtheme import.log,1.8,1.9 Message-ID: <200702032244.l13MixjL000949@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/kdmtheme In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv917 Modified Files: import.log Log Message: auto-import kdmtheme-1.1.2-5 on branch devel from kdmtheme-1.1.2-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/kdmtheme/import.log,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- import.log 3 Feb 2007 22:42:13 -0000 1.8 +++ import.log 3 Feb 2007 22:44:27 -0000 1.9 @@ -5,3 +5,4 @@ kdmtheme-1_1_2-4:HEAD:kdmtheme-1.1.2-4.src.rpm:1162587102 kdmtheme-1_1_2-5:FC-5:kdmtheme-1.1.2-5.src.rpm:1170542424 kdmtheme-1_1_2-5:FC-6:kdmtheme-1.1.2-5.src.rpm:1170542557 +kdmtheme-1_1_2-5:HEAD:kdmtheme-1.1.2-5.src.rpm:1170542693 From fedora-extras-commits at redhat.com Sat Feb 3 22:45:02 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 3 Feb 2007 17:45:02 -0500 Subject: rpms/kdmtheme/devel kdmtheme.spec,1.3,1.4 Message-ID: <200702032245.l13Mj2UI000954@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/kdmtheme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv917/devel Modified Files: kdmtheme.spec Log Message: auto-import kdmtheme-1.1.2-5 on branch devel from kdmtheme-1.1.2-5.src.rpm Index: kdmtheme.spec =================================================================== RCS file: /cvs/extras/rpms/kdmtheme/devel/kdmtheme.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kdmtheme.spec 3 Nov 2006 20:47:35 -0000 1.3 +++ kdmtheme.spec 3 Feb 2007 22:44:29 -0000 1.4 @@ -1,6 +1,6 @@ Name: kdmtheme Version: 1.1.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Theme Manager for KDM License: GPL @@ -21,7 +21,10 @@ %prep %setup -q +%{__rm} -rf autom4te.cache + %build + %configure \ --enable-new-ldflags \ --disable-debug \ @@ -38,30 +41,22 @@ %{__rm} -f %{buildroot}%{_docdir}/HTML/en/%{name}/common ln -s ../common %{buildroot}%{_docdir}/HTML/en/%{name}/common -desktop-file-install --vendor fedora \ - --add-category X-Fedora \ - --add-category System \ - --delete-original \ - --dir %{buildroot}%{_datadir}/applications/ \ - %{buildroot}%{_datadir}/applications/kde/%{name}.desktop - -sed -i -e 's|Exec=kcmshell kdmtheme|Exec=kcmshell fedora-kdmtheme|' %{buildroot}%{_datadir}/applications/fedora-%{name}.desktop - -%{__rm} %{buildroot}%{_docdir}/HTML/*/%{name}/common - %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README -%{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/applications/kde/%{name}.desktop %{_libdir}/kde3/kcm_%{name}.la %{_libdir}/kde3/kcm_%{name}.so %{_docdir}/HTML/*/%{name}/ %Changelog +* Sat Feb 03 2007 Chitlesh Goorah - 1.1.2-5 +- Minors fixes + * Fri Nov 03 2006 Chitlesh Goorah - 1.1.2-4 - fixed proper kcmshell call From fedora-extras-commits at redhat.com Sat Feb 3 23:08:34 2007 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 3 Feb 2007 18:08:34 -0500 Subject: rpms/kismet/devel kismet-2006-04-R1-alias.patch, 1.1, NONE kismet-2006-04-R1-alias1.patch, 1.1, NONE kismet-2006-04-R1-noret.patch, 1.1, NONE kismet-2006-04-R1-packed.patch, 1.1, NONE kismet-2006-04-R1-strop.patch, 1.1, NONE kismet-2006-04-R1-uninit.patch, 1.1, NONE kismet-2006-04-R1.tar.gz.asc, 1.1, NONE Message-ID: <200702032308.l13N8YES004670@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/kismet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4660 Removed Files: kismet-2006-04-R1-alias.patch kismet-2006-04-R1-alias1.patch kismet-2006-04-R1-noret.patch kismet-2006-04-R1-packed.patch kismet-2006-04-R1-strop.patch kismet-2006-04-R1-uninit.patch kismet-2006-04-R1.tar.gz.asc Log Message: removed, since already in upstream now --- kismet-2006-04-R1-alias.patch DELETED --- --- kismet-2006-04-R1-alias1.patch DELETED --- --- kismet-2006-04-R1-noret.patch DELETED --- --- kismet-2006-04-R1-packed.patch DELETED --- --- kismet-2006-04-R1-strop.patch DELETED --- --- kismet-2006-04-R1-uninit.patch DELETED --- --- kismet-2006-04-R1.tar.gz.asc DELETED --- From fedora-extras-commits at redhat.com Sat Feb 3 23:09:30 2007 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 3 Feb 2007 18:09:30 -0500 Subject: rpms/kismet/devel kismet-2007-01-R1-setgroups.patch,NONE,1.1 Message-ID: <200702032309.l13N9U6n004709@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/kismet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4700 Added Files: kismet-2007-01-R1-setgroups.patch Log Message: initial checkin kismet-2007-01-R1-setgroups.patch: --- NEW FILE kismet-2007-01-R1-setgroups.patch --- --- kismet-2007-01-R1b/kismet_server.cc.setgroups 2007-01-06 09:08:59.000000000 +0100 +++ kismet-2007-01-R1b/kismet_server.cc 2007-02-03 23:33:12.000000000 +0100 @@ -28,6 +28,7 @@ #include #include #include +#include #include #include @@ -2506,6 +2507,11 @@ exit(1); } + if (setgroups(0,0) < 0) { + fprintf(stderr, "FATAL: setgroups() failed: %m.\n"); + exit(1); + } + if (setuid(suid_id) < 0) { fprintf(stderr, "FATAL: setuid() to %s (%d) failed.\n", suid_user, suid_id); exit(1); --- kismet-2007-01-R1b/kismet_drone.cc.setgroups 2006-04-13 00:42:59.000000000 +0200 +++ kismet-2007-01-R1b/kismet_drone.cc 2007-02-03 23:35:45.000000000 +0100 @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -298,6 +299,7 @@ struct passwd *pwordent; const char *suid_user; uid_t suid_id, real_uid; + gid_t suid_gid; real_uid = getuid(); @@ -308,7 +310,8 @@ fprintf(stderr, " Make sure you have a valid user set for 'suiduser' in your config.\n"); exit(1); } else { - suid_id = pwordent->pw_uid; + suid_id = pwordent->pw_uid; + suid_gid = pwordent->pw_gid; if (suid_id == 0) { // If we're suiding to root... @@ -516,6 +519,16 @@ // logfiles as root if we can avoid it. Once we've dropped, we'll investigate our // sources again and open any defered #ifdef HAVE_SUID + if (setgid(suid_gid) < 0) { + fprintf(stderr, "FATAL: setgid() to %d failed: %m\n", suid_gid); + exit(1); + } + + if (setgroups(0,0) < 0) { + fprintf(stderr, "FATAL: setgroups() failed: %m\n"); + exit(1); + } + if (setuid(suid_id) < 0) { fprintf(stderr, "FATAL: setuid() to %s (%d) failed.\n", suid_user, suid_id); exit(1); From fedora-extras-commits at redhat.com Sat Feb 3 23:11:27 2007 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 3 Feb 2007 18:11:27 -0500 Subject: rpms/kismet/devel .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200702032311.l13NBRMG004786@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/kismet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4762 Modified Files: .cvsignore sources Log Message: version 2007-01-R1b Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kismet/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 29 Apr 2006 16:31:28 -0000 1.2 +++ .cvsignore 3 Feb 2007 23:10:54 -0000 1.3 @@ -1 +1,2 @@ -kismet-2006-04-R1.tar.gz +kismet-*.tar.gz +kismet-*.tar.gz.asc Index: sources =================================================================== RCS file: /cvs/extras/rpms/kismet/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 29 Apr 2006 16:31:28 -0000 1.2 +++ sources 3 Feb 2007 23:10:54 -0000 1.3 @@ -1 +1,2 @@ -8ec2de513f2911df1b7edfcba5ad1c26 kismet-2006-04-R1.tar.gz +a1dcea71f0c3f881ef72f5bca2db7b39 kismet-2007-01-R1b.tar.gz +0d4c55a4c1c69979e968fe85d373cf4a kismet-2007-01-R1b.tar.gz.asc From fedora-extras-commits at redhat.com Sat Feb 3 23:16:49 2007 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 3 Feb 2007 18:16:49 -0500 Subject: rpms/kismet/devel kismet.spec,1.6,1.7 Message-ID: <200702032316.l13NGnQm004847@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/kismet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4821 Modified Files: kismet.spec Log Message: - updated to 2007-01-R1b - removed most patches which were applied upstream - added -setgroups patch - added libpcap-devel BR; removed the glib-devel + bzip2-devel one - build with '-Wl,--as-needed' Index: kismet.spec =================================================================== RCS file: /cvs/extras/rpms/kismet/devel/kismet.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- kismet.spec 15 Sep 2006 06:35:39 -0000 1.6 +++ kismet.spec 3 Feb 2007 23:16:17 -0000 1.7 @@ -1,6 +1,6 @@ ## $Id$ -%global _version 2006-04-R1 +%global _version 2007-01-R1b ## Fedora Extras specific customization below... %bcond_without fedora @@ -20,7 +20,7 @@ Summary: WLAN detector, sniffer and IDS Name: kismet Version: %_rpmversion -Release: %release_func 4 +Release: %release_func 5 License: GPL Group: Applications/Internet URL: http://www.kismetwireless.net/ @@ -29,20 +29,14 @@ Source10: tmpwatch.kismet Source11: sysconfig.kismet Patch0: kismet-2005-08-R1-jobcontrol.patch -Patch1: kismet-2006-04-R1-packed.patch -Patch2: kismet-2006-04-R1-noret.patch -Patch3: kismet-2006-04-R1-uninit.patch -Patch4: kismet-2006-04-R1-alias.patch -Patch5: kismet-2006-04-R1-strop.patch -Patch6: kismet-2006-04-R1-alias1.patch Patch7: kismet-2006-04-R1-ssize.patch +Patch8: kismet-2007-01-R1-setgroups.patch BuildRoot: %_tmppath/%name-%version-%release-root BuildRequires: expat-devel ncurses-devel diffutils -BuildRequires: gmp-devel wget glib-devel +BuildRequires: gmp-devel wget libpcap-devel BuildRequires: ImageMagick-devel # should be required by ImageMagick-devel but are missing in FC4 BuildRequires: libtiff-devel libjpeg-devel freetype-devel -BuildRequires: bzip2-devel BuildRequires: fedora-usermgmt-devel Provides: user(%username) Provides: group(%username) @@ -83,13 +77,8 @@ %prep %setup -q -n %name-%_version %patch0 -p1 -b .jobcontrol -%patch1 -p1 -b .packed -%patch2 -p1 -b .noret -%patch3 -p1 -b .uninit -%patch4 -p1 -b .alias -%patch6 -p1 -b .alias1 -%patch5 -p1 -b .strop %patch7 -p1 -b .ssize +%patch8 -p1 -b .setgroups sed -e 's!/var/log/kismet!%logdir!g' %SOURCE10 >tmpwatch.kismet touch --reference=%SOURCE10 tmpwatch.kismet || : # keep timestamp @@ -108,8 +97,9 @@ %build -export ac_cv_header_linux_netlink_h=yes # we have netlink.h; just the check is buggy +#export ac_cv_header_linux_netlink_h=yes # we have netlink.h; just the check is buggy export ac_cv_lib_uClibcpp_main=no # we do not want to build against uClibc++, even when available +export LDFLAGS='-Wl,--as-needed' %configure --enable-ipv6 --sysconfdir=%cfgdir # HOME will be set to @srcdir@ which is disturbing distcc @@ -164,6 +154,13 @@ %changelog +* Sat Feb 3 2007 Enrico Scholz - 0.0.2007.01.R1b-5 +- updated to 2007-01-R1b +- removed most patches which were applied upstream +- added -setgroups patch +- added libpcap-devel BR; removed the glib-devel + bzip2-devel one +- build with '-Wl,--as-needed' + * Fri Sep 15 2006 Enrico Scholz - 0.0.2006.04.R1-4 - rebuilt From fedora-extras-commits at redhat.com Sat Feb 3 23:34:20 2007 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 3 Feb 2007 18:34:20 -0500 Subject: rpms/opencdk/devel sources,1.6,1.7 opencdk.spec,1.10,1.11 Message-ID: <200702032334.l13NYKOP005143@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/opencdk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5123/devel Modified Files: sources opencdk.spec Log Message: - updated to 0.5.13 - build with '-Wl,--as-needed' and removed superfluous libs from the opencdk-config tool Index: sources =================================================================== RCS file: /cvs/extras/rpms/opencdk/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 5 Nov 2006 20:29:21 -0000 1.6 +++ sources 3 Feb 2007 23:33:48 -0000 1.7 @@ -1,2 +1,2 @@ -de16f52a7f2215e3df9e81067ebae60d opencdk-0.5.11.tar.gz -6521460eb777c6fab25c71943e3b8d3e opencdk-0.5.11.tar.gz.sig +65324874074ba7c67028b93979e6d1d9 opencdk-0.5.13.tar.gz +fc8b34d300b89629491144726c846caf opencdk-0.5.13.tar.gz.sig Index: opencdk.spec =================================================================== RCS file: /cvs/extras/rpms/opencdk/devel/opencdk.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- opencdk.spec 5 Nov 2006 20:29:21 -0000 1.10 +++ opencdk.spec 3 Feb 2007 23:33:48 -0000 1.11 @@ -4,7 +4,7 @@ Summary: Provides basic parts of the OpenPGP message format Name: opencdk -Version: 0.5.11 +Version: 0.5.13 Release: %release_func 1 License: GPL @@ -50,10 +50,12 @@ %build %configure +sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool + make %{?_smp_mflags} -perl -pi -e 's!^(\S.*[\s"])-L/usr/lib([\s"])!\1\2!g; - s!^(\S.*[\s"])-I/usr/include([\s"])!\1\2!g' src/opencdk-config +sed -i -e 's!^\(opencdk_libs=\).*!\1-lopencdk!; + s!^\(opencdk_cflags=\).*!\1!' src/opencdk-config %check @@ -92,6 +94,11 @@ %changelog +* Sun Feb 4 2007 Enrico Scholz - 0.5.13-1 +- updated to 0.5.13 +- build with '-Wl,--as-needed' and removed superfluous libs from the + opencdk-config tool + * Sun Nov 5 2006 Enrico Scholz - 0.5.11-1 - updated to 0.5.11 - added pkgconfig file From fedora-extras-commits at redhat.com Sat Feb 3 23:36:07 2007 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 3 Feb 2007 18:36:07 -0500 Subject: rpms/opencdk/FC-6 sources,1.6,1.7 opencdk.spec,1.10,1.11 Message-ID: <200702032336.l13Na72E005227@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/opencdk/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5182/FC-6 Modified Files: sources opencdk.spec Log Message: updated to 0.5.13 Index: sources =================================================================== RCS file: /cvs/extras/rpms/opencdk/FC-6/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 5 Nov 2006 20:29:22 -0000 1.6 +++ sources 3 Feb 2007 23:35:34 -0000 1.7 @@ -1,2 +1,2 @@ -de16f52a7f2215e3df9e81067ebae60d opencdk-0.5.11.tar.gz -6521460eb777c6fab25c71943e3b8d3e opencdk-0.5.11.tar.gz.sig +65324874074ba7c67028b93979e6d1d9 opencdk-0.5.13.tar.gz +fc8b34d300b89629491144726c846caf opencdk-0.5.13.tar.gz.sig Index: opencdk.spec =================================================================== RCS file: /cvs/extras/rpms/opencdk/FC-6/opencdk.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- opencdk.spec 5 Nov 2006 20:29:22 -0000 1.10 +++ opencdk.spec 3 Feb 2007 23:35:34 -0000 1.11 @@ -4,7 +4,7 @@ Summary: Provides basic parts of the OpenPGP message format Name: opencdk -Version: 0.5.11 +Version: 0.5.13 Release: %release_func 1 License: GPL @@ -92,6 +92,9 @@ %changelog +* Sun Feb 4 2007 Enrico Scholz - 0.5.13-1 +- updated to 0.5.13 + * Sun Nov 5 2006 Enrico Scholz - 0.5.11-1 - updated to 0.5.11 - added pkgconfig file From fedora-extras-commits at redhat.com Sat Feb 3 23:36:09 2007 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 3 Feb 2007 18:36:09 -0500 Subject: rpms/opencdk/FC-5 sources,1.6,1.7 opencdk.spec,1.10,1.11 Message-ID: <200702032336.l13Na9l0005231@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/opencdk/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5182/FC-5 Modified Files: sources opencdk.spec Log Message: updated to 0.5.13 Index: sources =================================================================== RCS file: /cvs/extras/rpms/opencdk/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 5 Nov 2006 20:29:27 -0000 1.6 +++ sources 3 Feb 2007 23:35:37 -0000 1.7 @@ -1,2 +1,2 @@ -de16f52a7f2215e3df9e81067ebae60d opencdk-0.5.11.tar.gz -6521460eb777c6fab25c71943e3b8d3e opencdk-0.5.11.tar.gz.sig +65324874074ba7c67028b93979e6d1d9 opencdk-0.5.13.tar.gz +fc8b34d300b89629491144726c846caf opencdk-0.5.13.tar.gz.sig Index: opencdk.spec =================================================================== RCS file: /cvs/extras/rpms/opencdk/FC-5/opencdk.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- opencdk.spec 5 Nov 2006 20:29:27 -0000 1.10 +++ opencdk.spec 3 Feb 2007 23:35:37 -0000 1.11 @@ -4,7 +4,7 @@ Summary: Provides basic parts of the OpenPGP message format Name: opencdk -Version: 0.5.11 +Version: 0.5.13 Release: %release_func 1 License: GPL @@ -92,6 +92,9 @@ %changelog +* Sun Feb 4 2007 Enrico Scholz - 0.5.13-1 +- updated to 0.5.13 + * Sun Nov 5 2006 Enrico Scholz - 0.5.11-1 - updated to 0.5.11 - added pkgconfig file From fedora-extras-commits at redhat.com Sun Feb 4 00:02:09 2007 From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris)) Date: Sat, 3 Feb 2007 19:02:09 -0500 Subject: status-report-scripts pyGetReviewByFlags,NONE,1.1 Message-ID: <200702040002.l14029Hu008755@cvs-int.fedora.redhat.com> Author: c4chris Update of /cvs/fedora/status-report-scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8739 Added Files: pyGetReviewByFlags Log Message: Add pyGetReviewByFlags. ***** Error reading new file: [Errno 2] No such file or directory: 'pyGetReviewByFlags' From fedora-extras-commits at redhat.com Sun Feb 4 00:14:00 2007 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 3 Feb 2007 19:14:00 -0500 Subject: rpms/kismet/devel kismet-2007-01-R1-cast.patch, NONE, 1.1 kismet-2007-01-R1-printf.patch, NONE, 1.1 Message-ID: <200702040014.l140E0Eo008894@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/kismet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8883 Added Files: kismet-2007-01-R1-cast.patch kismet-2007-01-R1-printf.patch Log Message: initial checkin (extracted from old patches) kismet-2007-01-R1-cast.patch: --- NEW FILE kismet-2007-01-R1-cast.patch --- --- kismet-2007-01-R1b/gpsmap.cc.cast 2007-02-04 01:07:18.000000000 +0100 +++ kismet-2007-01-R1b/gpsmap.cc 2007-02-04 01:09:04.000000000 +0100 @@ -2242,12 +2242,8 @@ pthread_attr_destroy(&attr); // Now wait for the threads to complete and come back - int thread_status; - for (int t = 0; t < numthreads; t++) { - void *tmp; - pthread_join(mapthread[t], &tmp); - thread_status = reinterpret_cast(tmp); - } + for (int t = 0; t < numthreads; t++) + pthread_join(mapthread[t], 0); #else // Run one instance of our "thread". thread number 0, it should just crunch it all pargs = new powerline_arg; kismet-2007-01-R1-printf.patch: --- NEW FILE kismet-2007-01-R1-printf.patch --- --- kismet-2007-01-R1b/finitestate.cc.printf 2005-06-03 07:31:10.000000000 +0200 +++ kismet-2007-01-R1b/finitestate.cc 2007-02-04 00:52:52.000000000 +0100 @@ -224,8 +224,9 @@ snprintf(atext, STATUS_MAX, "Out-of-sequence BSS timestamp on %s " "- got %llx, expected %llx - this could indicate AP spoofing", - in_info->bssid_mac.Mac2String().c_str(), in_info->timestamp, - elem->bss_timestamp); + in_info->bssid_mac.Mac2String().c_str(), + static_cast(in_info->timestamp), + static_cast(elem->bss_timestamp)); atracker->RaiseAlert(alertid, in_info->bssid_mac, 0, 0, 0, in_info->channel, atext); --- kismet-2007-01-R1b/gpsmap.cc.printf 2007-02-04 00:48:01.000000000 +0100 +++ kismet-2007-01-R1b/gpsmap.cc 2007-02-04 00:58:27.000000000 +0100 @@ -1025,7 +1025,7 @@ // Sanitize the data and build the map of points we don't look at if (verbose) - fprintf(stderr, "NOTICE: Sanitizing %d sample points...\n", + fprintf(stderr, "NOTICE: Sanitizing %u sample points...\n", file_points.size()); SanitizeSamplePoints(file_points, &file_screen); @@ -2881,7 +2881,7 @@ // contents // Test the standard text in col1 - snprintf(text, 1024, "Visible networks: %d\n", drawn_net_map.size()); + snprintf(text, 1024, "Visible networks: %u\n", drawn_net_map.size()); text_colwidth = kismax(text_colwidth, IMStringWidth(text, leg_img, leg_di)); snprintf(text, 1024, "Map Created : %.24s", ctime((const time_t *) &curtime)); @@ -2972,7 +2972,7 @@ cur_rowpos += tx_height + 2; */ - snprintf(text, 1024, "Visible networks: %d\n", drawn_net_map.size()); + snprintf(text, 1024, "Visible networks: %u\n", drawn_net_map.size()); tx_height = IMStringHeight(text, leg_img, leg_di); snprintf(prim, 1024, "text %d,%d \"%s\"", @@ -4393,7 +4393,7 @@ gpsnetvec.push_back(x->second); } - fprintf(stderr, "Plotting %d networks...\n", gpsnetvec.size()); + fprintf(stderr, "Plotting %u networks...\n", gpsnetvec.size()); for (unsigned int x = 0; x < draw_feature_order.length(); x++) { switch (draw_feature_order[x]) { --- kismet-2007-01-R1b/server_protocols.cc.printf 2007-01-15 16:14:48.000000000 +0100 +++ kismet-2007-01-R1b/server_protocols.cc 2007-02-04 00:53:43.000000000 +0100 @@ -515,7 +515,7 @@ snprintf(tmpstr, 128, "%d", net->dupeiv_packets); data->ndvec.push_back(tmpstr); - snprintf(tmpstr, 128, "%lld", net->bss_timestamp); + snprintf(tmpstr, 128, "%lld", static_cast(net->bss_timestamp)); data->ndvec.push_back(tmpstr); } --- kismet-2007-01-R1b/tcpclient.cc.printf 2006-04-26 05:52:04.000000000 +0200 +++ kismet-2007-01-R1b/tcpclient.cc 2007-02-04 00:55:48.000000000 +0100 @@ -401,6 +401,7 @@ int tmpturbocell_mode; int tmpfirst_time; // HACK: should be some 64-bit type int tmplast_time; // HACK: should be some 64-bit type + long long int tmpbss_timestamp; scanned = sscanf(in_data+hdrlen+18, "%d \001%255[^\001]\001 " "\001%255[^\001]\001 " "%d %d %d %d %d %d %d %d %d %hd.%hd.%hd.%hd " @@ -423,12 +424,13 @@ &aggregate_points, &datasize, &turbocell_nid, &tmpturbocell_mode, &turbocell_sat, &carrier_set, &maxseenrate, - &encoding_set, &decrypted, &dupeiv_packets, &bss_timestamp); + &encoding_set, &decrypted, &dupeiv_packets, &tmpbss_timestamp); type = static_cast(tmptype); first_time = tmpfirst_time; last_time = tmplast_time; atype = static_cast(tmpatype); turbocell_mode = static_cast(tmpturbocell_mode); + bss_timestamp = tmpbss_timestamp; } if (scanned < 51) { --- kismet-2007-01-R1b/panelfront_display.cc.printf 2007-01-06 07:51:15.000000000 +0100 +++ kismet-2007-01-R1b/panelfront_display.cc 2007-02-04 00:57:13.000000000 +0100 @@ -1660,7 +1660,8 @@ // Added by Sven-Ola, may need le64_to_cpu()? Also added the bss_tsf // to the kismet tcp protocol used between client and server - snprintf(output, print_width, "BSS Time: %llx", dnet->bss_timestamp); + snprintf(output, print_width, "BSS Time: %llx", + static_cast(dnet->bss_timestamp)); kwin->text.push_back(output); if (dnet->maxseenrate != 0) { @@ -2612,7 +2613,7 @@ snprintf(output, print_width, "Start : %.24s", ctime((const time_t *) &start_time)); details_text.push_back(output); - snprintf(output, print_width, "Servers : %d", context_list.size()); + snprintf(output, print_width, "Servers : %u", context_list.size()); details_text.push_back(output); snprintf(output, print_width, "Networks: %d", num_networks); From fedora-extras-commits at redhat.com Sun Feb 4 00:15:03 2007 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 3 Feb 2007 19:15:03 -0500 Subject: rpms/kismet/devel kismet.spec,1.7,1.8 Message-ID: <200702040015.l140F354008936@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/kismet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8917 Modified Files: kismet.spec Log Message: added some old patches Index: kismet.spec =================================================================== RCS file: /cvs/extras/rpms/kismet/devel/kismet.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- kismet.spec 3 Feb 2007 23:16:17 -0000 1.7 +++ kismet.spec 4 Feb 2007 00:14:31 -0000 1.8 @@ -20,7 +20,7 @@ Summary: WLAN detector, sniffer and IDS Name: kismet Version: %_rpmversion -Release: %release_func 5 +Release: %release_func 6 License: GPL Group: Applications/Internet URL: http://www.kismetwireless.net/ @@ -31,6 +31,8 @@ Patch0: kismet-2005-08-R1-jobcontrol.patch Patch7: kismet-2006-04-R1-ssize.patch Patch8: kismet-2007-01-R1-setgroups.patch +Patch9: kismet-2007-01-R1-printf.patch +Patch10: kismet-2007-01-R1-cast.patch BuildRoot: %_tmppath/%name-%version-%release-root BuildRequires: expat-devel ncurses-devel diffutils BuildRequires: gmp-devel wget libpcap-devel @@ -76,9 +78,11 @@ %prep %setup -q -n %name-%_version -%patch0 -p1 -b .jobcontrol -%patch7 -p1 -b .ssize -%patch8 -p1 -b .setgroups +%patch0 -p1 -b .jobcontrol +%patch7 -p1 -b .ssize +%patch8 -p1 -b .setgroups +%patch9 -p1 -b .printf +%patch10 -p1 -b .cast sed -e 's!/var/log/kismet!%logdir!g' %SOURCE10 >tmpwatch.kismet touch --reference=%SOURCE10 tmpwatch.kismet || : # keep timestamp @@ -154,9 +158,10 @@ %changelog -* Sat Feb 3 2007 Enrico Scholz - 0.0.2007.01.R1b-5 +* Sat Feb 3 2007 Enrico Scholz - 0.0.2007.01.R1b-6 - updated to 2007-01-R1b -- removed most patches which were applied upstream +- removed most patches which were applied upstream; rediffed remaining + ones - added -setgroups patch - added libpcap-devel BR; removed the glib-devel + bzip2-devel one - build with '-Wl,--as-needed' From fedora-extras-commits at redhat.com Sun Feb 4 05:14:44 2007 From: fedora-extras-commits at redhat.com (Garrick Staples (garrick)) Date: Sun, 4 Feb 2007 00:14:44 -0500 Subject: rpms/torque/devel torque-2.1.6-show_buildindex_arg.patch, NONE, 1.1 torque.spec, 1.19, 1.20 Message-ID: <200702040514.l145EiIc027081@cvs-int.fedora.redhat.com> Author: garrick Update of /cvs/extras/rpms/torque/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27055 Modified Files: torque.spec Added Files: torque-2.1.6-show_buildindex_arg.patch Log Message: * Sat Feb 3 2007 Garrick Staples 2.1.6-3 - trying to resolve tcl8.5 buildindex issue torque-2.1.6-show_buildindex_arg.patch: --- NEW FILE torque-2.1.6-show_buildindex_arg.patch --- diff -pruN torque-2.1.6_orig/src/tools/xpbsmon/Makefile.in torque-2.1.6/src/tools/xpbsmon/Makefile.in --- torque-2.1.6_orig/src/tools/xpbsmon/Makefile.in 2006-10-02 19:27:27.000000000 -0700 +++ torque-2.1.6/src/tools/xpbsmon/Makefile.in 2007-02-03 20:42:04.000000000 -0800 @@ -417,7 +417,7 @@ buildindex: $(srcdir)/buildindex.src tclIndex: $(dist_xpbs_DATA) buildindex @echo Running buildindex \(locally\) - @./buildindex $(srcdir) . + ./buildindex $(srcdir) . install-data-hook: $(INSTALL_SCRIPT) buildindex $(DESTDIR)$(XPBSMON_DIR)/buildindex Index: torque.spec =================================================================== RCS file: /cvs/extras/rpms/torque/devel/torque.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- torque.spec 3 Feb 2007 05:35:30 -0000 1.19 +++ torque.spec 4 Feb 2007 05:14:12 -0000 1.20 @@ -3,7 +3,7 @@ %define name torque %define version 2.1.6 #%%define snap 200604251602 -%define release 2 +%define release 3 # The following options are supported: # --with server_name=hostname @@ -92,6 +92,7 @@ Source5: xpbsmon.png Source6: README-localhost Patch1: torque-2.1.0-remove-rpath.path +Patch2: torque-2.1.6-show_buildindex_arg.patch License: Freely redistributable (See PBS_License.txt) Group: System Environment/Daemons URL: http://www.clusterresources.com/products/torque/ @@ -121,6 +122,7 @@ %prep %setup -q -n torque-%{version}%{?snap:-snap.%snap} %patch1 -p1 +%patch2 -p1 %__install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} . @@ -403,6 +405,9 @@ %changelog +* Sat Feb 3 2007 Garrick Staples 2.1.6-3 +- trying to resolve tcl8.5 buildindex issue + * Fri Feb 2 2007 Garrick Staples 2.1.6-2 - rebuild for tcl8.5 From fedora-extras-commits at redhat.com Sun Feb 4 05:40:48 2007 From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard)) Date: Sun, 4 Feb 2007 00:40:48 -0500 Subject: rpms/nqc/FC-5 nqc-3.1.4-linux.patch,1.1,1.2 nqc.spec,1.1,1.2 Message-ID: <200702040540.l145em75027392@cvs-int.fedora.redhat.com> Author: rvinyard Update of /cvs/extras/rpms/nqc/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27330/FC-5 Modified Files: nqc-3.1.4-linux.patch nqc.spec Log Message: nqc-3.1.4-linux.patch: Index: nqc-3.1.4-linux.patch =================================================================== RCS file: /cvs/extras/rpms/nqc/FC-5/nqc-3.1.4-linux.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nqc-3.1.4-linux.patch 20 Aug 2006 19:08:00 -0000 1.1 +++ nqc-3.1.4-linux.patch 4 Feb 2007 05:40:16 -0000 1.2 @@ -34,8 +34,20 @@ { diff -P -r -U 5 nqc-3.1.r4.orig/Makefile nqc-3.1.r4/Makefile --- nqc-3.1.r4.orig/Makefile 2005-03-16 10:49:40.000000000 -0700 -+++ nqc-3.1.r4/Makefile 2006-08-19 17:50:54.000000000 -0600 -@@ -84,11 +84,11 @@ ++++ nqc-3.1.r4/Makefile 2007-02-03 20:22:17.000000000 -0700 +@@ -64,10 +64,11 @@ + MKDIR?=mkdir + MV?=mv -f + RM?=rm -f + + # CFLAGS ++CFLAGS = $(RPM_OPT_FLAGS) + #CFLAGS = -pipe -Iplatform -Ircxlib -Inqc -Icompiler -Wall -Wstrict-prototypes -Wmissing-prototypes + CFLAGS += -Iplatform -Ircxlib -Inqc -Icompiler -Wall + + USBOBJ = rcxlib/RCX_USBTowerPipe_none.o + +@@ -84,11 +85,11 @@ CXX = c++ else ifneq (,$(strip $(findstring $(OSTYPE), Linux))) Index: nqc.spec =================================================================== RCS file: /cvs/extras/rpms/nqc/FC-5/nqc.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nqc.spec 20 Aug 2006 19:08:00 -0000 1.1 +++ nqc.spec 4 Feb 2007 05:40:16 -0000 1.2 @@ -1,18 +1,18 @@ Name: nqc Version: 3.1.4 -Release: 2%{?dist} +Release: 6%{?dist} Summary: Not Quite C compiler Group: Development/Languages License: MPL URL: http://bricxcc.sourceforge.net/nqc/ Source0: http://bricxcc.sourceforge.net/nqc/release/nqc-3.1.r4.tgz -Source1: 60-legousbtower.rules +Source1: 60-legousbtower.rules Source2: http://bricxcc.sourceforge.net/nqc/doc/faq.html Source3: http://bricxcc.sourceforge.net/nqc/doc/NQC_Manual.pdf Source4: http://bricxcc.sourceforge.net/nqc/doc/NQC_Guide.pdf Patch0: nqc-3.1.4-linux.patch -BuildRequires: flex >= 2.5 +BuildRequires: flex >= 2.5 bison >= 2.0 Requires(pre): %{_sbindir}/groupadd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -64,6 +64,18 @@ %changelog +* Sat Feb 03 2007 Rick L Vinyard Jr - 3.1.4-6 +- Added RPM_OPTS to Makefile in patch + +* Sun Aug 27 2006 Rick L Vinyard Jr - 3.1.4-5 +- Readded BuildRequires for bison + +* Sun Aug 27 2006 Rick L Vinyard Jr - 3.1.4-4 +- Bump release for mass rebuild + +* Sun Aug 20 2006 Rick L Vinyard Jr - 3.1.4-3 +- Added BuildRequires for bison + * Sun Aug 20 2006 Rick L Vinyard Jr - 3.1.4-2 - Removed groupdel lego - Added faq, manual and guide docs From fedora-extras-commits at redhat.com Sun Feb 4 05:40:51 2007 From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard)) Date: Sun, 4 Feb 2007 00:40:51 -0500 Subject: rpms/nqc/FC-6 nqc-3.1.4-linux.patch,1.1,1.2 nqc.spec,1.5,1.6 Message-ID: <200702040540.l145epmc027398@cvs-int.fedora.redhat.com> Author: rvinyard Update of /cvs/extras/rpms/nqc/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27330/FC-6 Modified Files: nqc-3.1.4-linux.patch nqc.spec Log Message: nqc-3.1.4-linux.patch: Index: nqc-3.1.4-linux.patch =================================================================== RCS file: /cvs/extras/rpms/nqc/FC-6/nqc-3.1.4-linux.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nqc-3.1.4-linux.patch 20 Aug 2006 19:08:00 -0000 1.1 +++ nqc-3.1.4-linux.patch 4 Feb 2007 05:40:18 -0000 1.2 @@ -34,8 +34,20 @@ { diff -P -r -U 5 nqc-3.1.r4.orig/Makefile nqc-3.1.r4/Makefile --- nqc-3.1.r4.orig/Makefile 2005-03-16 10:49:40.000000000 -0700 -+++ nqc-3.1.r4/Makefile 2006-08-19 17:50:54.000000000 -0600 -@@ -84,11 +84,11 @@ ++++ nqc-3.1.r4/Makefile 2007-02-03 20:22:17.000000000 -0700 +@@ -64,10 +64,11 @@ + MKDIR?=mkdir + MV?=mv -f + RM?=rm -f + + # CFLAGS ++CFLAGS = $(RPM_OPT_FLAGS) + #CFLAGS = -pipe -Iplatform -Ircxlib -Inqc -Icompiler -Wall -Wstrict-prototypes -Wmissing-prototypes + CFLAGS += -Iplatform -Ircxlib -Inqc -Icompiler -Wall + + USBOBJ = rcxlib/RCX_USBTowerPipe_none.o + +@@ -84,11 +85,11 @@ CXX = c++ else ifneq (,$(strip $(findstring $(OSTYPE), Linux))) Index: nqc.spec =================================================================== RCS file: /cvs/extras/rpms/nqc/FC-6/nqc.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- nqc.spec 28 Aug 2006 02:16:21 -0000 1.5 +++ nqc.spec 4 Feb 2007 05:40:18 -0000 1.6 @@ -1,13 +1,13 @@ Name: nqc Version: 3.1.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Not Quite C compiler Group: Development/Languages License: MPL URL: http://bricxcc.sourceforge.net/nqc/ Source0: http://bricxcc.sourceforge.net/nqc/release/nqc-3.1.r4.tgz -Source1: 60-legousbtower.rules +Source1: 60-legousbtower.rules Source2: http://bricxcc.sourceforge.net/nqc/doc/faq.html Source3: http://bricxcc.sourceforge.net/nqc/doc/NQC_Manual.pdf Source4: http://bricxcc.sourceforge.net/nqc/doc/NQC_Guide.pdf @@ -64,6 +64,9 @@ %changelog +* Sat Feb 03 2007 Rick L Vinyard Jr - 3.1.4-6 +- Added RPM_OPTS to Makefile in patch + * Sun Aug 27 2006 Rick L Vinyard Jr - 3.1.4-5 - Readded BuildRequires for bison From fedora-extras-commits at redhat.com Sun Feb 4 05:40:53 2007 From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard)) Date: Sun, 4 Feb 2007 00:40:53 -0500 Subject: rpms/nqc/devel nqc-3.1.4-linux.patch,1.1,1.2 nqc.spec,1.5,1.6 Message-ID: <200702040540.l145erSe027402@cvs-int.fedora.redhat.com> Author: rvinyard Update of /cvs/extras/rpms/nqc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27330/devel Modified Files: nqc-3.1.4-linux.patch nqc.spec Log Message: nqc-3.1.4-linux.patch: Index: nqc-3.1.4-linux.patch =================================================================== RCS file: /cvs/extras/rpms/nqc/devel/nqc-3.1.4-linux.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nqc-3.1.4-linux.patch 20 Aug 2006 19:08:00 -0000 1.1 +++ nqc-3.1.4-linux.patch 4 Feb 2007 05:40:21 -0000 1.2 @@ -34,8 +34,20 @@ { diff -P -r -U 5 nqc-3.1.r4.orig/Makefile nqc-3.1.r4/Makefile --- nqc-3.1.r4.orig/Makefile 2005-03-16 10:49:40.000000000 -0700 -+++ nqc-3.1.r4/Makefile 2006-08-19 17:50:54.000000000 -0600 -@@ -84,11 +84,11 @@ ++++ nqc-3.1.r4/Makefile 2007-02-03 20:22:17.000000000 -0700 +@@ -64,10 +64,11 @@ + MKDIR?=mkdir + MV?=mv -f + RM?=rm -f + + # CFLAGS ++CFLAGS = $(RPM_OPT_FLAGS) + #CFLAGS = -pipe -Iplatform -Ircxlib -Inqc -Icompiler -Wall -Wstrict-prototypes -Wmissing-prototypes + CFLAGS += -Iplatform -Ircxlib -Inqc -Icompiler -Wall + + USBOBJ = rcxlib/RCX_USBTowerPipe_none.o + +@@ -84,11 +85,11 @@ CXX = c++ else ifneq (,$(strip $(findstring $(OSTYPE), Linux))) Index: nqc.spec =================================================================== RCS file: /cvs/extras/rpms/nqc/devel/nqc.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- nqc.spec 28 Aug 2006 02:16:21 -0000 1.5 +++ nqc.spec 4 Feb 2007 05:40:21 -0000 1.6 @@ -1,13 +1,13 @@ Name: nqc Version: 3.1.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Not Quite C compiler Group: Development/Languages License: MPL URL: http://bricxcc.sourceforge.net/nqc/ Source0: http://bricxcc.sourceforge.net/nqc/release/nqc-3.1.r4.tgz -Source1: 60-legousbtower.rules +Source1: 60-legousbtower.rules Source2: http://bricxcc.sourceforge.net/nqc/doc/faq.html Source3: http://bricxcc.sourceforge.net/nqc/doc/NQC_Manual.pdf Source4: http://bricxcc.sourceforge.net/nqc/doc/NQC_Guide.pdf @@ -64,6 +64,9 @@ %changelog +* Sat Feb 03 2007 Rick L Vinyard Jr - 3.1.4-6 +- Added RPM_OPTS to Makefile in patch + * Sun Aug 27 2006 Rick L Vinyard Jr - 3.1.4-5 - Readded BuildRequires for bison From fedora-extras-commits at redhat.com Sun Feb 4 11:13:34 2007 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 4 Feb 2007 06:13:34 -0500 Subject: rpms/kismet/devel kismet-2007-01-R1-printf.patch,1.1,1.2 Message-ID: <200702041113.l14BDYth005720@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/kismet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5694 Modified Files: kismet-2007-01-R1-printf.patch Log Message: use correct type modifiers for size_t kismet-2007-01-R1-printf.patch: Index: kismet-2007-01-R1-printf.patch =================================================================== RCS file: /cvs/extras/rpms/kismet/devel/kismet-2007-01-R1-printf.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kismet-2007-01-R1-printf.patch 4 Feb 2007 00:13:58 -0000 1.1 +++ kismet-2007-01-R1-printf.patch 4 Feb 2007 11:13:01 -0000 1.2 @@ -19,7 +19,7 @@ // Sanitize the data and build the map of points we don't look at if (verbose) - fprintf(stderr, "NOTICE: Sanitizing %d sample points...\n", -+ fprintf(stderr, "NOTICE: Sanitizing %u sample points...\n", ++ fprintf(stderr, "NOTICE: Sanitizing %zd sample points...\n", file_points.size()); SanitizeSamplePoints(file_points, &file_screen); @@ -28,7 +28,7 @@ // Test the standard text in col1 - snprintf(text, 1024, "Visible networks: %d\n", drawn_net_map.size()); -+ snprintf(text, 1024, "Visible networks: %u\n", drawn_net_map.size()); ++ snprintf(text, 1024, "Visible networks: %zd\n", drawn_net_map.size()); text_colwidth = kismax(text_colwidth, IMStringWidth(text, leg_img, leg_di)); snprintf(text, 1024, "Map Created : %.24s", ctime((const time_t *) &curtime)); @@ -37,7 +37,7 @@ */ - snprintf(text, 1024, "Visible networks: %d\n", drawn_net_map.size()); -+ snprintf(text, 1024, "Visible networks: %u\n", drawn_net_map.size()); ++ snprintf(text, 1024, "Visible networks: %zd\n", drawn_net_map.size()); tx_height = IMStringHeight(text, leg_img, leg_di); snprintf(prim, 1024, "text %d,%d \"%s\"", @@ -46,7 +46,7 @@ } - fprintf(stderr, "Plotting %d networks...\n", gpsnetvec.size()); -+ fprintf(stderr, "Plotting %u networks...\n", gpsnetvec.size()); ++ fprintf(stderr, "Plotting %zd networks...\n", gpsnetvec.size()); for (unsigned int x = 0; x < draw_feature_order.length(); x++) { switch (draw_feature_order[x]) { @@ -103,7 +103,7 @@ details_text.push_back(output); - snprintf(output, print_width, "Servers : %d", context_list.size()); -+ snprintf(output, print_width, "Servers : %u", context_list.size()); ++ snprintf(output, print_width, "Servers : %zd", context_list.size()); details_text.push_back(output); snprintf(output, print_width, "Networks: %d", num_networks); From fedora-extras-commits at redhat.com Sun Feb 4 11:18:00 2007 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 4 Feb 2007 06:18:00 -0500 Subject: rpms/kismet/devel kismet.spec,1.8,1.9 Message-ID: <200702041118.l14BI0xV005777@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/kismet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5754 Modified Files: kismet.spec Log Message: further x86_64 fixes for printf() format-string modifiers Index: kismet.spec =================================================================== RCS file: /cvs/extras/rpms/kismet/devel/kismet.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- kismet.spec 4 Feb 2007 00:14:31 -0000 1.8 +++ kismet.spec 4 Feb 2007 11:17:27 -0000 1.9 @@ -20,7 +20,7 @@ Summary: WLAN detector, sniffer and IDS Name: kismet Version: %_rpmversion -Release: %release_func 6 +Release: %release_func 7 License: GPL Group: Applications/Internet URL: http://www.kismetwireless.net/ @@ -158,6 +158,9 @@ %changelog +* Sun Feb 4 2007 Enrico Scholz - 0.0.2007.01.R1b-7 +- further x86_64 fixes for printf() format-string modifiers + * Sat Feb 3 2007 Enrico Scholz - 0.0.2007.01.R1b-6 - updated to 2007-01-R1b - removed most patches which were applied upstream; rediffed remaining From fedora-extras-commits at redhat.com Sun Feb 4 11:58:07 2007 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 4 Feb 2007 06:58:07 -0500 Subject: rpms/clamav/devel clamav-0.90rc3-private.patch, NONE, 1.1 clamav.spec, 1.46, 1.47 Message-ID: <200702041158.l14Bw7JE006116@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6077 Modified Files: clamav.spec Added Files: clamav-0.90rc3-private.patch Log Message: - build with -Wl,-as-needed and cleaned up pkgconfig file - removed old hack which forced installation of freshclam.conf; related check was removed upstream - removed static library - removed %%changelog entries from before 2004 clamav-0.90rc3-private.patch: --- NEW FILE clamav-0.90rc3-private.patch --- --- clamav-0.90rc3/libclamav.pc.in.private 2004-07-14 13:35:38.000000000 +0200 +++ clamav-0.90rc3/libclamav.pc.in 2007-02-04 12:24:35.000000000 +0100 @@ -6,6 +6,6 @@ Name: libclamav Description: A GPL virus scanner Version: @LIBCLAMAV_VERSION@ -Libs: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ -Cflags: -I${includedir} @CFLAGS@ - +Libs: -L${libdir} -lclamav +Libs.private: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ +Cflags: -I${includedir} --- clamav-0.90rc3/clamav-config.in.private 2004-06-06 03:50:08.000000000 +0200 +++ clamav-0.90rc3/clamav-config.in 2007-02-04 12:25:27.000000000 +0100 @@ -55,11 +55,11 @@ ;; --cflags) - echo -I at includedir@ @CFLAGS@ + echo -I at includedir@ ;; --libs) - echo -L at libdir@ @LIBCLAMAV_LIBS@ + echo -L at libdir@ -lclamav ;; *) Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- clamav.spec 3 Feb 2007 15:16:08 -0000 1.46 +++ clamav.spec 4 Feb 2007 11:57:35 -0000 1.47 @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.90 -Release: %release_func 0.2.rc3 +Release: %release_func 0.3.rc3 License: GPL Group: Applications/File @@ -38,6 +38,7 @@ Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch Patch23: clamav-0.88.4-visibility.patch +Patch24: clamav-0.90rc3-private.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -228,6 +229,7 @@ %patch21 -p1 -b .path %patch22 -p1 -b .initoff %patch23 -p1 -b .visibility +%patch24 -p1 -b .private perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.!g; s!^#?(LocalSocket ).*!\1/var/run/clamd./clamd.sock!g; @@ -243,15 +245,12 @@ %build CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" +export LDFLAGS='-Wl,--as-needed' +# HACK: remove me, when configure uses $LIBS instead of $LDFLAGS for milter check +export LIBS='-lmilter -lpthread' %configure --disable-clamav --with-dbdir=/var/lib/clamav \ - --enable-milter - -## HACK: ./configure checks if freshclam.conf/clamd.conf are existing -## in current filesystem and skips its installation then. Was introduced -## by 0.66. -perl -pi -e 's!^(s,\@INSTALL_(CLAMAV|FRESHCLAM)_CONF_TRUE\@),[^,]*,!\1,,!g; - s!^(s,\@INSTALL_(CLAMAV|FRESHCLAM)_CONF_FALSE\@),[^,]*,!\1,\#,!g' config.status -./config.status + --enable-milter --disable-static +sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool make %{?_smp_mflags} @@ -420,7 +419,6 @@ %files devel %defattr(-,root,root,-) %_includedir/* -%_libdir/*.*a %_libdir/*.so %pkgdatadir/template %pkgdatadir/clamd-gen @@ -511,6 +509,13 @@ %changelog +* Sun Feb 4 2007 Enrico Scholz - 0.90-0.3.rc3 +- build with -Wl,-as-needed and cleaned up pkgconfig file +- removed old hack which forced installation of freshclam.conf; related + check was removed upstream +- removed static library +- removed %%changelog entries from before 2004 + * Sat Feb 3 2007 Enrico Scholz - 0.90-0.2.rc3 - updated to 0.90rc3 - splitted mandatory parts from the data-file into a separate -filesystem @@ -799,83 +804,3 @@ * Mon Feb 9 2004 Enrico Scholz - 0:0.65-0.fdr.5 - added security fix for http://www.securityfocus.com/archive/1/353194/2004-02-06/2004-02-12/1 - -* Fri Nov 28 2003 Enrico Scholz - 0:0.65-0.fdr.4 -- fixed typo in README (sysconf.d vs. sysconf) -- make build on rhl8 succeed by adding '|| :' to %%check - -* Tue Nov 18 2003 Enrico Scholz - 0:0.65-0.fdr.3 -- substitute 'User' in sample cfg-file also -- uncommented some cfg-options which are needed for a proper operation -- fixed typos in README (thanks to Michael Schwendt) - -* Mon Nov 17 2003 Enrico Scholz - 0:0.65-0.fdr.2 -- fixed path of 'LocalSocket' and documented steps how to create it -- added a missing backslash at the configure-call -- do not package clamav-milter.8 manpage -- documented 'User' in the README - -* Sat Nov 15 2003 Enrico Scholz - 0:0.65-0.fdr.1 -- updated to 0.65 -- added gmp-devel buildrequires: -- changed installed databases from 'viruses.db*' to '*.cvb' -- made milter-build conditional; 0.65 is missing some files which would break the build else -- fixed typo (clamav-notify-server -> clamav-notify-servers) - -* Fri Oct 31 2003 Enrico Scholz - 0:0.60-0.fdr.5 -- created -update subpackage and filled it with files from main and -data package -- set more reasonable default-values in the sample config-file -- made the README in -server more clear -- moved clamav-milter man-page into -milter subpackage -- use fedora-usermgmt -- renamed -daemon subpackage and related files to -server -- use abstract 'data(clamav)' notation for clamav-data dependencies -- use 'init(...)' requirements as placeholder for future -sysv/-minit subpackages - -* Sat Aug 16 2003 Enrico Scholz 0:0.60-0.fdr.4 -- backported clamav-sockwrite.c to C89 - -* Fri Aug 15 2003 Enrico Scholz 0:0.60-0.fdr.3 -- updated Source0 URL -- fixed portuguese i18n-abbreviation - -* Fri Jul 18 2003 Enrico Scholz 0:0.60-0.fdr.3 -- use LSB compliant exit-codes in the init-script -- other init-script cleanups - -* Tue Jul 15 2003 Enrico Scholz 0:0.60-0.fdr.2 -- updated %%description -- removed README from %%doc-list - -* Thu Jun 26 2003 Enrico Scholz 0:0.60-0.fdr.1 -- disabled -milter subpackage; I do not get it to run :( - -* Thu Jun 26 2003 Enrico Scholz 0:0.60-0.fdr.0.1 -- updated to 0.60 -- modernized usercreation -- added -milter subpackage - -* Thu May 8 2003 Enrico Scholz 0:0.54-0.fdr.2 -- added BUGS file -- moved clamd.8 man-page into daemon-subpackage -- some cosmetical cleanups -- removed config-patch; it was unused -- made some paths more fedora-compliant -- honor $RPM_OPT_FLAGS -- added clamav-notify-daemons script -- removed obsoleted %%socketdir - -* Wed May 7 2003 Enrico Scholz 0:0.54-0.fdr.0.1 -- splitted into additional -data/-daemon packages -- added clamav-sockwrite program -- updated to recent fedora policies - -* Thu Nov 21 2002 Enrico Scholz 0.54-1 -- updated to 0.54 -- updated config-patch - -* Tue Oct 29 2002 Enrico Scholz 0.52-1 -- updated to 0.52 - -* Tue Sep 17 2002 Enrico Scholz -- Initial build. From fedora-extras-commits at redhat.com Sun Feb 4 12:52:07 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sun, 4 Feb 2007 07:52:07 -0500 Subject: rpms/liborigin/devel Makefile,NONE,1.1 Message-ID: <200702041252.l14Cq7DP009838@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/liborigin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9831 Added Files: Makefile Log Message: ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' From fedora-extras-commits at redhat.com Sun Feb 4 12:53:50 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sun, 4 Feb 2007 07:53:50 -0500 Subject: rpms/liborigin/devel liborigin.spec,NONE,1.1 sources,NONE,1.1 Message-ID: <200702041253.l14Cro4a009902@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/liborigin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9895/devel Added Files: liborigin.spec sources Log Message: auto-import liborigin-20070115-3 on branch devel from liborigin-20070115-3.src.rpm --- NEW FILE liborigin.spec --- Name: liborigin Version: 20070115 Release: 3%{?dist} Summary: Library for reading OriginLab OPJ project files License: GPL Group: Development/Libraries URL: http://sourceforge.net/projects/%{name}/ Source: http://belnet.dl.sourceforge.net/sourceforge/liborigin/%{name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig %description A library for reading OriginLab OPJ project files. %package devel Summary: Header files, libraries and development documentation for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel This package contains the header files, static libraries and development documentation for %{name}. If you like to develop programs using %{name}, you will need to install %{name}-devel. %prep %setup -q sed -i "s|chmod ugo-x|chmod ugo+x|" Makefile.LINUX sed -i "s|.so.0.0.0|.so.0.0.1|" Makefile.LINUX sed -i "s|= -pipe|= -pipe $RPM_OPT_FLAGS|" Makefile.LINUX %build # fix for hardcoded path of %{_libdir} %ifarch x86_64 sparc64 ppc64 amd64 sed -i "s|/usr/lib|/usr/lib64|" Makefile.LINUX %endif %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} %{__make} INSTALL="install -p" DESTDIR=%{buildroot} install %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root,-) %doc COPYING README %{_bindir}/opj2dat %{_libdir}/%{name}.so.0* %files devel %defattr(-,root,root,-) %{_includedir}/%{name}/ %{_libdir}/%{name}.so %changelog * Tue Jan 30 2007 Chitlesh Goorah - 20070115-3 - Fix directory ownership for -devel package * Sat Jan 27 2007 Chitlesh Goorah - 20070115-2 - Added fix for hardcoded path of %%{_libdir} - Added $$RPM_OPT_FLAGS to Makefile.LINUX * Sat Jan 20 2007 Chitlesh Goorah - 20070115-1 - Initial package --- NEW FILE sources --- 5ed1c7c0955f935d3b4e45fb25e1d7fc liborigin-20070115.tgz From fedora-extras-commits at redhat.com Sun Feb 4 13:00:29 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sun, 4 Feb 2007 08:00:29 -0500 Subject: rpms/dolphin/devel Makefile,NONE,1.1 Message-ID: <200702041300.l14D0TpT010040@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/dolphin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10033 Added Files: Makefile Log Message: firstly add Makefile ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' From fedora-extras-commits at redhat.com Sun Feb 4 13:03:15 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sun, 4 Feb 2007 08:03:15 -0500 Subject: rpms/dolphin/devel dolphin.spec,NONE,1.1 sources,NONE,1.1 Message-ID: <200702041303.l14D3Fsr013428@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/dolphin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13417/devel Added Files: dolphin.spec sources Log Message: auto-import dolphin-0.8.1-1 on branch devel from dolphin-0.8.1-1.src.rpm --- NEW FILE dolphin.spec --- Name: dolphin Version: 0.8.1 Release: 1%{?dist} Summary: A file manager for KDE focusing on usability License: GPL Group: User Interface/Desktops URL: http://enzosworld.gmxhome.de/ Source: http://enzosworld.gmxhome.de/download/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs-devel BuildRequires: desktop-file-utils %description Dolphin focuses on being only a file manager. This approach allows to optimize the user interface for the task of file management. %prep %setup -q %build # dolphin-debuginfo script-without-shebang fix chmod -x src/sidebar.{cpp,h} %configure --disable-rpath %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} %{__make} DESTDIR=%{buildroot} install desktop-file-install --vendor "" \ --delete-original \ --dir %{buildroot}%{_datadir}/applications/ \ %{buildroot}%{_datadir}/applications/kde/%{name}.desktop #%{__rm} -f %{buildroot}%{_datadir}/locale/%{name}/LC_MESSAGES/%{name}.mo ## File lists # locale's %find_lang %{name} || touch %{name}.lang # HTML (1.0) HTML_DIR=$(kde-config --expandvars --install html) if [ -d %{buildroot}$HTML_DIR ]; then for lang_dir in %{buildroot}$HTML_DIR/* ; do if [ -d $lang_dir ]; then lang=$(basename $lang_dir) echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang # replace absolute symlinks with relative ones pushd $lang_dir for i in *; do [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common done popd fi done fi %clean %{__rm} -rf %{buildroot} %post touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %postun touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING TODO %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/apps/%{name}/ %{_docdir}/HTML/en/%{name}/ %{_datadir}/icons/hicolor/128x128/apps/%{name}.png %{_datadir}/icons/hicolor/??x??/apps/%{name}.png %Changelog * Sun Jan 14 2007 Chitlesh Goorah - 0.8.1-1 - Initial package for Fedora Extras. --- NEW FILE sources --- 62f526d93df2fe255d04625cbc670000 dolphin-0.8.1.tar.gz From fedora-extras-commits at redhat.com Sun Feb 4 13:20:56 2007 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 4 Feb 2007 08:20:56 -0500 Subject: fedora-security/audit fe5,1.150,1.151 fe6,1.64,1.65 Message-ID: <200702041320.l14DKuJ2013649@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13630 Modified Files: fe5 fe6 Log Message: Note smb4k < 0.8.0 issues. Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.150 retrieving revision 1.151 diff -u -r1.150 -r1.151 --- fe5 2 Feb 2007 16:14:48 -0000 1.150 +++ fe5 4 Feb 2007 13:20:53 -0000 1.151 @@ -7,6 +7,10 @@ CVE-2007-0541 version (wordpress, fixed 2.1-0) #225469 CVE-2007-0540 version (wordpress, fixed 2.1-0) #225469 CVE-2007-0539 version (wordpress, fixed 2.1-0) #225469 +CVE-2007-0475 version (smb4k, fixed 0.8.0) +CVE-2007-0474 version (smb4k, fixed 0.8.0) +CVE-2007-0473 version (smb4k, fixed 0.8.0) +CVE-2007-0472 version (smb4k, fixed 0.8.0) CVE-2007-0469 version (rubygems, fixed 0.9.1) CVE-2007-0405 version (Django, fixed 0.95.1) CVE-2007-0404 version (Django, fixed 0.95.1) Index: fe6 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe6,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- fe6 2 Feb 2007 16:14:48 -0000 1.64 +++ fe6 4 Feb 2007 13:20:53 -0000 1.65 @@ -7,6 +7,10 @@ CVE-2007-0541 version (wordpress, fixed 2.1-0) #225469 CVE-2007-0540 version (wordpress, fixed 2.1-0) #225469 CVE-2007-0539 version (wordpress, fixed 2.1-0) #225469 +CVE-2007-0475 version (smb4k, fixed 0.8.0) +CVE-2007-0474 version (smb4k, fixed 0.8.0) +CVE-2007-0473 version (smb4k, fixed 0.8.0) +CVE-2007-0472 version (smb4k, fixed 0.8.0) CVE-2007-0469 version (rubygems, fixed 0.9.1) CVE-2007-0405 version (Django, fixed 0.95.1) CVE-2007-0404 version (Django, fixed 0.95.1) From fedora-extras-commits at redhat.com Sun Feb 4 13:41:05 2007 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Sun, 4 Feb 2007 08:41:05 -0500 Subject: rpms/nmh/devel nmh.spec,1.19,1.20 Message-ID: <200702041341.l14Df5Q7013768@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/extras/rpms/nmh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13747 Modified Files: nmh.spec Log Message: * Use $RPM_OPT_FLAGS bz#227243 Index: nmh.spec =================================================================== RCS file: /cvs/extras/rpms/nmh/devel/nmh.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- nmh.spec 16 Jan 2007 02:17:07 -0000 1.19 +++ nmh.spec 4 Feb 2007 13:40:32 -0000 1.20 @@ -1,6 +1,6 @@ Name: nmh Version: 1.2 -Release: 20070115cvs.1%{?dist} +Release: 20070115cvs.2%{?dist} Summary: A capable mail handling system with a command line interface. Group: Applications/Internet @@ -30,7 +30,7 @@ %patch0 -p0 %build -CFLAGS='-fno-builtin-strcasecmp' +CFLAGS='$RPM_OPT_FLAGS -fno-builtin-strcasecmp' %configure \ --sysconfdir=%{_sysconfdir}/nmh \ --libdir=%{_libexecdir}/nmh \ @@ -62,6 +62,9 @@ %doc docs/TODO docs/README* COPYRIGHT %changelog +* Sun Feb 04 2007 Josh Bressers 0:1.2_20070115cvs.2 +- Use $RPM_OPT_FLAGS when building the source bz#227243 + * Mon Jan 15 2007 Josh Bressers 0:1.2_CVS_20070115 - Update to nmh 1.2 post CVS (thanks to Horst H. von Brand for assistance in this task) From fedora-extras-commits at redhat.com Sun Feb 4 13:49:48 2007 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Sun, 4 Feb 2007 08:49:48 -0500 Subject: rpms/nmh/devel nmh.spec,1.20,1.21 Message-ID: <200702041349.l14DnmXB013878@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/extras/rpms/nmh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13859 Modified Files: nmh.spec Log Message: Fix a typo Index: nmh.spec =================================================================== RCS file: /cvs/extras/rpms/nmh/devel/nmh.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- nmh.spec 4 Feb 2007 13:40:32 -0000 1.20 +++ nmh.spec 4 Feb 2007 13:49:16 -0000 1.21 @@ -1,6 +1,6 @@ Name: nmh Version: 1.2 -Release: 20070115cvs.2%{?dist} +Release: 20070115cvs.3%{?dist} Summary: A capable mail handling system with a command line interface. Group: Applications/Internet @@ -30,7 +30,7 @@ %patch0 -p0 %build -CFLAGS='$RPM_OPT_FLAGS -fno-builtin-strcasecmp' +CFLAGS="$RPM_OPT_FLAGS -fno-builtin-strcasecmp" %configure \ --sysconfdir=%{_sysconfdir}/nmh \ --libdir=%{_libexecdir}/nmh \ @@ -62,6 +62,9 @@ %doc docs/TODO docs/README* COPYRIGHT %changelog +* Sun Feb 04 2007 Josh Bressers 0:1.2_20070115cvs.3 +- Use double quotes not single quotes for CFLAGS + * Sun Feb 04 2007 Josh Bressers 0:1.2_20070115cvs.2 - Use $RPM_OPT_FLAGS when building the source bz#227243 From fedora-extras-commits at redhat.com Sun Feb 4 14:38:03 2007 From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz)) Date: Sun, 4 Feb 2007 09:38:03 -0500 Subject: rpms/pan/FC-6 .cvsignore, 1.16, 1.17 pan.spec, 1.26, 1.27 sources, 1.16, 1.17 Message-ID: <200702041438.l14Ec3ig017532@cvs-int.fedora.redhat.com> Author: adalloz Update of /cvs/extras/rpms/pan/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17494 Modified Files: .cvsignore pan.spec sources Log Message: Update to new upstream version 0.122 February 3, 2007 - Pan 0.122: "Not Even Wrong" Like the previous release, 0.122 is the result of slogging through the remaining bug tickets for version 1.0 -- a few bug fixes and lots of polish. We're getting close... Bug Tickets addressed in this release: 354779 pan no longer attempts to reconnect (Jason Auvenshine) 403513 crash in FC6 when viewing one specific message (Yannick Palanque) 401012 freed memory read in socket-impl-gio (Charles) 402121 rare memory corruption when parsing dates in scorefile (Charles) 403066 getting new groups, conditional jump on uninitialised value (Charles) 401087 servers.xml's file permissions are too lax (Robert Marshall) 399776 group pane not syncronized when group changes (Bruce Bowler) 307028 editor error: cursor positioning on indented lines (Richard Rasker) 401449 sort-by-author doesn't work properly (Charles Hill, Jason Mack) 400814 unable to mark some groups as read (Christophe) 402704 queue size too small in task-pane.cc (Shana) 403762 pasted text isn't wrapped automatically (Artur Jachacy) 389817 article not shown if another DL in progress (Samuli Karkkainen) 403076 focus is incorrect when returning to header pane (Walt) 402743 add keyboard shortcuts in task window (Ulrich Binder) 402200 support large article cache sizes (Craig Ruff) 400800 use libsexy for the toolbar's icon entry fields (Charles) 399616 log message error in 0.121 (Charles) 400012 nntp 501 error messages could be more helpful (Pavel) 400256 spurious error message after deleting server (Pavel) 400329 spurious error opening newsrc file when adding new servers (Pavel) 400026 spurious error messages when decoding articles w/o attachments (Pavel) 358062 spurious error message on nntp 411 response (Pavel) 361603 translatability problems for message strings (Flammie Pirinen) 400670 fold together some of the redundant translation strings (Charles) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pan/FC-6/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 14 Jan 2007 01:04:24 -0000 1.16 +++ .cvsignore 4 Feb 2007 14:37:30 -0000 1.17 @@ -1 +1 @@ -pan-0.120.tar.bz2 +pan-0.122.tar.bz2 Index: pan.spec =================================================================== RCS file: /cvs/extras/rpms/pan/FC-6/pan.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- pan.spec 14 Jan 2007 01:04:24 -0000 1.26 +++ pan.spec 4 Feb 2007 14:37:30 -0000 1.27 @@ -1,6 +1,6 @@ Summary: A GNOME/GTK+ news reader for X Name: pan -Version: 0.120 +Version: 0.122 Release: 1%{?dist} Epoch: 1 License: GPL @@ -42,7 +42,6 @@ --vendor=fedora \ --add-category=Application \ --add-category=Network \ ---add-category=X-Fedora \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ --copy-name-to-generic-name \ --delete-original @@ -60,6 +59,9 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Sun Feb 04 2007 Alexander Dalloz - 1:0.122-1 +- Update to 0.122 + * Sun Jan 14 2007 Alexander Dalloz - 1:0.120-1 - Update to 0.120 - Drop --add-category=X-Fedora in pan.desktop Index: sources =================================================================== RCS file: /cvs/extras/rpms/pan/FC-6/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 14 Jan 2007 01:04:24 -0000 1.16 +++ sources 4 Feb 2007 14:37:30 -0000 1.17 @@ -1 +1 @@ -5e7425a581c4bec7a47cb8d22cfd6fe8 pan-0.120.tar.bz2 +ae8a20d11555262fe640cdf51d05eb81 pan-0.122.tar.bz2 From fedora-extras-commits at redhat.com Sun Feb 4 14:38:31 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Sun, 4 Feb 2007 09:38:31 -0500 Subject: rpms/kpowersave - New directory Message-ID: <200702041438.l14EcVAG017553@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/kpowersave In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17546/kpowersave Log Message: Directory /cvs/extras/rpms/kpowersave added to the repository From fedora-extras-commits at redhat.com Sun Feb 4 14:38:39 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Sun, 4 Feb 2007 09:38:39 -0500 Subject: rpms/kpowersave/devel - New directory Message-ID: <200702041438.l14Ecd8d017567@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/kpowersave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17546/kpowersave/devel Log Message: Directory /cvs/extras/rpms/kpowersave/devel added to the repository From fedora-extras-commits at redhat.com Sun Feb 4 14:39:10 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Sun, 4 Feb 2007 09:39:10 -0500 Subject: rpms/kpowersave Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200702041439.l14EdAar017640@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/kpowersave In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17631 Added Files: Makefile import.log Log Message: Setup of module kpowersave --- NEW FILE Makefile --- # Top level Makefile for module kpowersave all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sun Feb 4 14:39:13 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Sun, 4 Feb 2007 09:39:13 -0500 Subject: rpms/kpowersave/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702041439.l14EdDER017656@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/kpowersave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17631/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module kpowersave --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sun Feb 4 14:43:37 2007 From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz)) Date: Sun, 4 Feb 2007 09:43:37 -0500 Subject: rpms/pan/devel .cvsignore, 1.16, 1.17 pan.spec, 1.26, 1.27 sources, 1.16, 1.17 Message-ID: <200702041443.l14EhbWq017722@cvs-int.fedora.redhat.com> Author: adalloz Update of /cvs/extras/rpms/pan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17701 Modified Files: .cvsignore pan.spec sources Log Message: Update to new upstream version 0.122 February 3, 2007 - Pan 0.122: "Not Even Wrong" Like the previous release, 0.122 is the result of slogging through the remaining bug tickets for version 1.0 -- a few bug fixes and lots of polish. We're getting close... Bug Tickets addressed in this release: 354779 pan no longer attempts to reconnect (Jason Auvenshine) 403513 crash in FC6 when viewing one specific message (Yannick Palanque) 401012 freed memory read in socket-impl-gio (Charles) 402121 rare memory corruption when parsing dates in scorefile (Charles) 403066 getting new groups, conditional jump on uninitialised value (Charles) 401087 servers.xml's file permissions are too lax (Robert Marshall) 399776 group pane not syncronized when group changes (Bruce Bowler) 307028 editor error: cursor positioning on indented lines (Richard Rasker) 401449 sort-by-author doesn't work properly (Charles Hill, Jason Mack) 400814 unable to mark some groups as read (Christophe) 402704 queue size too small in task-pane.cc (Shana) 403762 pasted text isn't wrapped automatically (Artur Jachacy) 389817 article not shown if another DL in progress (Samuli Karkkainen) 403076 focus is incorrect when returning to header pane (Walt) 402743 add keyboard shortcuts in task window (Ulrich Binder) 402200 support large article cache sizes (Craig Ruff) 400800 use libsexy for the toolbar's icon entry fields (Charles) 399616 log message error in 0.121 (Charles) 400012 nntp 501 error messages could be more helpful (Pavel) 400256 spurious error message after deleting server (Pavel) 400329 spurious error opening newsrc file when adding new servers (Pavel) 400026 spurious error messages when decoding articles w/o attachments (Pavel) 358062 spurious error message on nntp 411 response (Pavel) 361603 translatability problems for message strings (Flammie Pirinen) 400670 fold together some of the redundant translation strings (Charles) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pan/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 14 Jan 2007 00:52:14 -0000 1.16 +++ .cvsignore 4 Feb 2007 14:43:05 -0000 1.17 @@ -1 +1 @@ -pan-0.120.tar.bz2 +pan-0.122.tar.bz2 Index: pan.spec =================================================================== RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- pan.spec 14 Jan 2007 00:52:14 -0000 1.26 +++ pan.spec 4 Feb 2007 14:43:05 -0000 1.27 @@ -1,6 +1,6 @@ Summary: A GNOME/GTK+ news reader for X Name: pan -Version: 0.120 +Version: 0.122 Release: 1%{?dist} Epoch: 1 License: GPL @@ -59,8 +59,11 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Sun Feb 04 2007 Alexander Dalloz - 1:0.122-1 +- Update to 0.122 + * Sun Jan 14 2007 Alexander Dalloz - 1:0.120-1 -- Update to 0.1.120 +- Update to 0.120 - Drop --add-category=X-Fedora in pan.desktop * Sat Nov 11 2006 Alexander Dalloz - 1:0.119-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pan/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 14 Jan 2007 00:52:14 -0000 1.16 +++ sources 4 Feb 2007 14:43:05 -0000 1.17 @@ -1 +1 @@ -5e7425a581c4bec7a47cb8d22cfd6fe8 pan-0.120.tar.bz2 +ae8a20d11555262fe640cdf51d05eb81 pan-0.122.tar.bz2 From fedora-extras-commits at redhat.com Sun Feb 4 14:45:49 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Sun, 4 Feb 2007 09:45:49 -0500 Subject: rpms/kpowersave import.log,1.1,1.2 Message-ID: <200702041445.l14Ejn6u017780@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/kpowersave In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17744 Modified Files: import.log Log Message: auto-import kpowersave-0.7.1-2.al3 on branch devel from kpowersave-0.7.1-2.al3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/kpowersave/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 4 Feb 2007 14:39:08 -0000 1.1 +++ import.log 4 Feb 2007 14:45:17 -0000 1.2 @@ -0,0 +1 @@ +kpowersave-0_7_1-2_al3:HEAD:kpowersave-0.7.1-2.al3.src.rpm:1170600296 From fedora-extras-commits at redhat.com Sun Feb 4 14:45:51 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Sun, 4 Feb 2007 09:45:51 -0500 Subject: rpms/kpowersave/devel kpowersave.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702041445.l14Ejp5a017784@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/kpowersave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17744/devel Modified Files: .cvsignore sources Added Files: kpowersave.spec Log Message: auto-import kpowersave-0.7.1-2.al3 on branch devel from kpowersave-0.7.1-2.al3.src.rpm --- NEW FILE kpowersave.spec --- Name: kpowersave Version: 0.7.1 Release: 2%{?dist} Summary: KPowersave is the KDE frontend for powermanagement Group: Applications/System License: GPL URL: http://powersave.sourceforge.net/ Source0: http://dl.sf.net/powersave/kpowersave-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs-devel BuildRequires: gettext BuildRequires: dbus-qt-devel BuildRequires: automake BuildRequires: libXext-devel libXScrnSaver-devel libXtst-devel BuildRequires: hal-devel desktop-file-utils %description KPowersave is the KDE frontend for powermanagement. It provides battery monitoring, suspend/ standby triggers and many more features for KDE (and GNOME). %prep %setup -q # redo auto* foo to get rid of goofy unsermake dep make -f admin/Makefile.common %build unset QTDIR || : ; . /etc/profile.d/qt.sh %configure \ --disable-rpath \ --enable-new-ldflags \ --disable-debug --disable-warnings \ --disable-dependency-tracking make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \ --vendor="" \ $RPM_BUILD_ROOT%{_datadir}/applications/kde/kpowersave.desktop ## File lists # locale's %find_lang %{name} || touch %{name}.lang # HTML HTML_DIR=$(kde-config --expandvars --install html) if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do lang=$(basename $lang_dir) echo "%lang($lang) %doc $HTML_DIR/$lang/*" >> %{name}.lang done fi %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor || : %postun touch --no-create %{_datadir}/icons/hicolor || : %files -f %{name}.lang %defattr(-,root,root,-) %doc ChangeLog COPYING NEWS %{_bindir}/kpowersave %{_libdir}/kde3/kpowersave.* %{_libdir}/libkdeinit_kpowersave.* %{_datadir}/applications/kde/*kpowersave.desktop %{_datadir}/apps/kpowersave/ %{_datadir}/autostart/kpowersave-autostart.desktop %{_datadir}/config/kpowersaverc %{_datadir}/icons/hicolor/*/*/* %changelog * Fri Feb 02 2007 Dennis Gilmore - 0.7.1-2 - Fix BuildRequires and use http url for source * Thu Jan 25 2007 Dennis Gilmore - 0.7.1-1 - Initial Fedora Packaging Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kpowersave/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Feb 2007 14:39:10 -0000 1.1 +++ .cvsignore 4 Feb 2007 14:45:19 -0000 1.2 @@ -0,0 +1 @@ +kpowersave-0.7.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kpowersave/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Feb 2007 14:39:10 -0000 1.1 +++ sources 4 Feb 2007 14:45:19 -0000 1.2 @@ -0,0 +1 @@ +30c94bc40f666b375a38312e9b831fff kpowersave-0.7.1.tar.bz2 From fedora-extras-commits at redhat.com Sun Feb 4 15:33:48 2007 From: fedora-extras-commits at redhat.com (Ruben Kerkhof (ruben)) Date: Sun, 4 Feb 2007 10:33:48 -0500 Subject: rpms/incron/devel .cvsignore, 1.2, 1.3 incron.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200702041533.l14FXm7p022452@cvs-int.fedora.redhat.com> Author: ruben Update of /cvs/extras/rpms/incron/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22430 Modified Files: .cvsignore incron.spec sources Log Message: sync with new upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/incron/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Jan 2007 20:33:13 -0000 1.2 +++ .cvsignore 4 Feb 2007 15:33:16 -0000 1.3 @@ -1 +1 @@ -incron-0.5.0.tar.bz2 +incron-0.5.1.tar.bz2 Index: incron.spec =================================================================== RCS file: /cvs/extras/rpms/incron/devel/incron.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- incron.spec 28 Jan 2007 20:33:13 -0000 1.1 +++ incron.spec 4 Feb 2007 15:33:16 -0000 1.2 @@ -1,6 +1,6 @@ Summary: Inotify cron system Name: incron -Version: 0.5.0 +Version: 0.5.1 Release: 1%{?dist} Group: System Environment/Base @@ -22,7 +22,6 @@ %prep %setup -q -%{__sed} -i 's/ //' LICENSE-GPL %build make %{?_smp_mflags} CXXFLAGS="%{optflags}" @@ -77,6 +76,9 @@ %changelog +* Sun Feb 04 2007 0.5.1-1 +- Updated to new upstream version +- Upstream fixed the incorrect encoding of the LICENSE-GPL file * Sun Jan 27 2007 0.5.0-1 - Updated to new upstream version - Changed the service name in the scriptlets Index: sources =================================================================== RCS file: /cvs/extras/rpms/incron/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Jan 2007 20:33:13 -0000 1.2 +++ sources 4 Feb 2007 15:33:16 -0000 1.3 @@ -1 +1 @@ -4418140738fb750234c6c782d54300ba incron-0.5.0.tar.bz2 +e6b797e6598c79b4382ca37c4a00045a incron-0.5.1.tar.bz2 From fedora-extras-commits at redhat.com Sun Feb 4 16:21:26 2007 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 4 Feb 2007 11:21:26 -0500 Subject: rpms/perl-Module-ScanDeps/devel .cvsignore, 1.12, 1.13 perl-Module-ScanDeps.spec, 1.12, 1.13 sources, 1.12, 1.13 Message-ID: <200702041621.l14GLQu6026289@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-ScanDeps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26268 Modified Files: .cvsignore perl-Module-ScanDeps.spec sources Log Message: Update to 0.72. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 5 Jan 2007 15:02:05 -0000 1.12 +++ .cvsignore 4 Feb 2007 16:20:54 -0000 1.13 @@ -1 +1 @@ -Module-ScanDeps-0.71.tar.gz +Module-ScanDeps-0.72.tar.gz Index: perl-Module-ScanDeps.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/devel/perl-Module-ScanDeps.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- perl-Module-ScanDeps.spec 5 Jan 2007 15:02:05 -0000 1.12 +++ perl-Module-ScanDeps.spec 4 Feb 2007 16:20:54 -0000 1.13 @@ -1,5 +1,5 @@ Name: perl-Module-ScanDeps -Version: 0.71 +Version: 0.72 Release: 1%{?dist} Summary: Recursively scan Perl code for dependencies @@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +BuildRequires: perl(Module::Pluggable) BuildRequires: perl(Test::Pod) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -55,6 +56,10 @@ %changelog +* Sun Feb 4 2007 Jose Pedro Oliveira - 0.72-1 +- Update to 0.72. +- Added perl(Module::Pluggable) to the build requirements list (t/2-pluggable.t). + * Fri Jan 5 2007 Jose Pedro Oliveira - 0.71-1 - Update to 0.71. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 5 Jan 2007 15:02:05 -0000 1.12 +++ sources 4 Feb 2007 16:20:54 -0000 1.13 @@ -1 +1 @@ -c8ef0aefa2003453bcdcf548576cdf1e Module-ScanDeps-0.71.tar.gz +249d31c331847611b76ce6439f28e24f Module-ScanDeps-0.72.tar.gz From fedora-extras-commits at redhat.com Sun Feb 4 16:32:54 2007 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Sun, 4 Feb 2007 11:32:54 -0500 Subject: rpms/util-vserver/devel util-vserver-0.30.212-pagesize.patch, 1.1, 1.2 Message-ID: <200702041632.l14GWsB4026411@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/util-vserver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26385 Modified Files: util-vserver-0.30.212-pagesize.patch Log Message: TEST_BLOCKSIZE needs to be four times PAGE_SIZE util-vserver-0.30.212-pagesize.patch: Index: util-vserver-0.30.212-pagesize.patch =================================================================== RCS file: /cvs/extras/rpms/util-vserver/devel/util-vserver-0.30.212-pagesize.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- util-vserver-0.30.212-pagesize.patch 19 Jan 2007 05:36:29 -0000 1.1 +++ util-vserver-0.30.212-pagesize.patch 4 Feb 2007 16:32:21 -0000 1.2 @@ -5,7 +5,7 @@ int wrapper_exit_code = 1; -#define TEST_BLOCKSIZE 0x10000 -+#define TEST_BLOCKSIZE 0x20000 ++#define TEST_BLOCKSIZE 0x40000 static bool is_gremlin = false; static int sync_p[2]; From fedora-extras-commits at redhat.com Sun Feb 4 16:44:47 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sun, 4 Feb 2007 11:44:47 -0500 Subject: rpms/jd/devel .cvsignore, 1.60, 1.61 jd.spec, 1.70, 1.71 sources, 1.60, 1.61 Message-ID: <200702041644.l14GilQ6026491@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26469 Modified Files: .cvsignore jd.spec sources Log Message: * Sun Feb 4 2007 Mamoru Tasaka - 1.8.5-1.cvs070204 - cvs 070204 (15:25 JST) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- .cvsignore 2 Feb 2007 15:47:27 -0000 1.60 +++ .cvsignore 4 Feb 2007 16:44:15 -0000 1.61 @@ -1 +1 @@ -jd-1.8.5-070203.tgz +jd-1.8.5-cvs070204.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- jd.spec 2 Feb 2007 15:47:27 -0000 1.70 +++ jd.spec 4 Feb 2007 16:44:15 -0000 1.71 @@ -10,13 +10,13 @@ # Defined by upsteam # %define main_ver 1.8.5 -%define strtag 070203 +%define strtag cvs070204 %define repoid 23816 # Defined by vendor # -%define vendor_rel 1 +%define vendor_rel 1.%{strtag} # Tag name changed from vendor to vendorname so as not to # overwrite Vendor entry in Summary %define vendorname fedora @@ -106,6 +106,9 @@ %{icondir}/%{name}.png %changelog +* Sun Feb 4 2007 Mamoru Tasaka - 1.8.5-1.cvs070204 +- cvs 070204 (15:25 JST) + * Fri Feb 2 2007 Mamoru Tasaka - 1.8.5-1 - 1.8.5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- sources 2 Feb 2007 15:47:27 -0000 1.60 +++ sources 4 Feb 2007 16:44:15 -0000 1.61 @@ -1 +1 @@ -8cc9aad86ea0458705c2937a7798a22a jd-1.8.5-070203.tgz +8dd52e718a2e5847cbf49450bc8fb886 jd-1.8.5-cvs070204.tgz From fedora-extras-commits at redhat.com Sun Feb 4 17:02:53 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sun, 4 Feb 2007 12:02:53 -0500 Subject: rpms/jd/devel jd.spec,1.71,1.72 Message-ID: <200702041702.l14H2rN9029925@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29899 Modified Files: jd.spec Log Message: ah.. forgot cvs > fc Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- jd.spec 4 Feb 2007 16:44:15 -0000 1.71 +++ jd.spec 4 Feb 2007 17:02:21 -0000 1.72 @@ -16,7 +16,7 @@ # Defined by vendor # -%define vendor_rel 1.%{strtag} +%define vendor_rel 2.%{strtag} # Tag name changed from vendor to vendorname so as not to # overwrite Vendor entry in Summary %define vendorname fedora @@ -106,7 +106,7 @@ %{icondir}/%{name}.png %changelog -* Sun Feb 4 2007 Mamoru Tasaka - 1.8.5-1.cvs070204 +* Sun Feb 4 2007 Mamoru Tasaka - 1.8.5-2.cvs070204 - cvs 070204 (15:25 JST) * Fri Feb 2 2007 Mamoru Tasaka - 1.8.5-1 From fedora-extras-commits at redhat.com Sun Feb 4 17:04:34 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sun, 4 Feb 2007 12:04:34 -0500 Subject: rpms/kazehakase/FC-6 kazehakase.spec,1.2,1.3 Message-ID: <200702041704.l14H4Ygx029999@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/kazehakase/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29980 Modified Files: kazehakase.spec Log Message: * Sat Feb 4 2007 Mamoru Tasaka - 0.4.4.1-2.dist.1 - modify configure for split of mozilla-config.h for multilib Index: kazehakase.spec =================================================================== RCS file: /cvs/extras/rpms/kazehakase/FC-6/kazehakase.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kazehakase.spec 3 Feb 2007 05:16:29 -0000 1.2 +++ kazehakase.spec 4 Feb 2007 17:04:02 -0000 1.3 @@ -10,7 +10,7 @@ Name: kazehakase Version: 0.4.4.1 -Release: 2%{?dist} +Release: 2%{?dist}.1 Summary: Kazehakase browser Group: Applications/Internet @@ -44,6 +44,10 @@ %prep %setup -q +%{__sed} -i.multilib -e \ + '/gecko/s|mozilla-config.h|mozilla-config*.h|' \ + configure + %build %configure \ %if 0%{?fedora} == 5 @@ -98,6 +102,9 @@ %{_mandir}/man1/%{name}.1* %changelog +* Sat Feb 4 2007 Mamoru Tasaka - 0.4.4.1-2.dist.1 +- modify configure for split of mozilla-config.h for multilib + * Sat Feb 3 2007 Mamoru Tasaka - 0.4.4.1-2 - Remove -Werror staff From fedora-extras-commits at redhat.com Sun Feb 4 18:24:08 2007 From: fedora-extras-commits at redhat.com (Daniel Malmgren (danielm)) Date: Sun, 4 Feb 2007 13:24:08 -0500 Subject: rpms/initng/devel initng.spec,1.9,1.10 Message-ID: <200702041824.l14IO8PY002058@cvs-int.fedora.redhat.com> Author: danielm Update of /cvs/extras/rpms/initng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1967 Modified Files: initng.spec Log Message: initng 0.6.9-1 Index: initng.spec =================================================================== RCS file: /cvs/extras/rpms/initng/devel/initng.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- initng.spec 30 Sep 2006 05:01:13 -0000 1.9 +++ initng.spec 4 Feb 2007 18:23:35 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Programs which control basic system processes Name: initng -Version: 0.6.8 -Release: 9%{?dist} +Version: 0.6.9 +Release: 1%{?dist} License: GPL URL: http://www.initng.org Group: System Environment/Base @@ -13,7 +13,6 @@ Requires(post): procps Requires(triggerin): grep coreutils Requires: %{name}-lib = %{version}-%{release} -Patch0: check-selinux.patch %description Initng is a full replacement of the old and in many ways deprecated sysvinit @@ -38,7 +37,6 @@ %prep %setup -q -%patch0 -p0 -b .check_selinux %build cmake . -DBUILD_SELINUX:BOOL=ON -DCOUNT_ME:BOOL=OFF -DLIB_INSTALL_DIR:STRING=/%{_lib} @@ -66,7 +64,7 @@ defaultkpath=`grubby --default-kernel` if test -n $defaultkpath && test -f "/boot/vmlinuz-"`uname -r` then - defaultkpath="/boot/vmlinuz-"`uname -r` + defaultkpath="/boot/vmlinuz-"`uname -r` fi defaultinitrd=`grubby --info=$defaultkpath | grep initrd` grubby --add-kernel=$defaultkpath --copy-default --args="init=/sbin/initng" --title="initng boot" --$defaultinitrd @@ -114,6 +112,10 @@ /%{_lib}/libngcclient.so %changelog +* Sun Feb 04 2007 Daniel Malmgren 0.6.9-1 +- New upstreams version +- Removed selinux patch that's now upstreams + * Sat Sep 30 2006 Daniel Malmgren 0.6.8-9 - Seems like this bumping is getting out of hands, right? From fedora-extras-commits at redhat.com Sun Feb 4 18:31:01 2007 From: fedora-extras-commits at redhat.com (Daniel Malmgren (danielm)) Date: Sun, 4 Feb 2007 13:31:01 -0500 Subject: rpms/initng/devel .cvsignore,1.3,1.4 sources,1.3,1.4 Message-ID: <200702041831.l14IV1Ma002179@cvs-int.fedora.redhat.com> Author: danielm Update of /cvs/extras/rpms/initng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2158 Modified Files: .cvsignore sources Log Message: Forgot the source :-/ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/initng/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Sep 2006 18:21:04 -0000 1.3 +++ .cvsignore 4 Feb 2007 18:30:29 -0000 1.4 @@ -1 +1 @@ -initng-0.6.8.tar.bz2 +initng-0.6.9.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/initng/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Sep 2006 18:21:04 -0000 1.3 +++ sources 4 Feb 2007 18:30:29 -0000 1.4 @@ -1 +1 @@ -14a5e9a1083f2bfa560f5c5c6151d09f initng-0.6.8.tar.bz2 +dfaa7a90e86ae7af6f7daa443e5cb7c7 initng-0.6.9.tar.bz2 From fedora-extras-commits at redhat.com Sun Feb 4 18:34:20 2007 From: fedora-extras-commits at redhat.com (Daniel Malmgren (danielm)) Date: Sun, 4 Feb 2007 13:34:20 -0500 Subject: rpms/initng/devel initng.spec,1.10,1.11 Message-ID: <200702041834.l14IYKOq002232@cvs-int.fedora.redhat.com> Author: danielm Update of /cvs/extras/rpms/initng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2207 Modified Files: initng.spec Log Message: ...and now another try with a bumped revision. I really hate this build system. Index: initng.spec =================================================================== RCS file: /cvs/extras/rpms/initng/devel/initng.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- initng.spec 4 Feb 2007 18:23:35 -0000 1.10 +++ initng.spec 4 Feb 2007 18:33:48 -0000 1.11 @@ -1,7 +1,7 @@ Summary: Programs which control basic system processes Name: initng Version: 0.6.9 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL URL: http://www.initng.org Group: System Environment/Base @@ -112,6 +112,9 @@ /%{_lib}/libngcclient.so %changelog +* Sun Feb 04 2007 Daniel Malmgren 0.6.9-2 +- Forgot to upload the source... + * Sun Feb 04 2007 Daniel Malmgren 0.6.9-1 - New upstreams version - Removed selinux patch that's now upstreams From fedora-extras-commits at redhat.com Sun Feb 4 18:56:26 2007 From: fedora-extras-commits at redhat.com (Daniel Malmgren (danielm)) Date: Sun, 4 Feb 2007 13:56:26 -0500 Subject: rpms/initng/devel initng.spec,1.11,1.12 Message-ID: <200702041856.l14IuQCb002418@cvs-int.fedora.redhat.com> Author: danielm Update of /cvs/extras/rpms/initng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2398 Modified Files: initng.spec Log Message: 0.6.9-3. Forgot the opt flags stuff. Index: initng.spec =================================================================== RCS file: /cvs/extras/rpms/initng/devel/initng.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- initng.spec 4 Feb 2007 18:33:48 -0000 1.11 +++ initng.spec 4 Feb 2007 18:55:54 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Programs which control basic system processes Name: initng Version: 0.6.9 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL URL: http://www.initng.org Group: System Environment/Base @@ -39,6 +39,7 @@ %setup -q %build +export CFLAGS="$RPM_OPT_FLAGS" cmake . -DBUILD_SELINUX:BOOL=ON -DCOUNT_ME:BOOL=OFF -DLIB_INSTALL_DIR:STRING=/%{_lib} make %{?_smp_mflags} VERBOSE=1 @@ -112,6 +113,9 @@ /%{_lib}/libngcclient.so %changelog +* Sun Feb 04 2007 Daniel Malmgren 0.6.9-3 +- Use correct opt flags as suggested in BZ #225100 + * Sun Feb 04 2007 Daniel Malmgren 0.6.9-2 - Forgot to upload the source... From fedora-extras-commits at redhat.com Sun Feb 4 19:00:53 2007 From: fedora-extras-commits at redhat.com (Daniel Malmgren (danielm)) Date: Sun, 4 Feb 2007 14:00:53 -0500 Subject: rpms/initng-ifiles/devel .cvsignore, 1.2, 1.3 initng-ifiles.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200702041900.l14J0rbI002495@cvs-int.fedora.redhat.com> Author: danielm Update of /cvs/extras/rpms/initng-ifiles/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2468 Modified Files: .cvsignore initng-ifiles.spec sources Log Message: initng-ifiles 0.0.7-1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/initng-ifiles/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Sep 2006 09:20:40 -0000 1.2 +++ .cvsignore 4 Feb 2007 19:00:21 -0000 1.3 @@ -1 +1 @@ -initng-ifiles-0.0.6.tar.bz2 +initng-ifiles-0.0.7.tar.bz2 Index: initng-ifiles.spec =================================================================== RCS file: /cvs/extras/rpms/initng-ifiles/devel/initng-ifiles.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- initng-ifiles.spec 30 Sep 2006 05:27:48 -0000 1.2 +++ initng-ifiles.spec 4 Feb 2007 19:00:21 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Scripts for initng Name: initng-ifiles -Version: 0.0.6 -Release: 2%{?dist} +Version: 0.0.7 +Release: 1%{?dist} License: GPL URL: http://www.initng.org Group: System Environment/Base @@ -19,6 +19,7 @@ %setup -q %build +export CFLAGS="$RPM_OPT_FLAGS" cmake . -DLIB_INSTALL_DIR:STRING=/%{_lib} make %{?_smp_mflags} @@ -28,11 +29,13 @@ rm -rf %{buildroot}/%{_sysconfdir}/hotplug/net.agent rm -rf %{buildroot}/%{_sysconfdir}/pcmcia/network rm -rf %{buildroot}%{_datadir}/vim/ +rm -rf %{buildroot}/%{_lib}/libgenrunlevel.gentoo +rm -rf %{buildroot}/%{_lib}/libgenrunlevel.debian mkdir _doc mv %{buildroot}%{_datadir}/doc/%{name}/* _doc/ %post -/sbin/gen_system_runlevel -all >/dev/null 2>&1 || : +/sbin/genrunlevel -all >/dev/null 2>&1 || : exit 0 %clean @@ -44,13 +47,21 @@ %defattr(-,root,root) %doc _doc/* %config(noreplace) %{_sysconfdir}/initng -/sbin/gen_system_runlevel +/sbin/genrunlevel /sbin/install_service /sbin/ng-update +/lib/libgenrunlevel* /%{_lib}/initng %{_mandir}/*/* %changelog +* Sun Feb 04 2007 Daniel Malmgren 0.0.7-1 +- New upstreams version +- Upstreams has migrated from the old cludgy gen_system_runlevel to + a new genrunlevel. Adopting. The script is hardcoded to search for + it's files in /lib, I guess this needs fixing upstreams... +- Fix the flags used for building + * Sat Sep 30 2006 Daniel Malmgren 0.0.6-2 - Bump version for rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/initng-ifiles/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Sep 2006 09:20:40 -0000 1.2 +++ sources 4 Feb 2007 19:00:21 -0000 1.3 @@ -1 +1 @@ -3e41d3fef0fbd40605844eadda1abd75 initng-ifiles-0.0.6.tar.bz2 +0155a1aef442e8a05a9c45b941413648 initng-ifiles-0.0.7.tar.bz2 From fedora-extras-commits at redhat.com Sun Feb 4 21:04:19 2007 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 4 Feb 2007 16:04:19 -0500 Subject: rpms/perl-Module-ScanDeps/FC-6 .cvsignore, 1.12, 1.13 perl-Module-ScanDeps.spec, 1.12, 1.13 sources, 1.12, 1.13 Message-ID: <200702042104.l14L4JVZ013292@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-ScanDeps/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13249/FC-6 Modified Files: .cvsignore perl-Module-ScanDeps.spec sources Log Message: Sync with devel. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-6/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 5 Jan 2007 15:01:59 -0000 1.12 +++ .cvsignore 4 Feb 2007 21:03:47 -0000 1.13 @@ -1 +1 @@ -Module-ScanDeps-0.71.tar.gz +Module-ScanDeps-0.72.tar.gz Index: perl-Module-ScanDeps.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-6/perl-Module-ScanDeps.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- perl-Module-ScanDeps.spec 5 Jan 2007 15:01:59 -0000 1.12 +++ perl-Module-ScanDeps.spec 4 Feb 2007 21:03:47 -0000 1.13 @@ -1,5 +1,5 @@ Name: perl-Module-ScanDeps -Version: 0.71 +Version: 0.72 Release: 1%{?dist} Summary: Recursively scan Perl code for dependencies @@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +BuildRequires: perl(Module::Pluggable) BuildRequires: perl(Test::Pod) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -55,6 +56,10 @@ %changelog +* Sun Feb 4 2007 Jose Pedro Oliveira - 0.72-1 +- Update to 0.72. +- Added perl(Module::Pluggable) to the build requirements list (t/2-pluggable.t). + * Fri Jan 5 2007 Jose Pedro Oliveira - 0.71-1 - Update to 0.71. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-6/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 5 Jan 2007 15:01:59 -0000 1.12 +++ sources 4 Feb 2007 21:03:47 -0000 1.13 @@ -1 +1 @@ -c8ef0aefa2003453bcdcf548576cdf1e Module-ScanDeps-0.71.tar.gz +249d31c331847611b76ce6439f28e24f Module-ScanDeps-0.72.tar.gz From fedora-extras-commits at redhat.com Sun Feb 4 21:04:16 2007 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 4 Feb 2007 16:04:16 -0500 Subject: rpms/perl-Module-ScanDeps/FC-5 .cvsignore, 1.12, 1.13 perl-Module-ScanDeps.spec, 1.12, 1.13 sources, 1.12, 1.13 Message-ID: <200702042104.l14L4GeS013287@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-ScanDeps/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13249/FC-5 Modified Files: .cvsignore perl-Module-ScanDeps.spec sources Log Message: Sync with devel. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-5/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 5 Jan 2007 15:01:59 -0000 1.12 +++ .cvsignore 4 Feb 2007 21:03:44 -0000 1.13 @@ -1 +1 @@ -Module-ScanDeps-0.71.tar.gz +Module-ScanDeps-0.72.tar.gz Index: perl-Module-ScanDeps.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-5/perl-Module-ScanDeps.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- perl-Module-ScanDeps.spec 5 Jan 2007 15:01:59 -0000 1.12 +++ perl-Module-ScanDeps.spec 4 Feb 2007 21:03:44 -0000 1.13 @@ -1,5 +1,5 @@ Name: perl-Module-ScanDeps -Version: 0.71 +Version: 0.72 Release: 1%{?dist} Summary: Recursively scan Perl code for dependencies @@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +BuildRequires: perl(Module::Pluggable) BuildRequires: perl(Test::Pod) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -55,6 +56,10 @@ %changelog +* Sun Feb 4 2007 Jose Pedro Oliveira - 0.72-1 +- Update to 0.72. +- Added perl(Module::Pluggable) to the build requirements list (t/2-pluggable.t). + * Fri Jan 5 2007 Jose Pedro Oliveira - 0.71-1 - Update to 0.71. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-5/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 5 Jan 2007 15:01:59 -0000 1.12 +++ sources 4 Feb 2007 21:03:44 -0000 1.13 @@ -1 +1 @@ -c8ef0aefa2003453bcdcf548576cdf1e Module-ScanDeps-0.71.tar.gz +249d31c331847611b76ce6439f28e24f Module-ScanDeps-0.72.tar.gz From fedora-extras-commits at redhat.com Sun Feb 4 21:34:55 2007 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sun, 4 Feb 2007 16:34:55 -0500 Subject: rpms/tclxml/devel tclxml.spec,1.10,1.11 Message-ID: <200702042134.l14LYt0r013752@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tclxml/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13735 Modified Files: tclxml.spec Log Message: Move install directory back to %{_libdir} so that it can be found in Tcl's default package search path. Index: tclxml.spec =================================================================== RCS file: /cvs/extras/rpms/tclxml/devel/tclxml.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- tclxml.spec 2 Feb 2007 19:34:24 -0000 1.10 +++ tclxml.spec 4 Feb 2007 21:34:23 -0000 1.11 @@ -3,7 +3,7 @@ Summary: TclXML is a package that provides XML parsing for the Tcl scripting language Name: tclxml Version: 3.1 -Release: 10%{?dist} +Release: 11%{?dist} License: BSD Group: Development/Libraries URL: http://tclxml.sourceforge.net/ @@ -46,7 +46,6 @@ header files for the base, expat, and libxml2 subpackages. %prep -echo "tcl_sitelib is %{tcl_sitelib}" %setup -q %patch0 -p1 %patch1 @@ -96,39 +95,36 @@ rm -f $RPM_BUILD_ROOT/usr/include/xmltok.h rm -f $RPM_BUILD_ROOT/usr/include/xmlrole.h -# Don't pollute the system lib directory; move this package to -# a tcl-specific location -mkdir -p $RPM_BUILD_ROOT%{tcl_sitearch} -mv $RPM_BUILD_ROOT%{_libdir}/Tclxml%{version} $RPM_BUILD_ROOT%{tcl_sitearch}/Tclxml%{version} -mv $RPM_BUILD_ROOT%{_libdir}/Tclexpat%{version} $RPM_BUILD_ROOT%{tcl_sitearch}/Tclexpat%{version} -mv $RPM_BUILD_ROOT%{_libdir}/TclXML_libxml2%{version} $RPM_BUILD_ROOT%{tcl_sitearch}/TclXML_libxml2%{version} - %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%dir %{tcl_sitearch}/Tclxml%{version} -%{tcl_sitearch}/Tclxml%{version}/*.so -%{tcl_sitearch}/Tclxml%{version}/*.tcl +%dir %{_libdir}/Tclxml%{version} +%{_libdir}/Tclxml%{version}/*.so +%{_libdir}/Tclxml%{version}/*.tcl %doc LICENSE ANNOUNCE ChangeLog README RELNOTES %doc doc/* %files expat %defattr(-,root,root) -%{tcl_sitearch}/Tclexpat%{version} +%{_libdir}/Tclexpat%{version} %files libxml2 %defattr(-,root,root) -%{tcl_sitearch}/TclXML_libxml2%{version} +%{_libdir}/TclXML_libxml2%{version} %files devel %defattr(-,root,root) %{_includedir}/* %{_libdir}/TclxmlConfig.sh -%{tcl_sitearch}/Tclxml%{version}/*.a +%{_libdir}/Tclxml%{version}/*.a %changelog +* Sun Feb 4 2007 Wart - 3.1-11 +- Move package directory back to %%{_libdir} until %%{tcl_sitearch} + is part of the default package search path in Tcl. + * Fri Feb 2 2007 Wart - 3.1-10 - Fix sgmlparser version mismatch - Move package directories to tcl-specific directories From fedora-extras-commits at redhat.com Sun Feb 4 22:10:03 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sun, 4 Feb 2007 17:10:03 -0500 Subject: rpms/pcb import.log,1.24,1.25 Message-ID: <200702042210.l14MA35B017255@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/pcb In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17204 Modified Files: import.log Log Message: auto-import pcb-0.20060822-9 on branch devel from pcb-0.20060822-9.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pcb/import.log,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- import.log 24 Dec 2006 16:25:39 -0000 1.24 +++ import.log 4 Feb 2007 22:09:31 -0000 1.25 @@ -21,3 +21,4 @@ pcb-0_20060822-7:FC-5:pcb-0.20060822-7.src.rpm:1166978157 pcb-0_20060822-7:FC-6:pcb-0.20060822-7.src.rpm:1166978276 pcb-0_20060822-7:HEAD:pcb-0.20060822-7.src.rpm:1166978358 +pcb-0_20060822-9:HEAD:pcb-0.20060822-9.src.rpm:1170627000 From fedora-extras-commits at redhat.com Sun Feb 4 22:10:06 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sun, 4 Feb 2007 17:10:06 -0500 Subject: rpms/pcb/devel pcb.desktop,1.6,1.7 pcb.spec,1.17,1.18 Message-ID: <200702042210.l14MA6j8017259@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/pcb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17204/devel Modified Files: pcb.desktop pcb.spec Log Message: auto-import pcb-0.20060822-9 on branch devel from pcb-0.20060822-9.src.rpm Index: pcb.desktop =================================================================== RCS file: /cvs/extras/rpms/pcb/devel/pcb.desktop,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pcb.desktop 24 Dec 2006 16:25:39 -0000 1.6 +++ pcb.desktop 4 Feb 2007 22:09:33 -0000 1.7 @@ -6,5 +6,5 @@ Type=Application Terminal=false GenericName=PCB -Categories=Science; +Categories=Qt;KDE;Education;Science;Electronics; X-Desktop-File-Install-Version=0.10 \ No newline at end of file Index: pcb.spec =================================================================== RCS file: /cvs/extras/rpms/pcb/devel/pcb.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- pcb.spec 24 Dec 2006 16:25:39 -0000 1.17 +++ pcb.spec 4 Feb 2007 22:09:33 -0000 1.18 @@ -2,7 +2,7 @@ Name: pcb Version: 0.%{pcbver} -Release: 7%{?dist} +Release: 9%{?dist} Summary: An interactive printed circuit board editor License: GPL @@ -95,6 +95,12 @@ ## --- +# Old versions of PCB don't support autoroute, pcb2ncap convert +# pcb format to ncap format used for mucspcb to autoroute the circuit. +# In newer versions of PCB, autoroute is included and pcb2ncap and mucspcb +# are no more needed. +%{__rm} -f %{buildroot}%{_datadir}/%{name}/tools/pcb2ncap.tgz + %clean %{__rm} -rf %{buildroot} @@ -147,6 +153,12 @@ %{_datadir}/%{name}/tutorial/thermal* %Changelog +* Sun Feb 04 2007 Chitlesh Goorah - 0.20060822-9 +- fixed presence in gnome menu + +* Sun Dec 24 2006 Chitlesh Goorah - 0.20060822-8 +- Removed duplicates + * Fri Dec 22 2006 Chitlesh Goorah - 0.20060822-7 - Fixed info files and added to the pcb package #219406 - Fixed man pages (with patch0 to suit fedora packaging of pcb From fedora-extras-commits at redhat.com Sun Feb 4 22:12:38 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sun, 4 Feb 2007 17:12:38 -0500 Subject: rpms/pcb import.log,1.25,1.26 Message-ID: <200702042212.l14MCcqU017357@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/pcb In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17320 Modified Files: import.log Log Message: auto-import pcb-0.20060822-9 on branch FC-5 from pcb-0.20060822-9.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pcb/import.log,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- import.log 4 Feb 2007 22:09:31 -0000 1.25 +++ import.log 4 Feb 2007 22:12:05 -0000 1.26 @@ -22,3 +22,4 @@ pcb-0_20060822-7:FC-6:pcb-0.20060822-7.src.rpm:1166978276 pcb-0_20060822-7:HEAD:pcb-0.20060822-7.src.rpm:1166978358 pcb-0_20060822-9:HEAD:pcb-0.20060822-9.src.rpm:1170627000 +pcb-0_20060822-9:FC-5:pcb-0.20060822-9.src.rpm:1170627153 From fedora-extras-commits at redhat.com Sun Feb 4 22:12:40 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sun, 4 Feb 2007 17:12:40 -0500 Subject: rpms/pcb/FC-5 pcb.desktop,1.5,1.6 pcb.spec,1.13,1.14 Message-ID: <200702042212.l14MCe6g017361@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/pcb/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17320/FC-5 Modified Files: pcb.desktop pcb.spec Log Message: auto-import pcb-0.20060822-9 on branch FC-5 from pcb-0.20060822-9.src.rpm Index: pcb.desktop =================================================================== RCS file: /cvs/extras/rpms/pcb/FC-5/pcb.desktop,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- pcb.desktop 24 Dec 2006 16:22:23 -0000 1.5 +++ pcb.desktop 4 Feb 2007 22:12:08 -0000 1.6 @@ -6,5 +6,5 @@ Type=Application Terminal=false GenericName=PCB -Categories=Science; +Categories=Qt;KDE;Education;Science;Electronics; X-Desktop-File-Install-Version=0.10 \ No newline at end of file Index: pcb.spec =================================================================== RCS file: /cvs/extras/rpms/pcb/FC-5/pcb.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- pcb.spec 24 Dec 2006 16:22:23 -0000 1.13 +++ pcb.spec 4 Feb 2007 22:12:08 -0000 1.14 @@ -2,7 +2,7 @@ Name: pcb Version: 0.%{pcbver} -Release: 7%{?dist} +Release: 9%{?dist} Summary: An interactive printed circuit board editor License: GPL @@ -95,6 +95,12 @@ ## --- +# Old versions of PCB don't support autoroute, pcb2ncap convert +# pcb format to ncap format used for mucspcb to autoroute the circuit. +# In newer versions of PCB, autoroute is included and pcb2ncap and mucspcb +# are no more needed. +%{__rm} -f %{buildroot}%{_datadir}/%{name}/tools/pcb2ncap.tgz + %clean %{__rm} -rf %{buildroot} @@ -147,6 +153,12 @@ %{_datadir}/%{name}/tutorial/thermal* %Changelog +* Sun Feb 04 2007 Chitlesh Goorah - 0.20060822-9 +- fixed presence in gnome menu + +* Sun Dec 24 2006 Chitlesh Goorah - 0.20060822-8 +- Removed duplicates + * Fri Dec 22 2006 Chitlesh Goorah - 0.20060822-7 - Fixed info files and added to the pcb package #219406 - Fixed man pages (with patch0 to suit fedora packaging of pcb From fedora-extras-commits at redhat.com Sun Feb 4 22:14:23 2007 From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu)) Date: Sun, 4 Feb 2007 17:14:23 -0500 Subject: rpms/sysprof-kmod/devel sysprof-kmod.spec,1.30,1.31 Message-ID: <200702042214.l14MENjN017452@cvs-int.fedora.redhat.com> Author: giallu Update of /cvs/extras/rpms/sysprof-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17405 Modified Files: sysprof-kmod.spec Log Message: Rebuild for kernel kernel-2.6.19-1.2919.fc7 Index: sysprof-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/sysprof-kmod/devel/sysprof-kmod.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sysprof-kmod.spec 1 Feb 2007 11:38:01 -0000 1.30 +++ sysprof-kmod.spec 4 Feb 2007 22:13:51 -0000 1.31 @@ -4,7 +4,7 @@ # end stuff to be ... # hardcode for now: -%{!?kversion: %define kversion 2.6.19-1.2917.fc7} +%{!?kversion: %define kversion kernel-2.6.19-1.2919.fc7} # hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g. # --define "kversion 2.6.16-1.2096_FC5" From fedora-extras-commits at redhat.com Sun Feb 4 22:14:57 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sun, 4 Feb 2007 17:14:57 -0500 Subject: rpms/pcb import.log,1.26,1.27 Message-ID: <200702042214.l14MEvJx017526@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/pcb In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17455 Modified Files: import.log Log Message: auto-import pcb-0.20060822-9 on branch FC-6 from pcb-0.20060822-9.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pcb/import.log,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- import.log 4 Feb 2007 22:12:05 -0000 1.26 +++ import.log 4 Feb 2007 22:14:25 -0000 1.27 @@ -23,3 +23,4 @@ pcb-0_20060822-7:HEAD:pcb-0.20060822-7.src.rpm:1166978358 pcb-0_20060822-9:HEAD:pcb-0.20060822-9.src.rpm:1170627000 pcb-0_20060822-9:FC-5:pcb-0.20060822-9.src.rpm:1170627153 +pcb-0_20060822-9:FC-6:pcb-0.20060822-9.src.rpm:1170627296 From fedora-extras-commits at redhat.com Sun Feb 4 22:15:00 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sun, 4 Feb 2007 17:15:00 -0500 Subject: rpms/pcb/FC-6 pcb.desktop,1.6,1.7 pcb.spec,1.17,1.18 Message-ID: <200702042215.l14MF0F2017530@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/pcb/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17455/FC-6 Modified Files: pcb.desktop pcb.spec Log Message: auto-import pcb-0.20060822-9 on branch FC-6 from pcb-0.20060822-9.src.rpm Index: pcb.desktop =================================================================== RCS file: /cvs/extras/rpms/pcb/FC-6/pcb.desktop,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pcb.desktop 24 Dec 2006 16:24:19 -0000 1.6 +++ pcb.desktop 4 Feb 2007 22:14:28 -0000 1.7 @@ -6,5 +6,5 @@ Type=Application Terminal=false GenericName=PCB -Categories=Science; +Categories=Qt;KDE;Education;Science;Electronics; X-Desktop-File-Install-Version=0.10 \ No newline at end of file Index: pcb.spec =================================================================== RCS file: /cvs/extras/rpms/pcb/FC-6/pcb.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- pcb.spec 24 Dec 2006 16:24:19 -0000 1.17 +++ pcb.spec 4 Feb 2007 22:14:28 -0000 1.18 @@ -2,7 +2,7 @@ Name: pcb Version: 0.%{pcbver} -Release: 7%{?dist} +Release: 9%{?dist} Summary: An interactive printed circuit board editor License: GPL @@ -95,6 +95,12 @@ ## --- +# Old versions of PCB don't support autoroute, pcb2ncap convert +# pcb format to ncap format used for mucspcb to autoroute the circuit. +# In newer versions of PCB, autoroute is included and pcb2ncap and mucspcb +# are no more needed. +%{__rm} -f %{buildroot}%{_datadir}/%{name}/tools/pcb2ncap.tgz + %clean %{__rm} -rf %{buildroot} @@ -147,6 +153,12 @@ %{_datadir}/%{name}/tutorial/thermal* %Changelog +* Sun Feb 04 2007 Chitlesh Goorah - 0.20060822-9 +- fixed presence in gnome menu + +* Sun Dec 24 2006 Chitlesh Goorah - 0.20060822-8 +- Removed duplicates + * Fri Dec 22 2006 Chitlesh Goorah - 0.20060822-7 - Fixed info files and added to the pcb package #219406 - Fixed man pages (with patch0 to suit fedora packaging of pcb From fedora-extras-commits at redhat.com Sun Feb 4 22:31:46 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sun, 4 Feb 2007 17:31:46 -0500 Subject: rpms/geda-gschem import.log,1.11,1.12 Message-ID: <200702042231.l14MVkBs017821@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-gschem In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17788 Modified Files: import.log Log Message: auto-import geda-gschem-20061020-3 on branch FC-5 from geda-gschem-20061020-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/geda-gschem/import.log,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- import.log 13 Jan 2007 16:02:25 -0000 1.11 +++ import.log 4 Feb 2007 22:31:14 -0000 1.12 @@ -8,3 +8,4 @@ geda-gschem-20061020-1:HEAD:geda-gschem-20061020-1.src.rpm:1162585258 geda-gschem-20061020-2:FC-6:geda-gschem-20061020-2.src.rpm:1168704418 geda-gschem-20061020-2:HEAD:geda-gschem-20061020-2.src.rpm:1168704501 +geda-gschem-20061020-3:FC-5:geda-gschem-20061020-3.src.rpm:1170628304 From fedora-extras-commits at redhat.com Sun Feb 4 22:31:49 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sun, 4 Feb 2007 17:31:49 -0500 Subject: rpms/geda-gschem/FC-5 geda-gschem.spec, 1.4, 1.5 gschem.desktop, 1.1, 1.2 Message-ID: <200702042231.l14MVnVq017825@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-gschem/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17788/FC-5 Modified Files: geda-gschem.spec gschem.desktop Log Message: auto-import geda-gschem-20061020-3 on branch FC-5 from geda-gschem-20061020-3.src.rpm Index: geda-gschem.spec =================================================================== RCS file: /cvs/extras/rpms/geda-gschem/FC-5/geda-gschem.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- geda-gschem.spec 3 Nov 2006 20:13:01 -0000 1.4 +++ geda-gschem.spec 4 Feb 2007 22:31:16 -0000 1.5 @@ -1,6 +1,6 @@ Name: geda-gschem Version: 20061020 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Electronics schematics editor Group: Applications/Engineering @@ -12,10 +12,6 @@ # Source 2: from the geda package Source2: gschem.xpm -# by Andy Shevchenko #206280 -#TO BE TESTED -#Patch0: geda-gschem-ru.po.diff - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgeda-devel, desktop-file-utils, autoconf, libstroke-devel @@ -27,20 +23,31 @@ %prep %setup -q -#%patch0 -p0 -b ru.po + +# use of guile-1.6 +cp -p configure configure.guile16 +sed -i "s|guile|guile-1.6|" configure +sed -i "s|guile-1.6-config|guile-config-1.6|" configure src/create_proto +sed -i "s|guile-1.6-tools|guile-tools-1.6|" configure +sed -i "s|ac_cv_lib_guile-1.6|ac_cv_lib_guile|" configure +sed -i "s|-lguile-1.6|-lguile16|" configure +sed -i "s|guile-1.6version|guileversion|" configure +sed -i "s|#include |#include |" configure + +# v20061020 : file: include/libgeda.h +# Keep timestamps for files not needed to be modified +for f in `find . -name \*.h -or -name \*.c` ; do + if grep -q libguile $f ; then + sed -i.guile16 -e 's|libguile.h|libguile16.h|' $f + fi + if grep -q 'guile/' $f ; then + sed -i 's|guile/\(.*\)h|guile16/\1h|' $f + fi +done %build -# DO NOT CLEAN this for the next 2 upstream releases -#%{__cp} -p configure.ac configure.ac.gdgeda -#cat configure.ac.gdgeda | \ -# sed -e 's|libgdgeda|gdlib|g'| \ -# sed -e 's|gdgeda|gd|g' \ -# > configure.ac - -#autoconf -#for f in `find . -name \*.c -or -name \*.h` ; do -# sed -i -e 's|gdgeda/gd.h|gd.h|' $f -#done +export GUILE_CFLAGS="-I%{_includedir}/libguile16 -I%{_includedir}/guile16" +export GUILE_LDFLAGS="-L%{_libdir}/guile16" %configure --with-docdir=%{_datadir}/gEDA/docs %{__make} %{?_smp_mflags} @@ -55,9 +62,8 @@ install -p -m 644 examples/README.* %{buildroot}%{_datadir}/gEDA/examples install -p -m 644 scheme/*.scm %{buildroot}%{_datadir}/gEDA/scheme -desktop-file-install --vendor fedora \ - --add-category Engineering \ - --add-category X-Fedora \ +desktop-file-install --vendor "" \ + --add-category Engineering \ --dir %{buildroot}%{_datadir}/applications \ %{SOURCE1} @@ -134,12 +140,18 @@ %{_datadir}/gEDA/gschem-gtkrc %{_datadir}/gEDA/gschem-darkbg %{_datadir}/gEDA/gschem-lightbg -%{_datadir}/applications/fedora-gschem.desktop +%{_datadir}/applications/gschem.desktop %{_datadir}/icons/hicolor/32x32/apps/gschem.xpm %{_mandir}/man1/gschem.* %Changelog +* Sun Feb 04 2007 Chitlesh Goorah - 20061020-3 +- Fixed presence on Gnome menu + +* Mon Jan 08 2007 Chitlesh Goorah - 20061020-2 +- rebuilt under compat-guile-16 + * Thu Nov 02 2006 Chitlesh Goorah - 20061020-1 - New Upstream Release Index: gschem.desktop =================================================================== RCS file: /cvs/extras/rpms/geda-gschem/FC-5/gschem.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gschem.desktop 5 Sep 2006 07:14:54 -0000 1.1 +++ gschem.desktop 4 Feb 2007 22:31:17 -0000 1.2 @@ -7,5 +7,5 @@ Icon=gschem Terminal=false Type=Application -Categories=Education;Science;X-Fedora;Engineering; +Categories=Qt;KDE;Education;Science; X-Desktop-File-Install-Version=0.10 From fedora-extras-commits at redhat.com Sun Feb 4 22:33:33 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sun, 4 Feb 2007 17:33:33 -0500 Subject: rpms/geda-gschem import.log,1.12,1.13 Message-ID: <200702042233.l14MXXM9018246@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-gschem In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18074 Modified Files: import.log Log Message: auto-import geda-gschem-20061020-3 on branch FC-6 from geda-gschem-20061020-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/geda-gschem/import.log,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- import.log 4 Feb 2007 22:31:14 -0000 1.12 +++ import.log 4 Feb 2007 22:33:01 -0000 1.13 @@ -9,3 +9,4 @@ geda-gschem-20061020-2:FC-6:geda-gschem-20061020-2.src.rpm:1168704418 geda-gschem-20061020-2:HEAD:geda-gschem-20061020-2.src.rpm:1168704501 geda-gschem-20061020-3:FC-5:geda-gschem-20061020-3.src.rpm:1170628304 +geda-gschem-20061020-3:FC-6:geda-gschem-20061020-3.src.rpm:1170628410 From fedora-extras-commits at redhat.com Sun Feb 4 22:33:36 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sun, 4 Feb 2007 17:33:36 -0500 Subject: rpms/geda-gschem/FC-6 geda-gschem.spec, 1.5, 1.6 gschem.desktop, 1.2, 1.3 Message-ID: <200702042233.l14MXaDS018258@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-gschem/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18074/FC-6 Modified Files: geda-gschem.spec gschem.desktop Log Message: auto-import geda-gschem-20061020-3 on branch FC-6 from geda-gschem-20061020-3.src.rpm Index: geda-gschem.spec =================================================================== RCS file: /cvs/extras/rpms/geda-gschem/FC-6/geda-gschem.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- geda-gschem.spec 13 Jan 2007 16:01:03 -0000 1.5 +++ geda-gschem.spec 4 Feb 2007 22:33:04 -0000 1.6 @@ -1,6 +1,6 @@ Name: geda-gschem Version: 20061020 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Electronics schematics editor Group: Applications/Engineering @@ -146,6 +146,9 @@ %Changelog +* Sun Feb 04 2007 Chitlesh Goorah - 20061020-3 +- Fixed presence on Gnome menu + * Mon Jan 08 2007 Chitlesh Goorah - 20061020-2 - rebuilt under compat-guile-16 Index: gschem.desktop =================================================================== RCS file: /cvs/extras/rpms/geda-gschem/FC-6/gschem.desktop,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gschem.desktop 13 Jan 2007 16:01:03 -0000 1.2 +++ gschem.desktop 4 Feb 2007 22:33:04 -0000 1.3 @@ -7,5 +7,5 @@ Icon=gschem Terminal=false Type=Application -Categories=Science; +Categories=Qt;KDE;Education;Science; X-Desktop-File-Install-Version=0.10 From fedora-extras-commits at redhat.com Sun Feb 4 22:33:51 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sun, 4 Feb 2007 17:33:51 -0500 Subject: rpms/geda-gattrib import.log,1.9,1.10 Message-ID: <200702042233.l14MXpNG018340@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-gattrib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18171 Modified Files: import.log Log Message: auto-import geda-gattrib-20061020-3 on branch FC-5 from geda-gattrib-20061020-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/geda-gattrib/import.log,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- import.log 13 Jan 2007 16:34:15 -0000 1.9 +++ import.log 4 Feb 2007 22:33:19 -0000 1.10 @@ -6,3 +6,4 @@ geda-gattrib-20061020-1:FC-6:geda-gattrib-20061020-1.src.rpm:1162585153 geda-gattrib-20061020-2:FC-6:geda-gattrib-20061020-2.src.rpm:1168706326 geda-gattrib-20061020-2:HEAD:geda-gattrib-20061020-2.src.rpm:1168706411 +geda-gattrib-20061020-3:FC-5:geda-gattrib-20061020-3.src.rpm:1170628430 From fedora-extras-commits at redhat.com Sun Feb 4 22:33:54 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sun, 4 Feb 2007 17:33:54 -0500 Subject: rpms/geda-gattrib/FC-5 gattrib.desktop, 1.1, 1.2 geda-gattrib.spec, 1.3, 1.4 Message-ID: <200702042233.l14MXsHv018350@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-gattrib/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18171/FC-5 Modified Files: gattrib.desktop geda-gattrib.spec Log Message: auto-import geda-gattrib-20061020-3 on branch FC-5 from geda-gattrib-20061020-3.src.rpm Index: gattrib.desktop =================================================================== RCS file: /cvs/extras/rpms/geda-gattrib/FC-5/gattrib.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gattrib.desktop 5 Sep 2006 15:15:40 -0000 1.1 +++ gattrib.desktop 4 Feb 2007 22:33:21 -0000 1.2 @@ -7,5 +7,5 @@ Icon=gattrib Terminal=false Type=Application -Categories=Education;Science;X-Fedora;Engineering; +Categories=Qt;KDE;Education;Science; Version=20050820 Index: geda-gattrib.spec =================================================================== RCS file: /cvs/extras/rpms/geda-gattrib/FC-5/geda-gattrib.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- geda-gattrib.spec 3 Nov 2006 20:13:17 -0000 1.3 +++ geda-gattrib.spec 4 Feb 2007 22:33:21 -0000 1.4 @@ -1,6 +1,6 @@ Name: geda-gattrib Version: 20061020 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Attribute editor for gEDA Group: Applications/Engineering @@ -14,7 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgeda-devel, desktop-file-utils -#, autoconf + Requires: geda-symbols %description @@ -30,18 +30,30 @@ %prep %setup -q +# use of guile-1.6 +cp -p configure configure.guile16 +sed -i "s|guile|guile-1.6|" configure +sed -i "s|guile-1.6-tools|guile-tools-1.6|" configure +sed -i "s|ac_cv_lib_guile-1.6|ac_cv_lib_guile|" configure +sed -i "s|-lguile-1.6|-lguile16|" configure +sed -i "s|guile-1.6version|guileversion|" configure +sed -i "s|#include |#include |" configure + +# v20061020 : file: include/libgeda.h +# Keep timestamps for files not needed to be modified +for f in `find . -name \*.h -or -name \*.c` ; do + if grep -q libguile $f ; then + sed -i.guile16 -e 's|libguile.h|libguile16.h|' $f + fi + if grep -q 'guile/' $f ; then + sed -i 's|guile/\(.*\)h|guile16/\1h|' $f + fi +done + %build -#NOT TO BE CLEAN for the next two upstream releases -#%{__cp} -p configure.ac configure.ac.gdgeda -#cat configure.ac.gdgeda | \ -# sed -e 's|libgdgeda|gdlib|g'| \ -# sed -e 's|gdgeda|gd|g' \ -# > configure.ac - -#autoconf -#for f in `find . -name \*.c -or -name \*.h` ; do -# sed -i -e 's|gdgeda/gd.h|gd.h|' $f -#done +export GUILE_CFLAGS="-I%{_includedir}/libguile16 -I%{_includedir}/guile16" +export GUILE_LDFLAGS="-L%{_libdir}/guile16" + %configure %{__make} %{?_smp_mflags} @@ -50,10 +62,9 @@ %{__rm} -rf %{buildroot} %{__make} INSTALL="install -p" install DESTDIR=%{buildroot} -desktop-file-install --vendor=fedora \ +desktop-file-install --vendor="" \ --add-category Engineering \ --dir=%{buildroot}%{_datadir}/applications \ - --add-category=X-Fedora \ %{SOURCE1} %{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/ @@ -85,10 +96,16 @@ %doc design/{gEDA_Structures_updated.png,ProgramArchitecture.gnumeric} %{_bindir}/gattrib %{_datadir}/gEDA/system-gattribrc -%{_datadir}/applications/fedora-gattrib.desktop +%{_datadir}/applications/gattrib.desktop %{_datadir}/icons/hicolor/32x32/apps/gattrib.xpm %Changelog +* Sun Feb 04 2007 Chitlesh Goorah - 20061020-3 +- Fixed presence on Gnome menu + +* Mon Jan 08 2007 Chitlesh Goorah - 20061020-2 +- rebuilt under compat-guile-16 + * Thu Nov 02 2006 Chitlesh Goorah - 20061020-1 - New upstream Release From fedora-extras-commits at redhat.com Sun Feb 4 22:35:02 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sun, 4 Feb 2007 17:35:02 -0500 Subject: rpms/geda-gschem import.log,1.13,1.14 Message-ID: <200702042235.l14MZ2js018680@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-gschem In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18504 Modified Files: import.log Log Message: auto-import geda-gschem-20061020-3 on branch devel from geda-gschem-20061020-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/geda-gschem/import.log,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- import.log 4 Feb 2007 22:33:01 -0000 1.13 +++ import.log 4 Feb 2007 22:34:30 -0000 1.14 @@ -10,3 +10,4 @@ geda-gschem-20061020-2:HEAD:geda-gschem-20061020-2.src.rpm:1168704501 geda-gschem-20061020-3:FC-5:geda-gschem-20061020-3.src.rpm:1170628304 geda-gschem-20061020-3:FC-6:geda-gschem-20061020-3.src.rpm:1170628410 +geda-gschem-20061020-3:HEAD:geda-gschem-20061020-3.src.rpm:1170628488 From fedora-extras-commits at redhat.com Sun Feb 4 22:35:04 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sun, 4 Feb 2007 17:35:04 -0500 Subject: rpms/geda-gschem/devel geda-gschem.spec, 1.5, 1.6 gschem.desktop, 1.2, 1.3 Message-ID: <200702042235.l14MZ48i018693@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-gschem/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18504/devel Modified Files: geda-gschem.spec gschem.desktop Log Message: auto-import geda-gschem-20061020-3 on branch devel from geda-gschem-20061020-3.src.rpm Index: geda-gschem.spec =================================================================== RCS file: /cvs/extras/rpms/geda-gschem/devel/geda-gschem.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- geda-gschem.spec 13 Jan 2007 16:02:25 -0000 1.5 +++ geda-gschem.spec 4 Feb 2007 22:34:32 -0000 1.6 @@ -1,6 +1,6 @@ Name: geda-gschem Version: 20061020 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Electronics schematics editor Group: Applications/Engineering @@ -146,6 +146,9 @@ %Changelog +* Sun Feb 04 2007 Chitlesh Goorah - 20061020-3 +- Fixed presence on Gnome menu + * Mon Jan 08 2007 Chitlesh Goorah - 20061020-2 - rebuilt under compat-guile-16 Index: gschem.desktop =================================================================== RCS file: /cvs/extras/rpms/geda-gschem/devel/gschem.desktop,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gschem.desktop 13 Jan 2007 16:02:25 -0000 1.2 +++ gschem.desktop 4 Feb 2007 22:34:32 -0000 1.3 @@ -7,5 +7,5 @@ Icon=gschem Terminal=false Type=Application -Categories=Science; +Categories=Qt;KDE;Education;Science; X-Desktop-File-Install-Version=0.10 From fedora-extras-commits at redhat.com Sun Feb 4 22:35:19 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sun, 4 Feb 2007 17:35:19 -0500 Subject: rpms/geda-gattrib import.log,1.10,1.11 Message-ID: <200702042235.l14MZJtO018770@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-gattrib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18595 Modified Files: import.log Log Message: auto-import geda-gattrib-20061020-3 on branch FC-6 from geda-gattrib-20061020-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/geda-gattrib/import.log,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- import.log 4 Feb 2007 22:33:19 -0000 1.10 +++ import.log 4 Feb 2007 22:34:46 -0000 1.11 @@ -7,3 +7,4 @@ geda-gattrib-20061020-2:FC-6:geda-gattrib-20061020-2.src.rpm:1168706326 geda-gattrib-20061020-2:HEAD:geda-gattrib-20061020-2.src.rpm:1168706411 geda-gattrib-20061020-3:FC-5:geda-gattrib-20061020-3.src.rpm:1170628430 +geda-gattrib-20061020-3:FC-6:geda-gattrib-20061020-3.src.rpm:1170628516 From fedora-extras-commits at redhat.com Sun Feb 4 22:35:21 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sun, 4 Feb 2007 17:35:21 -0500 Subject: rpms/geda-gattrib/FC-6 gattrib.desktop, 1.2, 1.3 geda-gattrib.spec, 1.4, 1.5 Message-ID: <200702042235.l14MZLpk018783@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-gattrib/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18595/FC-6 Modified Files: gattrib.desktop geda-gattrib.spec Log Message: auto-import geda-gattrib-20061020-3 on branch FC-6 from geda-gattrib-20061020-3.src.rpm Index: gattrib.desktop =================================================================== RCS file: /cvs/extras/rpms/geda-gattrib/FC-6/gattrib.desktop,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gattrib.desktop 13 Jan 2007 16:32:50 -0000 1.2 +++ gattrib.desktop 4 Feb 2007 22:34:49 -0000 1.3 @@ -7,5 +7,5 @@ Icon=gattrib Terminal=false Type=Application -Categories=Science; +Categories=Qt;KDE;Education;Science; Version=20050820 Index: geda-gattrib.spec =================================================================== RCS file: /cvs/extras/rpms/geda-gattrib/FC-6/geda-gattrib.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- geda-gattrib.spec 13 Jan 2007 16:32:50 -0000 1.4 +++ geda-gattrib.spec 4 Feb 2007 22:34:49 -0000 1.5 @@ -1,6 +1,6 @@ Name: geda-gattrib Version: 20061020 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Attribute editor for gEDA Group: Applications/Engineering @@ -100,6 +100,9 @@ %{_datadir}/icons/hicolor/32x32/apps/gattrib.xpm %Changelog +* Sun Feb 04 2007 Chitlesh Goorah - 20061020-3 +- Fixed presence on Gnome menu + * Mon Jan 08 2007 Chitlesh Goorah - 20061020-2 - rebuilt under compat-guile-16 From fedora-extras-commits at redhat.com Sun Feb 4 22:36:35 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sun, 4 Feb 2007 17:36:35 -0500 Subject: rpms/geda-gattrib import.log,1.11,1.12 Message-ID: <200702042236.l14MaZ6j019185@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-gattrib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18984 Modified Files: import.log Log Message: auto-import geda-gattrib-20061020-3 on branch devel from geda-gattrib-20061020-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/geda-gattrib/import.log,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- import.log 4 Feb 2007 22:34:46 -0000 1.11 +++ import.log 4 Feb 2007 22:36:03 -0000 1.12 @@ -8,3 +8,4 @@ geda-gattrib-20061020-2:HEAD:geda-gattrib-20061020-2.src.rpm:1168706411 geda-gattrib-20061020-3:FC-5:geda-gattrib-20061020-3.src.rpm:1170628430 geda-gattrib-20061020-3:FC-6:geda-gattrib-20061020-3.src.rpm:1170628516 +geda-gattrib-20061020-3:HEAD:geda-gattrib-20061020-3.src.rpm:1170628594 From fedora-extras-commits at redhat.com Sun Feb 4 22:36:38 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sun, 4 Feb 2007 17:36:38 -0500 Subject: rpms/geda-gattrib/devel gattrib.desktop, 1.2, 1.3 geda-gattrib.spec, 1.4, 1.5 Message-ID: <200702042236.l14MacSb019196@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-gattrib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18984/devel Modified Files: gattrib.desktop geda-gattrib.spec Log Message: auto-import geda-gattrib-20061020-3 on branch devel from geda-gattrib-20061020-3.src.rpm Index: gattrib.desktop =================================================================== RCS file: /cvs/extras/rpms/geda-gattrib/devel/gattrib.desktop,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gattrib.desktop 13 Jan 2007 16:34:16 -0000 1.2 +++ gattrib.desktop 4 Feb 2007 22:36:05 -0000 1.3 @@ -7,5 +7,5 @@ Icon=gattrib Terminal=false Type=Application -Categories=Science; +Categories=Qt;KDE;Education;Science; Version=20050820 Index: geda-gattrib.spec =================================================================== RCS file: /cvs/extras/rpms/geda-gattrib/devel/geda-gattrib.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- geda-gattrib.spec 13 Jan 2007 16:34:16 -0000 1.4 +++ geda-gattrib.spec 4 Feb 2007 22:36:05 -0000 1.5 @@ -1,6 +1,6 @@ Name: geda-gattrib Version: 20061020 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Attribute editor for gEDA Group: Applications/Engineering @@ -100,6 +100,9 @@ %{_datadir}/icons/hicolor/32x32/apps/gattrib.xpm %Changelog +* Sun Feb 04 2007 Chitlesh Goorah - 20061020-3 +- Fixed presence on Gnome menu + * Mon Jan 08 2007 Chitlesh Goorah - 20061020-2 - rebuilt under compat-guile-16 From fedora-extras-commits at redhat.com Sun Feb 4 23:25:35 2007 From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier)) Date: Sun, 4 Feb 2007 18:25:35 -0500 Subject: rpms/testdisk pkg.acl,NONE,1.1 Message-ID: <200702042325.l14NPZIk027825@cvs-int.fedora.redhat.com> Author: grenier Update of /cvs/extras/rpms/testdisk In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27808/testdisk Added Files: pkg.acl Log Message: Add empty pkg.acl Fix russian description in spec file --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Sun Feb 4 23:26:08 2007 From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier)) Date: Sun, 4 Feb 2007 18:26:08 -0500 Subject: rpms/testdisk/devel testdisk.spec,1.9,1.10 Message-ID: <200702042326.l14NQ8wP027851@cvs-int.fedora.redhat.com> Author: grenier Update of /cvs/extras/rpms/testdisk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27808/testdisk/devel Modified Files: testdisk.spec Log Message: Add empty pkg.acl Fix russian description in spec file Index: testdisk.spec =================================================================== RCS file: /cvs/extras/rpms/testdisk/devel/testdisk.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- testdisk.spec 26 Nov 2006 10:17:12 -0000 1.9 +++ testdisk.spec 4 Feb 2007 23:25:36 -0000 1.10 @@ -1,10 +1,10 @@ Summary: Tool to check and undelete partition Summary(pl): Narz??dzie sprawdzaj??ce i odzyskuj??ce partycje Summary(fr): Outil pour v??rifier et restorer des partitions -Summary(ru_RU.KOI8-R): ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ?????????? +Summary(ru_RU.UTF8): ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ?????????? Name: testdisk Version: 6.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/System Source0: http://www.cgsecurity.org/testdisk-%{version}.tar.bz2 @@ -31,9 +31,9 @@ FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS -%description -l ru_RU.KOI8-R -?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????. -???????????????????????? ?????????????????? ???????? ????????????????: +%description -l ru_RU.UTF8 +?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????. +???????????????????????? ?????????????????? ???????? ????????????????: FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS @@ -58,6 +58,9 @@ %{_mandir}/man1/testdisk.1* %{_mandir}/man1/photorec.1* %changelog +* Mon Feb 5 2007 Christophe Grenier 6.5-3 +- Fix russian description in spec file + * Tue Nov 26 2006 Christophe Grenier 6.5-2 - Use ntfsprogs to provide NTFS listing capabilities to TestDisk From fedora-extras-commits at redhat.com Mon Feb 5 00:47:28 2007 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Sun, 4 Feb 2007 19:47:28 -0500 Subject: rpms/smart/FC-5 smart.spec,1.10,1.11 sources,1.5,1.6 Message-ID: <200702050047.l150lSLL031704@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/smart/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31652/FC-5 Modified Files: smart.spec sources Log Message: Adjust checks for autotools; Backbuilds for live distros. Index: smart.spec =================================================================== RCS file: /cvs/extras/rpms/smart/FC-5/smart.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- smart.spec 25 Nov 2006 16:30:30 -0000 1.10 +++ smart.spec 5 Feb 2007 00:46:56 -0000 1.11 @@ -1,9 +1,10 @@ -%{!?python_sitearch: %define python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%bcond_without ksmarttray +%bcond_without pygtk Summary: Next generation package handling tool Name: smart -Version: 0.42 -Release: 40%{?dist} +Version: 0.50 +Release: 45%{?dist} License: GPL Group: Applications/System URL: http://labix.org/smart/ @@ -14,18 +15,21 @@ Source4: distro.py Source5: ksmarttray.desktop Patch0: smart-0.42-autofs5fix.patch +Patch1: smart-0.50-ccache.patch +Patch2: smart-0.50-auto.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: python-devel >= 2.3 BuildRequires: desktop-file-utils - -BuildRequires: autoconf, automake, gettext, gcc-c++ +BuildRequires: gettext +%if %{with ksmarttray} +BuildRequires: autoconf, automake, gcc-c++ BuildRequires: libXt-devel, libXext-devel BuildRequires: qt-devel >= 1:3.2, kdelibs-devel BuildRequires: zlib-devel - +%endif Requires: python-abi = %(python -c "import sys ; print sys.version[:3]") Requires: rpm-python >= 4.4 - +%{!?with_pygtk:Requires: usermode} Requires: smart-config %description @@ -40,6 +44,7 @@ Allows execution of 'smart update' by normal users through a special suid command. +%if %{with pygtk} %package gui Summary: Graphical user interface for the smart package manager Group: Applications/System @@ -50,7 +55,9 @@ %description gui Graphical user interface for the smart package manager. +%endif +%if %{with ksmarttray} %package -n ksmarttray Summary: KDE tray program for watching updates with Smart Package Manager Group: Applications/System @@ -60,10 +67,13 @@ %description -n ksmarttray KDE tray program for watching updates with Smart Package Manager. +%endif %prep %setup -q %patch0 -p1 -b .autofs5 +%patch1 -p0 -b .ccache +%patch2 -p1 # /usr/lib is hardcoded perl -pi -e's,/usr/lib/,%{_libdir}/,' smart/const.py @@ -72,12 +82,14 @@ export CFLAGS python setup.py build +%if %{with ksmarttray} # ksmarttray pushd contrib/ksmarttray make -f admin/Makefile.common %configure --disable-rpath make popd +%endif # smart-update make -C contrib/smart-update @@ -90,12 +102,14 @@ mkdir -p %{buildroot}%{_sysconfdir}/smart/channels mkdir -p %{buildroot}%{_localstatedir}/lib/smart{/packages,/channels} +%if %{with ksmarttray} # ksmarttray make -C contrib/ksmarttray install DESTDIR=%{buildroot} \ iconsdir=%{_datadir}/icons/hicolor/48x48/apps desktop-file-install --vendor="" \ --dir %{buildroot}%{_datadir}/applications \ %{SOURCE5} +%endif # usermode support ln -sf consolehelper %{buildroot}%{_bindir}/smart-root @@ -156,24 +170,47 @@ %defattr(-,root,root,-) %{_bindir}/smart-update +%if %{with pygtk} %files gui %defattr(-,root,root,-) %{python_sitearch}/smart/interfaces/gtk %{_datadir}/applications/smart.desktop %{_datadir}/icons/hicolor/48x48/apps/smart.png +%else +%exclude %{python_sitearch}/smart/interfaces/gtk +%exclude %{_datadir}/applications/smart.desktop +%exclude %{_datadir}/icons/hicolor/48x48/apps/smart.png +%endif %{_bindir}/smart-root %config %{_sysconfdir}/security/console.apps/smart-root %config %{_sysconfdir}/pam.d/smart-root +%if %{with ksmarttray} %files -n ksmarttray %defattr(-,root,root,-) %{_bindir}/ksmarttray %{_datadir}/apps/ksmarttray %{_datadir}/applications/ksmarttray.desktop %{_datadir}/icons/hicolor/48x48/apps/ksmarttray.png +%endif %changelog +* Mon Feb 5 2007 Axel Thimm - 0.50-45 +- Adjust checks for autotools. + +* Mon Jan 22 2007 Axel Thimm - 0.50-44 +- Add ccache fix from svn trunk. + +* Sun Jan 21 2007 Axel Thimm - 0.50-43 +- gettext is BR'd outside of ksmarttray. + +* Thu Jan 18 2007 Axel Thimm - 0.50-42 +- Update to 0.50. + +* Fri Dec 8 2006 Axel Thimm - 0.50-41_rc1 +- Update to 0.50rc1. + * Sat Nov 25 2006 Axel Thimm - 0.42-40 - Start preparing virtual provides for upcoming qt gui. Index: sources =================================================================== RCS file: /cvs/extras/rpms/smart/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 1 Sep 2006 22:34:43 -0000 1.5 +++ sources 5 Feb 2007 00:46:56 -0000 1.6 @@ -1,3 +1,5 @@ -e60b411ad41dbe2e6fc57a04d82f91cb smart-0.42.tar.bz2 -df30892687c1768dd009f6a61b57a8fb smart-0.42-autofs5fix.patch +7595df0259829fff64496f1c359a53cf smart-0.50.tar.bz2 +044e7fb260f201b23f6b0554fd70243e smart-0.50-ccache.patch +371a72eff80e2e98e37d29275a1f5e9d smart-0.42-autofs5fix.patch 3e758faa20a498f27deabb0f773a923d ksmarttray.desktop +258ec68f8762e787352f39a9e8414115 smart-0.50-auto.patch From fedora-extras-commits at redhat.com Mon Feb 5 00:47:33 2007 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Sun, 4 Feb 2007 19:47:33 -0500 Subject: rpms/smart/devel .cvsignore, 1.7, 1.8 smart.spec, 1.18, 1.19 sources, 1.8, 1.9 Message-ID: <200702050047.l150lXk1031713@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/smart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31652/devel Modified Files: .cvsignore smart.spec sources Log Message: Adjust checks for autotools; Backbuilds for live distros. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/smart/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 3 Feb 2007 01:46:56 -0000 1.7 +++ .cvsignore 5 Feb 2007 00:47:01 -0000 1.8 @@ -2,3 +2,4 @@ smart-0.50-ccache.patch smart-0.42-autofs5fix.patch ksmarttray.desktop +smart-0.50-auto.patch Index: smart.spec =================================================================== RCS file: /cvs/extras/rpms/smart/devel/smart.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- smart.spec 3 Feb 2007 02:40:39 -0000 1.18 +++ smart.spec 5 Feb 2007 00:47:01 -0000 1.19 @@ -1,12 +1,10 @@ -%define python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)") - -%bcond_with ksmarttray +%bcond_without ksmarttray %bcond_without pygtk Summary: Next generation package handling tool Name: smart Version: 0.50 -Release: 44%{?dist} +Release: 45%{?dist} License: GPL Group: Applications/System URL: http://labix.org/smart/ @@ -18,6 +16,7 @@ Source5: ksmarttray.desktop Patch0: smart-0.42-autofs5fix.patch Patch1: smart-0.50-ccache.patch +Patch2: smart-0.50-auto.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: python-devel >= 2.3 BuildRequires: desktop-file-utils @@ -74,6 +73,7 @@ %setup -q %patch0 -p1 -b .autofs5 %patch1 -p0 -b .ccache +%patch2 -p1 # /usr/lib is hardcoded perl -pi -e's,/usr/lib/,%{_libdir}/,' smart/const.py @@ -196,6 +196,9 @@ %endif %changelog +* Mon Feb 5 2007 Axel Thimm - 0.50-45 +- Adjust checks for autotools. + * Mon Jan 22 2007 Axel Thimm - 0.50-44 - Add ccache fix from svn trunk. Index: sources =================================================================== RCS file: /cvs/extras/rpms/smart/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 3 Feb 2007 01:46:57 -0000 1.8 +++ sources 5 Feb 2007 00:47:01 -0000 1.9 @@ -2,3 +2,4 @@ 044e7fb260f201b23f6b0554fd70243e smart-0.50-ccache.patch 371a72eff80e2e98e37d29275a1f5e9d smart-0.42-autofs5fix.patch 3e758faa20a498f27deabb0f773a923d ksmarttray.desktop +258ec68f8762e787352f39a9e8414115 smart-0.50-auto.patch From fedora-extras-commits at redhat.com Mon Feb 5 00:47:31 2007 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Sun, 4 Feb 2007 19:47:31 -0500 Subject: rpms/smart/FC-6 smart.spec,1.11,1.12 sources,1.6,1.7 Message-ID: <200702050047.l150lV2W031708@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/smart/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31652/FC-6 Modified Files: smart.spec sources Log Message: Adjust checks for autotools; Backbuilds for live distros. Index: smart.spec =================================================================== RCS file: /cvs/extras/rpms/smart/FC-6/smart.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- smart.spec 25 Nov 2006 16:30:35 -0000 1.11 +++ smart.spec 5 Feb 2007 00:46:59 -0000 1.12 @@ -1,9 +1,10 @@ -%{!?python_sitearch: %define python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%bcond_without ksmarttray +%bcond_without pygtk Summary: Next generation package handling tool Name: smart -Version: 0.42 -Release: 40%{?dist} +Version: 0.50 +Release: 45%{?dist} License: GPL Group: Applications/System URL: http://labix.org/smart/ @@ -14,18 +15,21 @@ Source4: distro.py Source5: ksmarttray.desktop Patch0: smart-0.42-autofs5fix.patch +Patch1: smart-0.50-ccache.patch +Patch2: smart-0.50-auto.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: python-devel >= 2.3 BuildRequires: desktop-file-utils - -BuildRequires: autoconf, automake, gettext, gcc-c++ +BuildRequires: gettext +%if %{with ksmarttray} +BuildRequires: autoconf, automake, gcc-c++ BuildRequires: libXt-devel, libXext-devel BuildRequires: qt-devel >= 1:3.2, kdelibs-devel BuildRequires: zlib-devel - +%endif Requires: python-abi = %(python -c "import sys ; print sys.version[:3]") Requires: rpm-python >= 4.4 - +%{!?with_pygtk:Requires: usermode} Requires: smart-config %description @@ -40,6 +44,7 @@ Allows execution of 'smart update' by normal users through a special suid command. +%if %{with pygtk} %package gui Summary: Graphical user interface for the smart package manager Group: Applications/System @@ -50,7 +55,9 @@ %description gui Graphical user interface for the smart package manager. +%endif +%if %{with ksmarttray} %package -n ksmarttray Summary: KDE tray program for watching updates with Smart Package Manager Group: Applications/System @@ -60,10 +67,13 @@ %description -n ksmarttray KDE tray program for watching updates with Smart Package Manager. +%endif %prep %setup -q %patch0 -p1 -b .autofs5 +%patch1 -p0 -b .ccache +%patch2 -p1 # /usr/lib is hardcoded perl -pi -e's,/usr/lib/,%{_libdir}/,' smart/const.py @@ -72,12 +82,14 @@ export CFLAGS python setup.py build +%if %{with ksmarttray} # ksmarttray pushd contrib/ksmarttray make -f admin/Makefile.common %configure --disable-rpath make popd +%endif # smart-update make -C contrib/smart-update @@ -90,12 +102,14 @@ mkdir -p %{buildroot}%{_sysconfdir}/smart/channels mkdir -p %{buildroot}%{_localstatedir}/lib/smart{/packages,/channels} +%if %{with ksmarttray} # ksmarttray make -C contrib/ksmarttray install DESTDIR=%{buildroot} \ iconsdir=%{_datadir}/icons/hicolor/48x48/apps desktop-file-install --vendor="" \ --dir %{buildroot}%{_datadir}/applications \ %{SOURCE5} +%endif # usermode support ln -sf consolehelper %{buildroot}%{_bindir}/smart-root @@ -156,24 +170,47 @@ %defattr(-,root,root,-) %{_bindir}/smart-update +%if %{with pygtk} %files gui %defattr(-,root,root,-) %{python_sitearch}/smart/interfaces/gtk %{_datadir}/applications/smart.desktop %{_datadir}/icons/hicolor/48x48/apps/smart.png +%else +%exclude %{python_sitearch}/smart/interfaces/gtk +%exclude %{_datadir}/applications/smart.desktop +%exclude %{_datadir}/icons/hicolor/48x48/apps/smart.png +%endif %{_bindir}/smart-root %config %{_sysconfdir}/security/console.apps/smart-root %config %{_sysconfdir}/pam.d/smart-root +%if %{with ksmarttray} %files -n ksmarttray %defattr(-,root,root,-) %{_bindir}/ksmarttray %{_datadir}/apps/ksmarttray %{_datadir}/applications/ksmarttray.desktop %{_datadir}/icons/hicolor/48x48/apps/ksmarttray.png +%endif %changelog +* Mon Feb 5 2007 Axel Thimm - 0.50-45 +- Adjust checks for autotools. + +* Mon Jan 22 2007 Axel Thimm - 0.50-44 +- Add ccache fix from svn trunk. + +* Sun Jan 21 2007 Axel Thimm - 0.50-43 +- gettext is BR'd outside of ksmarttray. + +* Thu Jan 18 2007 Axel Thimm - 0.50-42 +- Update to 0.50. + +* Fri Dec 8 2006 Axel Thimm - 0.50-41_rc1 +- Update to 0.50rc1. + * Sat Nov 25 2006 Axel Thimm - 0.42-40 - Start preparing virtual provides for upcoming qt gui. Index: sources =================================================================== RCS file: /cvs/extras/rpms/smart/FC-6/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 30 Sep 2006 09:29:31 -0000 1.6 +++ sources 5 Feb 2007 00:46:59 -0000 1.7 @@ -1,3 +1,5 @@ -e60b411ad41dbe2e6fc57a04d82f91cb smart-0.42.tar.bz2 -3e758faa20a498f27deabb0f773a923d ksmarttray.desktop +7595df0259829fff64496f1c359a53cf smart-0.50.tar.bz2 +044e7fb260f201b23f6b0554fd70243e smart-0.50-ccache.patch 371a72eff80e2e98e37d29275a1f5e9d smart-0.42-autofs5fix.patch +3e758faa20a498f27deabb0f773a923d ksmarttray.desktop +258ec68f8762e787352f39a9e8414115 smart-0.50-auto.patch From fedora-extras-commits at redhat.com Mon Feb 5 01:06:07 2007 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Sun, 4 Feb 2007 20:06:07 -0500 Subject: rpms/smart/devel smart.spec,1.19,1.20 Message-ID: <200702050106.l15167px002801@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/smart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2746/devel Modified Files: smart.spec Log Message: Bart, write 100 times: "I will never nuke python_sitearch again!" Index: smart.spec =================================================================== RCS file: /cvs/extras/rpms/smart/devel/smart.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- smart.spec 5 Feb 2007 00:47:01 -0000 1.19 +++ smart.spec 5 Feb 2007 01:05:34 -0000 1.20 @@ -1,3 +1,5 @@ +%define python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)") + %bcond_without ksmarttray %bcond_without pygtk From fedora-extras-commits at redhat.com Mon Feb 5 01:06:02 2007 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Sun, 4 Feb 2007 20:06:02 -0500 Subject: rpms/smart/FC-5 smart.spec,1.11,1.12 Message-ID: <200702050106.l151621b002795@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/smart/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2746/FC-5 Modified Files: smart.spec Log Message: Bart, write 100 times: "I will never nuke python_sitearch again!" Index: smart.spec =================================================================== RCS file: /cvs/extras/rpms/smart/FC-5/smart.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- smart.spec 5 Feb 2007 00:46:56 -0000 1.11 +++ smart.spec 5 Feb 2007 01:05:29 -0000 1.12 @@ -1,3 +1,5 @@ +%define python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)") + %bcond_without ksmarttray %bcond_without pygtk From fedora-extras-commits at redhat.com Mon Feb 5 01:06:04 2007 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Sun, 4 Feb 2007 20:06:04 -0500 Subject: rpms/smart/FC-6 smart.spec,1.12,1.13 Message-ID: <200702050106.l15164re002798@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/smart/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2746/FC-6 Modified Files: smart.spec Log Message: Bart, write 100 times: "I will never nuke python_sitearch again!" Index: smart.spec =================================================================== RCS file: /cvs/extras/rpms/smart/FC-6/smart.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- smart.spec 5 Feb 2007 00:46:59 -0000 1.12 +++ smart.spec 5 Feb 2007 01:05:32 -0000 1.13 @@ -1,3 +1,5 @@ +%define python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)") + %bcond_without ksmarttray %bcond_without pygtk From fedora-extras-commits at redhat.com Mon Feb 5 01:12:07 2007 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Sun, 4 Feb 2007 20:12:07 -0500 Subject: rpms/mediawiki/devel .cvsignore, 1.8, 1.9 mediawiki.spec, 1.13, 1.14 sources, 1.8, 1.9 Message-ID: <200702050112.l151C7ah002971@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/mediawiki/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2935 Modified Files: .cvsignore mediawiki.spec sources Log Message: Update to 1.9.2 - sync with ATrpms' version. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mediawiki/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 9 Jan 2007 12:35:07 -0000 1.8 +++ .cvsignore 5 Feb 2007 01:11:34 -0000 1.9 @@ -1 +1,2 @@ -mediawiki-1.8.3.tar.gz +mediawiki-1.9.2.tar.gz +mediawiki-1.9.1-commoncode.patch Index: mediawiki.spec =================================================================== RCS file: /cvs/extras/rpms/mediawiki/devel/mediawiki.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- mediawiki.spec 9 Jan 2007 12:35:07 -0000 1.13 +++ mediawiki.spec 5 Feb 2007 01:11:34 -0000 1.14 @@ -1,49 +1,37 @@ -%define wikidir %{_var}/www/mediawiki - -Name: mediawiki -Version: 1.8.3 -Release: 7%{?dist} Summary: A wiki engine - -Group: Applications/Internet +Name: mediawiki +Version: 1.9.2 +Release: 33%{?dist} License: GPL -URL: http://www.mediawiki.org/ -Source0: http://dl.sourceforge.net/sourceforge/wikipedia/mediawiki-%{version}.tar.gz -Source1: mediawiki-httpd.conf -Source2: mediawiki-install.txt +Group: Development/Tools +URL: http://wikipedia.sourceforge.net/ +Source0: http://prdownloads.sourceforge.net/wikipedia/%{name}-%{version}.tar.gz +Patch0: mediawiki-1.9.1-commoncode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root - -Requires: httpd -Requires: php >= 5 -Requires: php-mysql -Requires: php-gd, diffutils, ImageMagick +BuildRequires: ocaml >= 3.06 # to make sure the "apache" group is created before mediawiki is installed Requires(pre): httpd +Requires: php >= 5, php-xml +Requires: php-mysql, php-pgsql +Requires: diffutils, ImageMagick, php-gd +Requires: tetex-latex, tetex-dvips +Provides: mediawiki-math = %{version}-%{release} +Obsoletes: mediawiki-math < %{version}-%{release} %description -MediaWiki is the software used for Wikipedia (http://www.wikipedia.org) and -the other Wikimedia Foundation websites. Compared to other wikis, it has a -wide range of features and support for high-traffic websites using -multiple servers. - -Mathematics support is included in the package mediawiki-math. - -%package math -Summary: Mathematical formula support for MediaWiki -Group: Applications/Internet - -BuildRequires: ocaml >= 3.06 -Requires: mediawiki = %{version}-%{release} -Requires: ImageMagick, tetex-latex, tetex-dvips - -%description math -This package includes the support for mathematical formulas in MediaWiki. +MediaWiki is the software used for Wikipedia and the other Wikimedia +Foundation websites. Compared to other wikis, it has an excellent +range of features and support for high-traffic websites using multiple +servers + +This package supports wiki farms. Copy /var/www/wiki over to the +desired wiki location and configure it through the web +interface. Remember to remove the config dir after completing the +configuration. %prep %setup -q -install -D -m 644 %{SOURCE2} ./INSTALL.fedora -rm -rf tests includes/zhtable skins/disabled -rm -f `find -name ".[ch]*"` +%patch -p1 -b .commoncode %build cd math @@ -51,105 +39,122 @@ %install rm -rf %{buildroot} -install -d %{buildroot}%{wikidir} -#cp -pr *.php config extensions images includes languages serialized %{buildroot}%{wikidir} -#cp -pr maintenance skins [[:lower:]]*.* %{buildroot}%{wikidir} -cp -a * %{buildroot}%{wikidir}/ -rm -fr %{buildroot}%{wikidir}/docs %{buildroot}%{wikidir}/math -find %{buildroot} -name .svnignore | xargs -r rm -%{__chmod} 755 %{buildroot}%{wikidir}/maintenance/*.pl - -install -d %{buildroot}%{wikidir}/math -install math/texvc %{buildroot}%{wikidir}/math +mkdir -p %{buildroot}%{_datadir}/mediawiki +cp -a * %{buildroot}%{_datadir}/mediawiki/ -install -D -m 644 %{SOURCE1} \ - %{buildroot}%{_sysconfdir}/httpd/conf.d/mediawiki.conf +# remove undeeded parts +rm -fr %{buildroot}%{_datadir}/mediawiki/{t,test} +rm -fr %{buildroot}%{_datadir}/mediawiki/includes/zhtable +find %{buildroot}%{_datadir}/mediawiki/ \ + \( -name .htaccess -or -name \*.cmi \) \ + | xargs rm + +# fix permissions +chmod +x %{buildroot}%{_datadir}/mediawiki/bin/* +find %{buildroot}%{_datadir}/mediawiki -name \*.pl | xargs chmod +x + +# move arch dependent parts +if test ! -d %{buildroot}%{_libdir}/mediawiki/math; then + mkdir -p %{buildroot}%{_libdir}/mediawiki + mv %{buildroot}%{_datadir}/mediawiki/math \ + %{buildroot}%{_libdir}/mediawiki/ +fi + +find %{buildroot} -name .svnignore | xargs rm +find %{buildroot} -name \*.commoncode | xargs rm + +mkdir -p %{buildroot}/var/www/wiki +cd %{buildroot}/var/www/wiki/ +mkdir images +cp -a %{buildroot}%{_datadir}/mediawiki/config . +ln -s %{_datadir}/mediawiki/index.php index.php %clean rm -rf %{buildroot} - %files %defattr(-,root,root,-) %doc COPYING FAQ HISTORY README RELEASE-NOTES UPGRADE -%doc INSTALL.fedora -%doc docs +%{_datadir}/mediawiki +%attr(-,apache,apache) %dir %{_datadir}/mediawiki/config +%{_datadir}/mediawiki/config +%{_libdir}/mediawiki +/var/www/wiki +%attr(-,apache,apache) %dir /var/www/wiki/config +/var/www/wiki/config/* -%config(noreplace) %{_sysconfdir}/httpd/conf.d/mediawiki.conf +%changelog +* Mon Feb 5 2007 Axel Thimm - 1.9.2-33 +- Update to 1.9.2. -%dir %{wikidir} -%{wikidir}/[^cd]*[^h] -%attr(770,root,apache) %dir %{wikidir}/config -%{wikidir}/config/index.php +* Fri Feb 2 2007 Axel Thimm - 1.9.1-32 +- Fix permissions. +- Remove some parts not needed at runtime anymore. +* Thu Feb 1 2007 Axel Thimm - 1.9.1-31 +- Update to 1.9.1. -%files math -%defattr(-,root,root,-) -%dir %{wikidir}/math -%doc math/README math/TODO -%{wikidir}/math/texvc +* Sat Oct 14 2006 Axel Thimm - 1.8.2-28 +- Update to 1.8.2. +* Wed Oct 11 2006 Axel Thimm - 1.8.1-27 +- Update to 1.8.1. +- Update to 1.8.0. -%changelog -* Tue Jan 9 2007 Axel Thimm - 1.8.3-7 -- Update to 1.8.3. -- Update fixes an XSS injection vulnerability in the AJAX module. - -* Thu Nov 23 2006 Axel Thimm - 1.8.2-6 -- Crude all-in-opt-out file inclusion policy for now to quick-fix some - open bugs. - -* Thu Nov 2 2006 Axel Thimm - 1.8.2-5 -- Fix depenencies, add versions. -- Add missing *.php files. -- Cosmetic changes. +* Mon Jul 10 2006 Axel Thimm +- Update to 1.7.1. -* Sat Oct 14 2006 Axel Thimm - 1.8.2-4 -- Update to 1.8.2. +* Wed Jun 7 2006 Axel Thimm +- Update to 1.6.7. -* Wed Oct 11 2006 Axel Thimm - 1.8.1-3 -- Update to 1.8.1. +* Fri May 26 2006 Axel Thimm +- Update to 1.6.6. -* Wed Oct 11 2006 Axel Thimm - 1.8.0-2 -- Update to 1.8.0. -- And php-gd, diffutils, ImageMagick as dependencies +* Thu Apr 13 2006 Axel Thimm +- Update to 1.6.3. + +* Sat Apr 8 2006 Axel Thimm +- Update to 1.6.2. + +* Fri Apr 7 2006 Axel Thimm +- Update to 1.6.1. + +* Mon Apr 3 2006 Axel Thimm +- Update to 1.5.8. + +* Thu Mar 2 2006 Axel Thimm +- Update to 1.5.7. + +* Thu Jan 19 2006 Axel Thimm +- Update to 1.5.6. -* Mon Apr 03 2006 Roozbeh Pournader - 1.5.8-1 -- Update to upstream 1.5.8 (contains security fixes) +* Fri Jan 6 2006 Axel Thimm +- Update to 1.5.5. -* Thu Mar 02 2006 Roozbeh Pournader - 1.5.7-1 -- Update to upstream 1.5.7 +* Sun Dec 4 2005 Axel Thimm +- Update to 1.5.3. -* Mon Feb 13 2006 Roozbeh Pournader - 1.5.6-6 -- Rebuild for Fedora Extras 5 +* Fri Nov 4 2005 Axel Thimm +- Update to 1.5.2. -* Mon Feb 06 2006 Roozbeh Pournader - 1.5.6-5 -- Put internal doc files in the right directory, renaming it - back to docs (#180177) +* Mon Oct 31 2005 Axel Thimm +- Update to 1.5.1. -* Sat Feb 04 2006 Roozbeh Pournader - 1.5.6-4 -- Use Requires(pre) instead of PreReq (Mike McGrath) +* Thu Oct 6 2005 Axel Thimm +- Update to 1.5.0. -* Thu Feb 02 2006 Roozbeh Pournader - 1.5.6-3 -- Refactor the %%files section (Mike McGrath) -- Replace "/etc" with macro -- Package docs under %%{_defaultdocdir}/internals -- Minor change in description +* Fri Sep 2 2005 Axel Thimm +- Update to 1.5rc4. -* Tue Jan 31 2006 Roozbeh Pournader - 1.5.6-2 -- Add %%defattr for -math subpackage -- Fixed typo in description +* Sun Jul 31 2005 Axel Thimm +- Update to 1.5beta4. -* Tue Jan 31 2006 Roozbeh Pournader - 1.5.6-1 -- Update to upstream 1.5.6 +* Fri Jul 8 2005 Axel Thimm +- Update to 1.5beta3. -* Sun Jan 15 2006 Roozbeh Pournader - 1.5.5-3 -- Add PreReq for httpd, since we use the apache user -- Make mediawiki-math dependencies more specific -- Package documentation for mediawiki-math +* Tue Jul 5 2005 Axel Thimm +- Update to 1.5beta2. -* Sat Jan 14 2006 Roozbeh Pournader - 1.5.5-2 -- Separate math support into a subpackage +* Sun Jul 3 2005 Axel Thimm +- Initial build. -* Thu Jan 12 2006 Roozbeh Pournader - 1.5.5-1 -- Initial packaging Index: sources =================================================================== RCS file: /cvs/extras/rpms/mediawiki/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 9 Jan 2007 12:35:07 -0000 1.8 +++ sources 5 Feb 2007 01:11:35 -0000 1.9 @@ -1 +1,2 @@ -9ef825abfcf0888b22571bbb097480f0 mediawiki-1.8.3.tar.gz +c11aa0fd7ac10529606511913649a411 mediawiki-1.9.2.tar.gz +d2fa9f438e9af6cc88ded2cf2af3a07c mediawiki-1.9.1-commoncode.patch From fedora-extras-commits at redhat.com Mon Feb 5 03:23:03 2007 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sun, 4 Feb 2007 22:23:03 -0500 Subject: rpms/osgal/FC-5 osgal.spec,1.6,1.7 Message-ID: <200702050323.l153N3UN010323@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/osgal/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10257/FC-5 Modified Files: osgal.spec Log Message: bug #227290 Index: osgal.spec =================================================================== RCS file: /cvs/extras/rpms/osgal/FC-5/osgal.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- osgal.spec 29 Jan 2007 22:59:30 -0000 1.6 +++ osgal.spec 5 Feb 2007 03:22:30 -0000 1.7 @@ -1,6 +1,6 @@ Name: osgal Version: 20060903 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Adapts OpenSceneGraph to use OpenAL++ Group: System Environment/Libraries @@ -29,6 +29,8 @@ %prep %setup -q -n %{name}-cvs-%{version} +sed -i -e 's/^\(CXXFLAGS="[^"]*\)/\1 $CXXFLAGS/' configure.in +chmod -x {include,src}/osg*/* autoreconf --force --install # Fix rpmlint errors @@ -36,8 +38,8 @@ %build -%configure --disable-static -CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} +%configure --disable-static --disable-dependency-tracking +make %{?_smp_mflags} %install @@ -75,6 +77,9 @@ %changelog +* Sun Feb 04 2007 Christopher Stone 20060903-3 +- Fix setting of CFLAGS in configure.in bug #227290 + * Mon Jan 29 2007 Christopher Stone 20060903-2 - Whitespace cleanups - Remove unncessary BuildRequires From fedora-extras-commits at redhat.com Mon Feb 5 03:23:08 2007 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sun, 4 Feb 2007 22:23:08 -0500 Subject: rpms/osgal/devel osgal.spec,1.6,1.7 Message-ID: <200702050323.l153N8MV010332@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/osgal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10257/devel Modified Files: osgal.spec Log Message: bug #227290 Index: osgal.spec =================================================================== RCS file: /cvs/extras/rpms/osgal/devel/osgal.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- osgal.spec 29 Jan 2007 22:59:35 -0000 1.6 +++ osgal.spec 5 Feb 2007 03:22:36 -0000 1.7 @@ -1,6 +1,6 @@ Name: osgal Version: 20060903 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Adapts OpenSceneGraph to use OpenAL++ Group: System Environment/Libraries @@ -29,6 +29,8 @@ %prep %setup -q -n %{name}-cvs-%{version} +sed -i -e 's/^\(CXXFLAGS="[^"]*\)/\1 $CXXFLAGS/' configure.in +chmod -x {include,src}/osg*/* autoreconf --force --install # Fix rpmlint errors @@ -36,8 +38,8 @@ %build -%configure --disable-static -CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} +%configure --disable-static --disable-dependency-tracking +make %{?_smp_mflags} %install @@ -75,6 +77,9 @@ %changelog +* Sun Feb 04 2007 Christopher Stone 20060903-3 +- Fix setting of CFLAGS in configure.in bug #227290 + * Mon Jan 29 2007 Christopher Stone 20060903-2 - Whitespace cleanups - Remove unncessary BuildRequires From fedora-extras-commits at redhat.com Mon Feb 5 03:29:37 2007 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sun, 4 Feb 2007 22:29:37 -0500 Subject: rpms/openalpp/FC-5 openalpp.spec,1.11,1.12 Message-ID: <200702050329.l153Tbed010426@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/openalpp/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10379/FC-5 Modified Files: openalpp.spec Log Message: fix bug #227287 Index: openalpp.spec =================================================================== RCS file: /cvs/extras/rpms/openalpp/FC-5/openalpp.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- openalpp.spec 15 Jan 2007 16:09:58 -0000 1.11 +++ openalpp.spec 5 Feb 2007 03:29:05 -0000 1.12 @@ -1,6 +1,6 @@ Name: openalpp Version: 20060714 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Object Oriented version of OpenAL Group: System Environment/Libraries @@ -30,10 +30,12 @@ %prep %setup -q -n %{name}-cvs-%{version} +sed -i -e 's/^\(CXXFLAGS="[^"]*\)/\1 $CXXFLAGS/' configure +find -name "*.cpp" -o -name "*.h" | xargs chmod -c -x %build -%configure --disable-static +%configure --disable-static --disable-dependency-tracking make %{?_smp_mflags} @@ -69,6 +71,9 @@ %changelog +* Sun Feb 04 2007 Christohper Stone 20060714-3 +- Fix parsing of CFLAGS in configure, bug #227287 + * Mon Jan 15 2007 Christopher Stone 20060714-2 - Fix Requires for devel subpackage From fedora-extras-commits at redhat.com Mon Feb 5 03:29:40 2007 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sun, 4 Feb 2007 22:29:40 -0500 Subject: rpms/openalpp/FC-6 openalpp.spec,1.12,1.13 Message-ID: <200702050329.l153TeKA010429@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/openalpp/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10379/FC-6 Modified Files: openalpp.spec Log Message: fix bug #227287 Index: openalpp.spec =================================================================== RCS file: /cvs/extras/rpms/openalpp/FC-6/openalpp.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- openalpp.spec 15 Jan 2007 16:09:59 -0000 1.12 +++ openalpp.spec 5 Feb 2007 03:29:08 -0000 1.13 @@ -1,6 +1,6 @@ Name: openalpp Version: 20060714 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Object Oriented version of OpenAL Group: System Environment/Libraries @@ -30,10 +30,12 @@ %prep %setup -q -n %{name}-cvs-%{version} +sed -i -e 's/^\(CXXFLAGS="[^"]*\)/\1 $CXXFLAGS/' configure +find -name "*.cpp" -o -name "*.h" | xargs chmod -c -x %build -%configure --disable-static +%configure --disable-static --disable-dependency-tracking make %{?_smp_mflags} @@ -69,6 +71,9 @@ %changelog +* Sun Feb 04 2007 Christohper Stone 20060714-3 +- Fix parsing of CFLAGS in configure, bug #227287 + * Mon Jan 15 2007 Christopher Stone 20060714-2 - Fix Requires for devel subpackage From fedora-extras-commits at redhat.com Mon Feb 5 03:29:42 2007 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sun, 4 Feb 2007 22:29:42 -0500 Subject: rpms/openalpp/devel openalpp.spec,1.12,1.13 Message-ID: <200702050329.l153Tg9B010432@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/openalpp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10379/devel Modified Files: openalpp.spec Log Message: fix bug #227287 Index: openalpp.spec =================================================================== RCS file: /cvs/extras/rpms/openalpp/devel/openalpp.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- openalpp.spec 15 Jan 2007 16:10:04 -0000 1.12 +++ openalpp.spec 5 Feb 2007 03:29:10 -0000 1.13 @@ -1,6 +1,6 @@ Name: openalpp Version: 20060714 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Object Oriented version of OpenAL Group: System Environment/Libraries @@ -30,10 +30,12 @@ %prep %setup -q -n %{name}-cvs-%{version} +sed -i -e 's/^\(CXXFLAGS="[^"]*\)/\1 $CXXFLAGS/' configure +find -name "*.cpp" -o -name "*.h" | xargs chmod -c -x %build -%configure --disable-static +%configure --disable-static --disable-dependency-tracking make %{?_smp_mflags} @@ -69,6 +71,9 @@ %changelog +* Sun Feb 04 2007 Christohper Stone 20060714-3 +- Fix parsing of CFLAGS in configure, bug #227287 + * Mon Jan 15 2007 Christopher Stone 20060714-2 - Fix Requires for devel subpackage From fedora-extras-commits at redhat.com Mon Feb 5 03:23:05 2007 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sun, 4 Feb 2007 22:23:05 -0500 Subject: rpms/osgal/FC-6 osgal.spec,1.6,1.7 Message-ID: <200702050323.l153N5Qj010326@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/osgal/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10257/FC-6 Modified Files: osgal.spec Log Message: bug #227290 Index: osgal.spec =================================================================== RCS file: /cvs/extras/rpms/osgal/FC-6/osgal.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- osgal.spec 29 Jan 2007 22:59:30 -0000 1.6 +++ osgal.spec 5 Feb 2007 03:22:33 -0000 1.7 @@ -1,6 +1,6 @@ Name: osgal Version: 20060903 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Adapts OpenSceneGraph to use OpenAL++ Group: System Environment/Libraries @@ -29,6 +29,8 @@ %prep %setup -q -n %{name}-cvs-%{version} +sed -i -e 's/^\(CXXFLAGS="[^"]*\)/\1 $CXXFLAGS/' configure.in +chmod -x {include,src}/osg*/* autoreconf --force --install # Fix rpmlint errors @@ -36,8 +38,8 @@ %build -%configure --disable-static -CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} +%configure --disable-static --disable-dependency-tracking +make %{?_smp_mflags} %install @@ -75,6 +77,9 @@ %changelog +* Sun Feb 04 2007 Christopher Stone 20060903-3 +- Fix setting of CFLAGS in configure.in bug #227290 + * Mon Jan 29 2007 Christopher Stone 20060903-2 - Whitespace cleanups - Remove unncessary BuildRequires From fedora-extras-commits at redhat.com Mon Feb 5 06:09:46 2007 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Mon, 5 Feb 2007 01:09:46 -0500 Subject: rpms/rlwrap/devel rlwrap.spec,1.1,1.2 Message-ID: <200702050609.l1569k6J021303@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/rlwrap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21279 Modified Files: rlwrap.spec Log Message: Rebuild to remove libtermcap dependency Index: rlwrap.spec =================================================================== RCS file: /cvs/extras/rpms/rlwrap/devel/rlwrap.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rlwrap.spec 29 Nov 2006 00:33:48 -0000 1.1 +++ rlwrap.spec 5 Feb 2007 06:09:14 -0000 1.2 @@ -1,6 +1,6 @@ Name: rlwrap Version: 0.28 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Wrapper for GNU readline Group: Applications/Text @@ -48,5 +48,8 @@ %changelog +* Mon Feb 5 2007 Michel Salim 0.28-2 +- Rebuild for Fedora 7, removing dependency on libtermcap + * Tue Nov 28 2006 Michel Salim 0.28-1 - Initial package From fedora-extras-commits at redhat.com Mon Feb 5 09:03:00 2007 From: fedora-extras-commits at redhat.com (Daniel Malmgren (danielm)) Date: Mon, 5 Feb 2007 04:03:00 -0500 Subject: rpms/initng-ifiles/devel libpath.patch, NONE, 1.1 initng-ifiles.spec, 1.3, 1.4 Message-ID: <200702050903.l15930wv032294@cvs-int.fedora.redhat.com> Author: danielm Update of /cvs/extras/rpms/initng-ifiles/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32145 Modified Files: initng-ifiles.spec Added Files: libpath.patch Log Message: initng-ifiles-0.0.7-2, trying to solve an issue with hardcoded /lib path libpath.patch: --- NEW FILE libpath.patch --- diff -Naur svn4749/cmake/InitngMacros.cmake svn4752/cmake/InitngMacros.cmake --- cmake/InitngMacros.cmake 2007-02-01 03:56:42.000000000 +0100 +++ cmake/InitngMacros.cmake 2007-02-04 20:26:14.000000000 +0100 @@ -32,9 +32,9 @@ FOREACH(_current_FILE ${ARGN}) SET(_runlevel_FILE ${CMAKE_CURRENT_BINARY_DIR}/${_current_FILE}) ADD_CUSTOM_COMMAND(OUTPUT ${_runlevel_FILE} - COMMAND ${CMAKE_SOURCE_DIR}/genrunlevel + COMMAND ${CMAKE_BINARY_DIR}/genrunlevel ARGS -confdir ${CMAKE_CURRENT_BINARY_DIR} ${_current_FILE} > /dev/null 2>&1 - DEPENDS ${CMAKE_SOURCE_DIR}/genrunlevel) + DEPENDS ${CMAKE_SOURCE_DIR}/genrunlevel.in) SET(_runlevel_FILES ${_runlevel_FILES} ${_runlevel_FILE}) diff -Naur svn4749/CMakeLists.txt svn4752/CMakeLists.txt --- CMakeLists.txt 2007-02-04 20:03:04.000000000 +0100 +++ CMakeLists.txt 2007-02-04 20:31:02.000000000 +0100 @@ -41,9 +41,9 @@ ADD_SUBDIRECTORY(fixes) ENDIF(INSTALL_FIXES) -INSTALL_PROGRAMS(${SBIN_INSTALL_DIR} FILES genrunlevel) +INSTALL_PROGRAMS(${SBIN_INSTALL_DIR} FILES ${CMAKE_CURRENT_BINARY_DIR}/genrunlevel) FILE(GLOB GENRUNLEVEL_LIBS "libgenrunlevel/lib*") -INSTALL_PROGRAMS(/lib FILES ${GENRUNLEVEL_LIBS}) +INSTALL_PROGRAMS(${LIB_INSTALL_DIR} FILES ${GENRUNLEVEL_LIBS}) IF(INSTALL_RUNLEVELS) SET(RUNLEVEL_FILES @@ -63,6 +63,11 @@ "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY) +CONFIGURE_FILE( + "${CMAKE_CURRENT_SOURCE_DIR}/genrunlevel.in" + "${CMAKE_CURRENT_BINARY_DIR}/genrunlevel" + IMMEDIATE @ONLY) + ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") diff -Naur svn4749/genrunlevel svn4752/genrunlevel --- genrunlevel 2007-01-21 02:03:53.000000000 +0100 +++ genrunlevel 1970-01-01 01:00:00.000000000 +0100 @@ -1,98 +0,0 @@ -#!/bin/bash - -# -# Search for libgenrunlevel -# -LIB=${0%/*}/libgenrunlevel -[ -d ${LIB} ] || LIB=/lib -LIB+=/libgenrunlevel - -if [ ! -e ${LIB} ]; then - echo "ERROR: ${LIB} not found!" - exit 1 -fi - -# -# Load libgenrunlevel -# -. ${LIB} - - -[ ${#} -eq 0 ] && set -e -- -help - -while [ ${#} -gt 0 ]; do - case "${1}" in - -all) - all=true - ;; - -overwrite) - overwrite=true - ;; - -dist=*) - distro=${1#-dist=} - ;; - -dist) - shift - dist=${1} - ;; - -path=*) - search_path=${1#-path=} - ;; - -path) - shift - search_path=${1} - ;; - -destdir=*) - DESTDIR=${1#-destdir=} - ;; - -destdir) - shift - DESTDIR=${1} - ;; - -confdir=*) - CONFDIR=${1#-confdir=} - ;; - -confdir) - shift - CONFDIR=${1} - ;; - -help) - echo 'USAGE:' >&2 - echo " ${0} [-overwrite] [-path=PATH] [-destdir=PATH] [-confdir=PATH] -all" >&2 - echo " ${0} [-overwrite] [-path=PATH] [-destdir=PATH] [-confdir=PATH] FILE" >&2 - echo " ${0} -help" >&2 - exit 0 - ;; - --) - shift - break - ;; - *) - break - ;; - esac - shift -done - -[ "${CONFDIR}" ] || CONFDIR="${DESTDIR}/etc/initng" -mkdir -p "${CONFDIR}" - -[ "${search_path}" ] || search_path=$(echo $( - for dir in $()/bin /sbin /usr/bin /usr/sbin /usr/kde/\*/bin \ - /usr/kde/\*/sbin /opt/bin /opt/sbin /opt/\*/bin \ - /opt/\*/sbin /usr/local/sbin /usr/local/bin - do [ "$(echo ${dir})" ] && echo ${dir} - done | grep -v '*') -) - -[ "${all}" ] && set -- $(get_runlevels) - -for l; do - create_list ${l} -done - -for rl in ${runlevels}; do - write_runlevel ${rl} > "${CONFDIR}/${rl}" -done - -echo "Done generating files." diff -Naur svn4749/genrunlevel.in svn4752/genrunlevel.in --- genrunlevel.in 1970-01-01 01:00:00.000000000 +0100 +++ genrunlevel.in 2007-02-04 20:26:35.000000000 +0100 @@ -0,0 +1,98 @@ +#!/bin/bash + +# +# Search for libgenrunlevel +# +LIB=${0%/*}/libgenrunlevel +[ -d ${LIB} ] || LIB="@LIB_INSTALL_DIR@" +LIB+=/libgenrunlevel + +if [ ! -e ${LIB} ]; then + echo "ERROR: ${LIB} not found!" + exit 1 +fi + +# +# Load libgenrunlevel +# +. ${LIB} + + +[ ${#} -eq 0 ] && set -e -- -help + +while [ ${#} -gt 0 ]; do + case "${1}" in + -all) + all=true + ;; + -overwrite) + overwrite=true + ;; + -dist=*) + distro=${1#-dist=} + ;; + -dist) + shift + dist=${1} + ;; + -path=*) + search_path=${1#-path=} + ;; + -path) + shift + search_path=${1} + ;; + -destdir=*) + DESTDIR=${1#-destdir=} + ;; + -destdir) + shift + DESTDIR=${1} + ;; + -confdir=*) + CONFDIR=${1#-confdir=} + ;; + -confdir) + shift + CONFDIR=${1} + ;; + -help) + echo 'USAGE:' >&2 + echo " ${0} [-overwrite] [-path=PATH] [-destdir=PATH] [-confdir=PATH] -all" >&2 + echo " ${0} [-overwrite] [-path=PATH] [-destdir=PATH] [-confdir=PATH] FILE" >&2 + echo " ${0} -help" >&2 + exit 0 + ;; + --) + shift + break + ;; + *) + break + ;; + esac + shift +done + +[ "${CONFDIR}" ] || CONFDIR="${DESTDIR}/etc/initng" +mkdir -p "${CONFDIR}" + +[ "${search_path}" ] || search_path=$(echo $( + for dir in $()/bin /sbin /usr/bin /usr/sbin /usr/kde/\*/bin \ + /usr/kde/\*/sbin /opt/bin /opt/sbin /opt/\*/bin \ + /opt/\*/sbin /usr/local/sbin /usr/local/bin + do [ "$(echo ${dir})" ] && echo ${dir} + done | grep -v '*') +) + +[ "${all}" ] && set -- $(get_runlevels) + +for l; do + create_list ${l} +done + +for rl in ${runlevels}; do + write_runlevel ${rl} > "${CONFDIR}/${rl}" +done + +echo "Done generating files." Index: initng-ifiles.spec =================================================================== RCS file: /cvs/extras/rpms/initng-ifiles/devel/initng-ifiles.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- initng-ifiles.spec 4 Feb 2007 19:00:21 -0000 1.3 +++ initng-ifiles.spec 5 Feb 2007 09:02:28 -0000 1.4 @@ -1,7 +1,7 @@ Summary: Scripts for initng Name: initng-ifiles Version: 0.0.7 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL URL: http://www.initng.org Group: System Environment/Base @@ -10,6 +10,7 @@ BuildRequires: cmake initng-devel Requires: filesystem Provides: initng(ifiles) +patch0: libpath.patch %description Initng is a full replacement of the old and in many ways deprecated sysvinit @@ -17,6 +18,7 @@ %prep %setup -q +%patch0 -p0 -b .libpath %build export CFLAGS="$RPM_OPT_FLAGS" @@ -50,11 +52,14 @@ /sbin/genrunlevel /sbin/install_service /sbin/ng-update -/lib/libgenrunlevel* +/%{_lib}/libgenrunlevel* /%{_lib}/initng %{_mandir}/*/* %changelog +* Mon Feb 05 2007 Daniel Malmgren 0.0.7-2 +- Fixed issue with hardcoded /lib path, using patch from upstreams svn + * Sun Feb 04 2007 Daniel Malmgren 0.0.7-1 - New upstreams version - Upstreams has migrated from the old cludgy gen_system_runlevel to From fedora-extras-commits at redhat.com Mon Feb 5 09:47:48 2007 From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp)) Date: Mon, 5 Feb 2007 04:47:48 -0500 Subject: rpms/espeak/devel .cvsignore, 1.4, 1.5 espeak.spec, 1.4, 1.5 sources, 1.4, 1.5 espeak-1.18-makefile_lpthread.patch, 1.1, NONE espeak-1.18-makefile_smp.patch, 1.1, NONE espeak-1.18-ptr_64bit.patch, 1.1, NONE Message-ID: <200702050947.l159lmFs000488@cvs-int.fedora.redhat.com> Author: faucamp Update of /cvs/extras/rpms/espeak/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv444 Modified Files: .cvsignore espeak.spec sources Removed Files: espeak-1.18-makefile_lpthread.patch espeak-1.18-makefile_smp.patch espeak-1.18-ptr_64bit.patch Log Message: - Update to version 1.19 - Removed "espeak-1.18-makefile_lpthread" patch as it has been included upstream - Removed "espeak-1.18-makefile_smp" patch as it has been included upstream - Removed "espeak-1.18-ptr_64bit" patch as it has been solved upstream - Fixed espeak-data file permissions Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/espeak/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 15 Jan 2007 14:07:28 -0000 1.4 +++ .cvsignore 5 Feb 2007 09:47:16 -0000 1.5 @@ -1 +1 @@ -espeak-1.18-source.zip +espeak-1.19-source.zip Index: espeak.spec =================================================================== RCS file: /cvs/extras/rpms/espeak/devel/espeak.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- espeak.spec 16 Jan 2007 16:17:08 -0000 1.4 +++ espeak.spec 5 Feb 2007 09:47:16 -0000 1.5 @@ -1,15 +1,12 @@ Name: espeak -Version: 1.18 -Release: 2%{?dist} +Version: 1.19 +Release: 1%{?dist} Summary: Software speech synthesizer (text-to-speech) Group: Applications/Multimedia License: GPL URL: http://espeak.sourceforge.net Source0: http://kent.dl.sourceforge.net/sourceforge/espeak/espeak-%{version}-source.zip -Patch0: espeak-1.18-makefile_lpthread.patch -Patch1: espeak-1.18-ptr_64bit.patch -Patch2: espeak-1.18-makefile_smp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: portaudio-devel @@ -40,10 +37,8 @@ %prep %setup -q -n espeak-%{version}-source -chmod 0644 src/* -%patch0 -p1 -b .lpthread -%patch1 -p1 -b .ptr_64bit -%patch2 -p1 -b .makefile_smp +# Fix file permissions +find . -type f -exec chmod 0644 {} ";" # Prepare documentation mv docs html sed -i 's/\r//' License.txt @@ -86,6 +81,13 @@ %changelog +* Fri Jan 26 2007 Francois Aucamp - 1.19-1 +- Update to version 1.19 +- Removed "espeak-1.18-makefile_lpthread" patch as it has been included upstream +- Removed "espeak-1.18-makefile_smp" patch as it has been included upstream +- Removed "espeak-1.18-ptr_64bit" patch as it has been solved upstream +- Fixed espeak-data file permissions + * Tue Jan 16 2007 Francois Aucamp - 1.18-2 - Created "espeak-1.18-ptr_64bit" patch to allow compilation on x86_64 (fixes 64-bit pointer issues) - Created "espeak-1.18-makefile_smp" patch to allow parallel make ("_smp_mflags") Index: sources =================================================================== RCS file: /cvs/extras/rpms/espeak/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 15 Jan 2007 14:07:28 -0000 1.4 +++ sources 5 Feb 2007 09:47:16 -0000 1.5 @@ -1 +1 @@ -8e5ed7ff85c56ca2c5f2fcaba36df110 espeak-1.18-source.zip +49d70bd49f7cc7c1151f5973ee26c152 espeak-1.19-source.zip --- espeak-1.18-makefile_lpthread.patch DELETED --- --- espeak-1.18-makefile_smp.patch DELETED --- --- espeak-1.18-ptr_64bit.patch DELETED --- From fedora-extras-commits at redhat.com Mon Feb 5 09:54:27 2007 From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp)) Date: Mon, 5 Feb 2007 04:54:27 -0500 Subject: rpms/espeak/FC-6 .cvsignore, 1.4, 1.5 espeak.spec, 1.4, 1.5 sources, 1.4, 1.5 espeak-1.18-makefile_lpthread.patch, 1.1, NONE espeak-1.18-makefile_smp.patch, 1.1, NONE espeak-1.18-ptr_64bit.patch, 1.1, NONE Message-ID: <200702050954.l159sRgH000668@cvs-int.fedora.redhat.com> Author: faucamp Update of /cvs/extras/rpms/espeak/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv643 Modified Files: .cvsignore espeak.spec sources Removed Files: espeak-1.18-makefile_lpthread.patch espeak-1.18-makefile_smp.patch espeak-1.18-ptr_64bit.patch Log Message: - Update to version 1.19 - Removed "espeak-1.18-makefile_lpthread" patch as it has been included upstream - Removed "espeak-1.18-makefile_smp" patch as it has been included upstream - Removed "espeak-1.18-ptr_64bit" patch as it has been solved upstream - Fixed espeak-data file permissions Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/espeak/FC-6/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 15 Jan 2007 14:17:18 -0000 1.4 +++ .cvsignore 5 Feb 2007 09:53:55 -0000 1.5 @@ -1 +1 @@ -espeak-1.18-source.zip +espeak-1.19-source.zip Index: espeak.spec =================================================================== RCS file: /cvs/extras/rpms/espeak/FC-6/espeak.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- espeak.spec 16 Jan 2007 16:22:41 -0000 1.4 +++ espeak.spec 5 Feb 2007 09:53:55 -0000 1.5 @@ -1,15 +1,12 @@ Name: espeak -Version: 1.18 -Release: 2%{?dist} +Version: 1.19 +Release: 1%{?dist} Summary: Software speech synthesizer (text-to-speech) Group: Applications/Multimedia License: GPL URL: http://espeak.sourceforge.net Source0: http://kent.dl.sourceforge.net/sourceforge/espeak/espeak-%{version}-source.zip -Patch0: espeak-1.18-makefile_lpthread.patch -Patch1: espeak-1.18-ptr_64bit.patch -Patch2: espeak-1.18-makefile_smp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: portaudio-devel @@ -40,10 +37,8 @@ %prep %setup -q -n espeak-%{version}-source -chmod 0644 src/* -%patch0 -p1 -b .lpthread -%patch1 -p1 -b .ptr_64bit -%patch2 -p1 -b .makefile_smp +# Fix file permissions +find . -type f -exec chmod 0644 {} ";" # Prepare documentation mv docs html sed -i 's/\r//' License.txt @@ -86,6 +81,13 @@ %changelog +* Fri Jan 26 2007 Francois Aucamp - 1.19-1 +- Update to version 1.19 +- Removed "espeak-1.18-makefile_lpthread" patch as it has been included upstream +- Removed "espeak-1.18-makefile_smp" patch as it has been included upstream +- Removed "espeak-1.18-ptr_64bit" patch as it has been solved upstream +- Fixed espeak-data file permissions + * Tue Jan 16 2007 Francois Aucamp - 1.18-2 - Created "espeak-1.18-ptr_64bit" patch to allow compilation on x86_64 (fixes 64-bit pointer issues) - Created "espeak-1.18-makefile_smp" patch to allow parallel make ("_smp_mflags") Index: sources =================================================================== RCS file: /cvs/extras/rpms/espeak/FC-6/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 15 Jan 2007 14:17:18 -0000 1.4 +++ sources 5 Feb 2007 09:53:55 -0000 1.5 @@ -1 +1 @@ -8e5ed7ff85c56ca2c5f2fcaba36df110 espeak-1.18-source.zip +49d70bd49f7cc7c1151f5973ee26c152 espeak-1.19-source.zip --- espeak-1.18-makefile_lpthread.patch DELETED --- --- espeak-1.18-makefile_smp.patch DELETED --- --- espeak-1.18-ptr_64bit.patch DELETED --- From fedora-extras-commits at redhat.com Mon Feb 5 09:58:16 2007 From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp)) Date: Mon, 5 Feb 2007 04:58:16 -0500 Subject: rpms/espeak/FC-5 .cvsignore, 1.4, 1.5 espeak.spec, 1.4, 1.5 sources, 1.4, 1.5 espeak-1.18-makefile_lpthread.patch, 1.1, NONE espeak-1.18-makefile_smp.patch, 1.1, NONE espeak-1.18-ptr_64bit.patch, 1.1, NONE Message-ID: <200702050958.l159wG75000767@cvs-int.fedora.redhat.com> Author: faucamp Update of /cvs/extras/rpms/espeak/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv744 Modified Files: .cvsignore espeak.spec sources Removed Files: espeak-1.18-makefile_lpthread.patch espeak-1.18-makefile_smp.patch espeak-1.18-ptr_64bit.patch Log Message: - Update to version 1.19 - Removed "espeak-1.18-makefile_lpthread" patch as it has been included upstream - Removed "espeak-1.18-makefile_smp" patch as it has been included upstream - Removed "espeak-1.18-ptr_64bit" patch as it has been solved upstream - Fixed espeak-data file permissions Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/espeak/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 15 Jan 2007 14:21:26 -0000 1.4 +++ .cvsignore 5 Feb 2007 09:57:44 -0000 1.5 @@ -1 +1 @@ -espeak-1.18-source.zip +espeak-1.19-source.zip Index: espeak.spec =================================================================== RCS file: /cvs/extras/rpms/espeak/FC-5/espeak.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- espeak.spec 16 Jan 2007 16:26:04 -0000 1.4 +++ espeak.spec 5 Feb 2007 09:57:44 -0000 1.5 @@ -1,15 +1,12 @@ Name: espeak -Version: 1.18 -Release: 2%{?dist} +Version: 1.19 +Release: 1%{?dist} Summary: Software speech synthesizer (text-to-speech) Group: Applications/Multimedia License: GPL URL: http://espeak.sourceforge.net Source0: http://kent.dl.sourceforge.net/sourceforge/espeak/espeak-%{version}-source.zip -Patch0: espeak-1.18-makefile_lpthread.patch -Patch1: espeak-1.18-ptr_64bit.patch -Patch2: espeak-1.18-makefile_smp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: portaudio-devel @@ -40,10 +37,8 @@ %prep %setup -q -n espeak-%{version}-source -chmod 0644 src/* -%patch0 -p1 -b .lpthread -%patch1 -p1 -b .ptr_64bit -%patch2 -p1 -b .makefile_smp +# Fix file permissions +find . -type f -exec chmod 0644 {} ";" # Prepare documentation mv docs html sed -i 's/\r//' License.txt @@ -86,6 +81,13 @@ %changelog +* Fri Jan 26 2007 Francois Aucamp - 1.19-1 +- Update to version 1.19 +- Removed "espeak-1.18-makefile_lpthread" patch as it has been included upstream +- Removed "espeak-1.18-makefile_smp" patch as it has been included upstream +- Removed "espeak-1.18-ptr_64bit" patch as it has been solved upstream +- Fixed espeak-data file permissions + * Tue Jan 16 2007 Francois Aucamp - 1.18-2 - Created "espeak-1.18-ptr_64bit" patch to allow compilation on x86_64 (fixes 64-bit pointer issues) - Created "espeak-1.18-makefile_smp" patch to allow parallel make ("_smp_mflags") Index: sources =================================================================== RCS file: /cvs/extras/rpms/espeak/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 15 Jan 2007 14:21:26 -0000 1.4 +++ sources 5 Feb 2007 09:57:44 -0000 1.5 @@ -1 +1 @@ -8e5ed7ff85c56ca2c5f2fcaba36df110 espeak-1.18-source.zip +49d70bd49f7cc7c1151f5973ee26c152 espeak-1.19-source.zip --- espeak-1.18-makefile_lpthread.patch DELETED --- --- espeak-1.18-makefile_smp.patch DELETED --- --- espeak-1.18-ptr_64bit.patch DELETED --- From fedora-extras-commits at redhat.com Mon Feb 5 10:15:12 2007 From: fedora-extras-commits at redhat.com (Daniel Malmgren (danielm)) Date: Mon, 5 Feb 2007 05:15:12 -0500 Subject: rpms/initng/devel check-selinux.patch,1.1,NONE Message-ID: <200702051015.l15AFC8Z004290@cvs-int.fedora.redhat.com> Author: danielm Update of /cvs/extras/rpms/initng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4277 Removed Files: check-selinux.patch Log Message: Removed patch that is no longer used --- check-selinux.patch DELETED --- From fedora-extras-commits at redhat.com Mon Feb 5 10:32:51 2007 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Mon, 5 Feb 2007 05:32:51 -0500 Subject: rpms/gpsim/devel gpsim.spec,1.12,1.13 Message-ID: <200702051032.l15AWpsI004435@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/gpsim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4407 Modified Files: gpsim.spec Log Message: Rebuild for FE7: link with libncurses instead of libtermcap Index: gpsim.spec =================================================================== RCS file: /cvs/extras/rpms/gpsim/devel/gpsim.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gpsim.spec 14 Nov 2006 15:23:19 -0000 1.12 +++ gpsim.spec 5 Feb 2007 10:32:19 -0000 1.13 @@ -1,6 +1,6 @@ Name: gpsim Version: 0.22.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A simulator for Microchip (TM) PIC (TM) microcontrollers Summary(fr): Un simulateur pour les microcontr??leurs PIC (TM) Microchip (TM) @@ -77,6 +77,9 @@ %{_includedir}/* %changelog +* Mon Feb 5 2007 Alain Portal 0.22.0-2 + - FE7 rebuild + * Tue Nov 14 2006 Alain Portal 0.22.0-1 - New upstream version - Remove patches that are no more needed (applied by upstream) From fedora-extras-commits at redhat.com Mon Feb 5 11:38:12 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos)) Date: Mon, 5 Feb 2007 06:38:12 -0500 Subject: rpms/tellico/devel tellico.spec,1.5,1.6 Message-ID: <200702051138.l15BcCGg015295@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/tellico/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15278 Modified Files: tellico.spec Log Message: * Mon Feb 5 2007 Jos?? Matos - 1.2.7-3 - Condicionalize the BR for tcp_wrappers, it has a proper devel file for Fedora >= 7. Index: tellico.spec =================================================================== RCS file: /cvs/extras/rpms/tellico/devel/tellico.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- tellico.spec 30 Jan 2007 18:22:20 -0000 1.5 +++ tellico.spec 5 Feb 2007 11:37:40 -0000 1.6 @@ -1,6 +1,6 @@ Name: tellico Version: 1.2.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A collection manager Group: Applications/Multimedia @@ -24,7 +24,13 @@ BuildRequires: libart_lgpl-devel BuildRequires: taglib-devel BuildRequires: libyaz-devel -BuildRequires: tcp_wrappers + +%if "%fedora" < "7" +BuildRequires: tcp_wrappers +%else +BuildRequires: tcp_wrappers-devel +%endif + Requires: python %description @@ -98,6 +104,10 @@ %changelog +* Mon Feb 5 2007 Jos?? Matos - 1.2.7-3 +- Condicionalize the BR for tcp_wrappers, it has a proper devel file + for Fedora >= 7. + * Tue Jan 30 2007 Jos?? Matos - 1.2.7-2 - BR tcp_wrappers. From fedora-extras-commits at redhat.com Mon Feb 5 12:44:23 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 5 Feb 2007 07:44:23 -0500 Subject: rpms/djvulibre/devel .cvsignore, 1.8, 1.9 djvulibre.spec, 1.18, 1.19 sources, 1.8, 1.9 Message-ID: <200702051244.l15CiNhD019201@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/djvulibre/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19171 Modified Files: .cvsignore djvulibre.spec sources Log Message: Update to 3.5.18 (with major spec file changes). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/djvulibre/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 2 Jul 2006 18:26:24 -0000 1.8 +++ .cvsignore 5 Feb 2007 12:43:51 -0000 1.9 @@ -1 +1 @@ -djvulibre-3.5.17.tar.gz +djvulibre-3.5.18.tar.gz Index: djvulibre.spec =================================================================== RCS file: /cvs/extras/rpms/djvulibre/devel/djvulibre.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- djvulibre.spec 29 Aug 2006 17:26:12 -0000 1.18 +++ djvulibre.spec 5 Feb 2007 12:43:51 -0000 1.19 @@ -1,78 +1,63 @@ -Summary: DjVu viewers, encoders and utilities +Summary: DjVu viewers, encoders, utilities and web browser plugin Name: djvulibre -Version: 3.5.17 -Release: 2%{?dist} +Version: 3.5.18 +Release: 1%{?dist} License: GPL Group: Applications/Publishing -URL: http://djvulibre.djvuzone.org/ +URL: http://djvu.sourceforge.net/ Source: http://dl.sf.net/djvu/djvulibre-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Requires(post): xdg-utils, /sbin/ldconfig +Requires(preun): xdg-utils BuildRequires: qt-devel, libjpeg-devel, libtiff-devel -# These packages provide directories checked at configure time : -BuildRequires: redhat-menus, hicolor-icon-theme -# /usr/share/application-registry & /usr/share/mime-info : -BuildRequires: gnome-mime-data -# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora -%if %{!?fedora:6}%{?fedora} >= 5 -BuildRequires: libXt-devel -%else -BuildRequires: xorg-x11-devel -%endif -# Use mozilla up to FC5, and seamonkey for FC6+ and non-Fedora -%if %{!?fedora:6}%{?fedora} >= 6 -BuildRequires: seamonkey -%else -BuildRequires: mozilla -%endif -# Provide these here, they're so small, it's not worth splitting them out +BuildRequires: xdg-utils +# Virtual provides... might be worth splitting out for multilib, but then we'd +# probably need a separate -libs package to have 64bit tools and 32bit plugin Provides: mozilla-djvulibre = %{version}-%{release} -Provides: djvulibre-devel = %{version}-%{release} %description DjVu is a web-centric format and software platform for distributing documents -and images. DjVu content downloads faster, displays and renders faster, looks -nicer on a screen, and consume less client resources than competing formats. -DjVu was originally developed at AT&T Labs-Research by Leon Bottou, Yann -LeCun, Patrick Haffner, and many others. In March 2000, AT&T sold DjVu to -LizardTech Inc. who now distributes Windows/Mac plug-ins, and commercial -encoders (mostly on Windows) - -In an effort to promote DjVu as a Web standard, the LizardTech management was -enlightened enough to release the reference implementation of DjVu under the -GNU GPL in October 2000. DjVuLibre (which means free DjVu), is an enhanced -version of that code maintained by the original inventors of DjVu. It is -compatible with version 3.5 of the LizardTech DjVu software suite. +and images. DjVu can advantageously replace PDF, PS, TIFF, JPEG, and GIF for +distributing scanned documents, digital documents, or high-resolution pictures. +DjVu content downloads faster, displays and renders faster, looks nicer on a +screen, and consume less client resources than competing formats. DjVu images +display instantly and can be smoothly zoomed and panned with no lengthy +re-rendering. + +DjVuLibre is a free (GPL'ed) implementation of DjVu, including viewers, browser +plugins, decoders, simple encoders, and utilities. + + +%package devel +Summary: Development files for djvulibre +Group: Development/Libraries +Requires: %{name} = %{version}-%{release}, pkgconfig + +%description devel +Development files for djvulibre. %prep %setup -# In 3.5.15cvs, hardcoded "/usr/include/qt3" needs replacing -. /etc/profile.d/qt.sh -%{__perl} -pi -e "s|/usr/include/qt3|${QTINC}|g" gui/djview/Makefile.dep %build %configure -# In 3.5.14 %{?_smp_mflags} broke the build +# In 3.5.14 %{?_smp_mflags} broke the build - still in 3.5.18 %{__make} OPTS="%{optflags}" %install %{__rm} -rf %{buildroot} -%makeinstall +%{__make} install DESTDIR=%{buildroot} # Move plugin from the netscape directory to the main mozilla one %{__mkdir_p} %{buildroot}%{_libdir}/mozilla/plugins/ %{__mv} %{buildroot}%{_libdir}/netscape/plugins/nsdejavu.so \ %{buildroot}%{_libdir}/mozilla/plugins/nsdejavu.so -# Fix for the libs to get stripped correctly (still required in 3.5.15) +# Fix for the libs to get stripped correctly (still required in 3.5.18) find %{buildroot}%{_libdir} -name '*.so*' | xargs %{__chmod} +x -# Move menu entry pixmap to new location -%{__mkdir_p} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/ -%{__mv} %{buildroot}%{_datadir}/pixmaps/djvu.png \ - %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/djvu.png - %clean %{__rm} -rf %{buildroot} @@ -80,13 +65,21 @@ %post /sbin/ldconfig -gtk-update-icon-cache -q -f %{_datadir}/icons/hicolor || : -update-desktop-database /usr/share/applications || : +# Menu entry (icons and desktop file) +%{_datadir}/djvu/djview3/desktop/register-djview-menu install || : +# MIME types (icons and desktop file) +%{_datadir}/djvu/osi/desktop/register-djvu-mime install || : + +%preun +# Removal, not update +if [ $1 -eq 0 ]; then + # Menu entry (icons and desktop file) + %{_datadir}/djvu/djview3/desktop/register-djview-menu uninstall || : + # MIME types (icons and desktop file) + %{_datadir}/djvu/osi/desktop/register-djvu-mime uninstall || : +fi -%postun -/sbin/ldconfig -gtk-update-icon-cache -q -f %{_datadir}/icons/hicolor || : -update-desktop-database /usr/share/applications || : +%postun -p /sbin/ldconfig %files @@ -95,17 +88,14 @@ %{_bindir}/* %{_libdir}/*.so.* %{_libdir}/mozilla/plugins/nsdejavu.so -%{_datadir}/application-registry/djvu.applications -%{_datadir}/applications/djview.desktop -%{_datadir}/icons/hicolor/??x??/apps/djvu.png -%{_datadir}/icons/hicolor/??x??/mimetypes/djvu.png %{_datadir}/djvu/ -%{_datadir}/mime-info/djvu.* %{_mandir}/man1/* +#lang(de) %{_mandir}/de/man1/* +#lang(fr) %{_mandir}/fr/man1/* %lang(ja) %{_mandir}/ja/man1/* -#files devel -#defattr(-, root, root, 0755) +%files devel +%defattr(-, root, root, 0755) %{_includedir}/libdjvu/ %{_libdir}/pkgconfig/ddjvuapi.pc %exclude %{_libdir}/*.la @@ -113,6 +103,14 @@ %changelog +* Mon Feb 5 2007 Matthias Saou 3.5.18-1 +- Update to 3.5.18. +- Remove no longer needed /usr/include/qt3 replacing. +- Replace desktop build requirements and scriplets with new xdg utils way. +- Include new de and fr man page translations... not! Directories are empty. +- Split -devel sub-package, as the new djview4 should build require it. +- No longer build require a web browser, the plugin always gets built now. + * Mon Aug 28 2006 Matthias Saou 3.5.17-2 - FC6 rebuild. - Use mozilla up to FC5, and seamonkey for FC6+ and non-Fedora. Index: sources =================================================================== RCS file: /cvs/extras/rpms/djvulibre/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 2 Jul 2006 18:26:24 -0000 1.8 +++ sources 5 Feb 2007 12:43:51 -0000 1.9 @@ -1 +1 @@ -18e71eec1f7d59ef4710b405ea64650e djvulibre-3.5.17.tar.gz +73fd6d4f92832b85a91529b7bb3b7710 djvulibre-3.5.18.tar.gz From fedora-extras-commits at redhat.com Mon Feb 5 13:07:12 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 5 Feb 2007 08:07:12 -0500 Subject: rpms/ucarp/devel ucarp.init, NONE, 1.1 ucarp.spec, 1.12, 1.13 vip-001.list.example, 1.1, 1.2 vip-down, 1.1, 1.2 vip-helper.sh, 1.1, 1.2 vip-up, 1.1, 1.2 carp.init, 1.4, NONE Message-ID: <200702051307.l15D7Ctk022736@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/ucarp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22700 Modified Files: ucarp.spec vip-001.list.example vip-down vip-helper.sh vip-up Added Files: ucarp.init Removed Files: carp.init Log Message: Move all configuration to /etc/ucarp and other minor changes. ***** Error reading new file: [Errno 2] No such file or directory: 'ucarp.init' Index: ucarp.spec =================================================================== RCS file: /cvs/extras/rpms/ucarp/devel/ucarp.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ucarp.spec 29 Nov 2006 12:00:11 -0000 1.12 +++ ucarp.spec 5 Feb 2007 13:06:40 -0000 1.13 @@ -1,12 +1,12 @@ Summary: Common Address Redundancy Protocol (CARP) for Unix Name: ucarp Version: 1.2 -Release: 6%{?dist} +Release: 7%{?dist} License: BSD Group: System Environment/Daemons URL: http://www.ucarp.org/ Source0: http://download.pureftpd.org/pub/ucarp/ucarp-%{version}.tar.bz2 -Source1: carp.init +Source1: ucarp.init Source2: vip-001.conf.example Source3: vip-001.list.example Source4: vip-up @@ -19,13 +19,7 @@ Requires(postun): /sbin/service BuildRequires: gettext BuildRequires: autoconf, automake, libtool -# Use libpcap up to FC5, and libpcap-devel for FC6+ and non-Fedora -%if %{!?fedora:6}%{?fedora} >= 6 BuildRequires: libpcap-devel -%else -BuildRequires: libpcap -%endif - %description UCARP allows a couple of hosts to share common virtual IP addresses in order @@ -54,54 +48,64 @@ # Install the init script %{__install} -D -p -m 0755 %{SOURCE1} \ - %{buildroot}/etc/rc.d/init.d/carp + %{buildroot}/etc/rc.d/init.d/ucarp -%{__mkdir_p} %{buildroot}/etc/sysconfig/carp +%{__mkdir_p} %{buildroot}/etc/ucarp # Install the example config files %{__install} -D -p -m 0600 %{SOURCE2} %{SOURCE3} \ - %{buildroot}/etc/sysconfig/carp/ + %{buildroot}/etc/ucarp/ # Install helper scripts %{__install} -D -p -m 0700 %{SOURCE4} %{SOURCE5} %{SOURCE6} \ - %{buildroot}/etc/sysconfig/carp/ + %{buildroot}/etc/ucarp/ %clean %{__rm} -rf %{buildroot} -%post -if [ $1 -eq 1 ]; then - /sbin/chkconfig --add carp +%pre +# Legacy, in case we update from an older package where the service was "carp" +if [ -f /etc/rc.d/init.d/carp ]; then + /sbin/service carp stop &>/dev/null || : + /sbin/chkconfig --del carp fi +%post +/sbin/chkconfig --add ucarp + %preun if [ $1 -eq 0 ]; then - /sbin/service carp stop &>/dev/null || : - /sbin/chkconfig --del carp + /sbin/service ucarp stop &>/dev/null || : + /sbin/chkconfig --del ucarp fi %postun if [ $1 -ge 1 ]; then - /sbin/service carp condrestart &>/dev/null || : + /sbin/service ucarp condrestart &>/dev/null || : fi %files -f %{name}.lang %defattr(-, root, root, 0755) %doc AUTHORS COPYING ChangeLog NEWS README -/etc/rc.d/init.d/carp -%dir /etc/sysconfig/carp/ -/etc/sysconfig/carp/vip-001.conf.example -/etc/sysconfig/carp/vip-001.list.example -/etc/sysconfig/carp/vip-up -/etc/sysconfig/carp/vip-down -/etc/sysconfig/carp/vip-helper.sh +/etc/rc.d/init.d/ucarp +%attr(0700, root, root) %dir /etc/ucarp/ +/etc/ucarp/vip-001.conf.example +/etc/ucarp/vip-001.list.example +/etc/ucarp/vip-up +/etc/ucarp/vip-down +/etc/ucarp/vip-helper.sh %{_sbindir}/ucarp %changelog +* Fri Feb 2 2007 Matthias Saou 1.2-7 +- Rename service from carp to ucarp, to be more consistent. +- Move /etc/sysconfig/carp to /etc/ucarp since it has become a config directory + of its own. + * Wed Nov 29 2006 Matthias Saou 1.2-6 - Rebuild against new libpcap. Index: vip-001.list.example =================================================================== RCS file: /cvs/extras/rpms/ucarp/devel/vip-001.list.example,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vip-001.list.example 29 Nov 2006 12:00:11 -0000 1.1 +++ vip-001.list.example 5 Feb 2007 13:06:40 -0000 1.2 @@ -1,4 +1,4 @@ -# Comments are filtered out atomatically... +# Comments are filtered out automatically... 10.0.0.254/24 dev eth0 # ... and empty lines too. @@ -8,3 +8,4 @@ 172.16.2.32/24 dev eth2 172.16.3.67/24 dev eth2 172.16.4.88/24 dev eth2 + Index: vip-down =================================================================== RCS file: /cvs/extras/rpms/ucarp/devel/vip-down,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vip-down 29 Nov 2006 12:00:11 -0000 1.1 +++ vip-down 5 Feb 2007 13:06:40 -0000 1.2 @@ -2,25 +2,25 @@ usage() { - echo "This script is intended to be run by UCARP daemon." - echo "Usage: $0 " - echo "Usage: $0 <255.255.255.255> " - exit 1 + echo "This script is intended to be run by the UCARP daemon." + echo "Usage: $0 " + echo "Usage: $0 <255.255.255.255> " + exit 1 } [ $# -eq 3 ] || usage case $2 in - 255.255.255.255) - # New-style invocation. Process the the list of addresses - # specific to this virtual router. - MYDIR=`dirname $0` - $MYDIR/vip-helper.sh $3 del - ;; - *) - # Old-style invocation. Just add a single address to the same - # interface UCARP daemon is working on. - ip address del $2/32 dev $1 - ;; + 255.255.255.255) + # New-style invocation. Process the the list of addresses + # specific to this virtual router. + MYDIR=`dirname $0` + $MYDIR/vip-helper.sh $3 del + ;; + *) + # Old-style invocation. Just add a single address to the same + # interface UCARP daemon is working on. + ip address del $2/32 dev $1 + ;; esac Index: vip-helper.sh =================================================================== RCS file: /cvs/extras/rpms/ucarp/devel/vip-helper.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vip-helper.sh 29 Nov 2006 12:00:11 -0000 1.1 +++ vip-helper.sh 5 Feb 2007 13:06:40 -0000 1.2 @@ -2,8 +2,8 @@ usage() { - echo "This script is intended to be invoked by vip-up.sh or vip-down.sh" - exit 1 + echo "This script is intended to be invoked by vip-up.sh or vip-down.sh" + exit 1 } [ $# -eq 2 ] || usage @@ -13,16 +13,16 @@ MYDIR=`dirname $0` if [ "$VRID" -lt "1" -o "$VRID" -gt 255 ]; then - echo "VRID must be in 1..255 range" - exit 2 + echo "VRID must be in the 1 to 255 range." + exit 2 fi LISTFILE="$MYDIR/vip-$VRID.list" if ! [ -s "$LISTFILE" ]; then - echo "$LISTFILE is missing or empty, no action taken" - exit 1 + echo "$LISTFILE is missing or empty, no action taken." + exit 1 fi egrep ^[^#] $LISTFILE | sed -e 's/^ *\(.*\) *$/\1/' \ - | xargs --max-lines=1 ip address $OP &>/dev/null + | xargs --max-lines=1 ip address $OP &>/dev/null Index: vip-up =================================================================== RCS file: /cvs/extras/rpms/ucarp/devel/vip-up,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vip-up 29 Nov 2006 12:00:11 -0000 1.1 +++ vip-up 5 Feb 2007 13:06:40 -0000 1.2 @@ -2,25 +2,25 @@ usage() { - echo "This script is intended to be run by UCARP daemon." - echo "Usage: $0 " - echo "Usage: $0 <255.255.255.255> " - exit 1 + echo "This script is intended to be run by the UCARP daemon." + echo "Usage: $0 " + echo "Usage: $0 <255.255.255.255> " + exit 1 } [ $# -eq 3 ] || usage case $2 in - 255.255.255.255) - # New-style invocation. Process the the list of addresses - # specific to this virtual router. - MYDIR=`dirname $0` - $MYDIR/vip-helper.sh $3 add - ;; - *) - # Old-style invocation. Just add a single address to the same - # interface the UCARP daemon is working on. - ip address add $2/32 dev $1 - ;; + 255.255.255.255) + # New-style invocation. Process the the list of addresses + # specific to this virtual router. + MYDIR=`dirname $0` + $MYDIR/vip-helper.sh $3 add + ;; + *) + # Old-style invocation. Just add a single address to the same + # interface the UCARP daemon is working on. + ip address add $2/32 dev $1 + ;; esac --- carp.init DELETED --- From fedora-extras-commits at redhat.com Mon Feb 5 13:31:57 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 5 Feb 2007 08:31:57 -0500 Subject: rpms/ncftp/devel .cvsignore, 1.4, 1.5 ncftp.spec, 1.10, 1.11 sources, 1.4, 1.5 Message-ID: <200702051331.l15DVvZZ023084@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/ncftp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23060 Modified Files: .cvsignore ncftp.spec sources Log Message: Update IPv6 patch from 20060806 to 20061109b (getnameinfo vs. getaddrinfo). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ncftp/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 Aug 2006 12:11:02 -0000 1.4 +++ .cvsignore 5 Feb 2007 13:31:25 -0000 1.5 @@ -1,2 +1,2 @@ ncftp-3.2.0-src.tar.bz2 -ncftp-320-v6-20060806.diff.gz +ncftp-320-v6-20061109b.diff.gz Index: ncftp.spec =================================================================== RCS file: /cvs/extras/rpms/ncftp/devel/ncftp.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ncftp.spec 28 Aug 2006 11:24:30 -0000 1.10 +++ ncftp.spec 5 Feb 2007 13:31:25 -0000 1.11 @@ -1,13 +1,13 @@ Summary: Improved console FTP client Name: ncftp Version: 3.2.0 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 2 License: Distributable Group: Applications/Internet URL: http://www.ncftp.com/ncftp/ Source: ftp://ftp.ncftp.com/ncftp/ncftp-%{version}-src.tar.bz2 -Patch0: ftp://ftp.kame.net/pub/kame/misc/ncftp-320-v6-20060806.diff.gz +Patch0: ftp://ftp.kame.net/pub/kame/misc/ncftp-320-v6-20061109b.diff.gz Patch1: ncftp-3.0.1-pref.patch Patch2: ncftp-3.0.3-resume.patch Patch3: ncftp-3.1.5-pmeter.patch @@ -67,6 +67,9 @@ %changelog +* Mon Feb 5 2007 Matthias Saou 2:3.2.0-3 +- Update IPv6 patch from 20060806 to 20061109b (getnameinfo vs. getaddrinfo). + * Mon Aug 28 2006 Matthias Saou 2:3.2.0-2 - FC6 rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/ncftp/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 Aug 2006 12:11:02 -0000 1.4 +++ sources 5 Feb 2007 13:31:25 -0000 1.5 @@ -1,2 +1,2 @@ 384b7f01d725c89ccd30692628b3ac1b ncftp-3.2.0-src.tar.bz2 -b8943ef660beac94f81969cd1bdf2476 ncftp-320-v6-20060806.diff.gz +54c136bbda91390db22aecb1dc78aeba ncftp-320-v6-20061109b.diff.gz From fedora-extras-commits at redhat.com Mon Feb 5 13:59:47 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 5 Feb 2007 08:59:47 -0500 Subject: rpms/duel3 - New directory Message-ID: <200702051359.l15Dxl66023429@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/duel3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23424/duel3 Log Message: Directory /cvs/extras/rpms/duel3 added to the repository From fedora-extras-commits at redhat.com Mon Feb 5 13:59:54 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 5 Feb 2007 08:59:54 -0500 Subject: rpms/duel3/devel - New directory Message-ID: <200702051359.l15Dxs7q023443@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/duel3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23424/duel3/devel Log Message: Directory /cvs/extras/rpms/duel3/devel added to the repository From fedora-extras-commits at redhat.com Mon Feb 5 15:10:22 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Mon, 5 Feb 2007 10:10:22 -0500 Subject: rpms/beryl-core/devel .cvsignore, 1.6, 1.7 beryl-core.spec, 1.11, 1.12 sources, 1.6, 1.7 Message-ID: <200702051510.l15FAMio030815@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/beryl-core/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30750 Modified Files: .cvsignore beryl-core.spec sources Log Message: beryl 0.1.9999.1 (aka holy shit buttons 0.2.0-rc1) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/beryl-core/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 29 Jan 2007 21:02:32 -0000 1.6 +++ .cvsignore 5 Feb 2007 15:09:49 -0000 1.7 @@ -5,3 +5,4 @@ beryl-mesa-0.1.4.tar.bz2 beryl-core-0.1.99.2.tar.bz2 beryl-mesa-0.1.99.2.tar.bz2 +beryl-core-0.1.9999.1.tar.bz2 Index: beryl-core.spec =================================================================== RCS file: /cvs/extras/rpms/beryl-core/devel/beryl-core.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- beryl-core.spec 30 Jan 2007 19:45:03 -0000 1.11 +++ beryl-core.spec 5 Feb 2007 15:09:49 -0000 1.12 @@ -2,13 +2,13 @@ Url: http://www.beryl-project.org/ License: GPL Group: User Interface/Desktops -Version: 0.1.99.2 -Release: 2%{?dist} +Version: 0.1.9999.1 +Release: 1%{?dist} Summary: Beryl OpenGL window and compositing manager BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://releases.beryl-project.org/%{version}/%{name}-%{version}.tar.bz2 -Source1: http://releases.beryl-project.org/%{version}/beryl-mesa-%{version}.tar.bz2 +Source1: http://releases.beryl-project.org/0.1.99.2/beryl-mesa-0.1.99.2.tar.bz2 Patch0: mesa-6.4.1-x86_64-fixes-1.patch # libdrm is not avaliable on these arches @@ -159,6 +159,9 @@ %defattr(-,root,root,-) %changelog +* Mon Feb 05 2007 Jarod Wilson 0.1.9999.1-1 +- beryl 0.1.9999.1 (aka 0.2.0-rc1) + * Tue Jan 30 2007 Jarod Wilson 0.1.99.2-2 - Un-require beryl-dbus, since its part of beryl-plugins now Index: sources =================================================================== RCS file: /cvs/extras/rpms/beryl-core/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 29 Jan 2007 21:02:32 -0000 1.6 +++ sources 5 Feb 2007 15:09:49 -0000 1.7 @@ -1,2 +1,2 @@ -e439403ce19130e37f46185a65465c9b beryl-core-0.1.99.2.tar.bz2 387d068091bc5c6fa28f6d754e1296d1 beryl-mesa-0.1.99.2.tar.bz2 +e7f65f7caf72ed7ec55f46468099f694 beryl-core-0.1.9999.1.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 5 15:10:44 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Mon, 5 Feb 2007 10:10:44 -0500 Subject: rpms/beryl-manager/devel .cvsignore, 1.5, 1.6 beryl-manager.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <200702051510.l15FAiYN030845@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/beryl-manager/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30780 Modified Files: .cvsignore beryl-manager.spec sources Log Message: beryl 0.1.9999.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/beryl-manager/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 29 Jan 2007 21:19:36 -0000 1.5 +++ .cvsignore 5 Feb 2007 15:10:11 -0000 1.6 @@ -2,3 +2,4 @@ beryl-manager-0.1.3.tar.bz2 beryl-manager-0.1.4.tar.bz2 beryl-manager-0.1.99.2.tar.bz2 +beryl-manager-0.1.9999.1.tar.bz2 Index: beryl-manager.spec =================================================================== RCS file: /cvs/extras/rpms/beryl-manager/devel/beryl-manager.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- beryl-manager.spec 29 Jan 2007 21:19:36 -0000 1.7 +++ beryl-manager.spec 5 Feb 2007 15:10:11 -0000 1.8 @@ -2,7 +2,7 @@ Url: http://www.beryl-project.org/ License: GPL Group: User Interface/Desktops -Version: 0.1.99.2 +Version: 0.1.9999.1 Release: 1%{?dist} Summary: Beryl window decorator and theme management utility @@ -85,6 +85,9 @@ %changelog +* Mon Feb 05 2007 Jarod Wilson 0.1.9999.1-1 +- beryl 0.1.9999.1 (aka 0.2.0-rc1) + * Mon Jan 29 2007 Jarod Wilson 0.1.99.2-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/beryl-manager/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 29 Jan 2007 21:19:36 -0000 1.5 +++ sources 5 Feb 2007 15:10:11 -0000 1.6 @@ -1 +1 @@ -e685d436599297b6921f88b59d4635c4 beryl-manager-0.1.99.2.tar.bz2 +805f50dc6c0fb5c3f8fa0d853710807f beryl-manager-0.1.9999.1.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 5 15:13:15 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Mon, 5 Feb 2007 10:13:15 -0500 Subject: rpms/beryl-plugins/devel .cvsignore, 1.5, 1.6 beryl-plugins.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <200702051513.l15FDFRj030948@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/beryl-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30905 Modified Files: .cvsignore beryl-plugins.spec sources Log Message: beryl 0.1.9999.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/beryl-plugins/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 29 Jan 2007 21:32:52 -0000 1.5 +++ .cvsignore 5 Feb 2007 15:12:42 -0000 1.6 @@ -2,3 +2,4 @@ beryl-plugins-0.1.3.tar.bz2 beryl-plugins-0.1.4.tar.bz2 beryl-plugins-0.1.99.2.tar.bz2 +beryl-plugins-0.1.9999.1.tar.bz2 Index: beryl-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/beryl-plugins/devel/beryl-plugins.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- beryl-plugins.spec 30 Jan 2007 19:54:49 -0000 1.8 +++ beryl-plugins.spec 5 Feb 2007 15:12:42 -0000 1.9 @@ -2,8 +2,8 @@ Url: http://www.beryl-project.org/ License: GPL Group: User Interface/Desktops -Version: 0.1.99.2 -Release: 3%{?dist} +Version: 0.1.9999.1 +Release: 1%{?dist} Summary: Beryl OpenGL window and compositing manager plug-ins BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -62,6 +62,9 @@ %changelog +* Mon Feb 05 2007 Jarod Wilson 0.1.9999.1-1 +- beryl 0.1.9999.1 (aka 0.2.0-rc1) + * Tue Jan 30 2007 Jarod Wilson 0.1.99.2-3 - Forgot to Provides: beryl-dbus Index: sources =================================================================== RCS file: /cvs/extras/rpms/beryl-plugins/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 29 Jan 2007 21:32:52 -0000 1.5 +++ sources 5 Feb 2007 15:12:42 -0000 1.6 @@ -1 +1 @@ -7b116756dd841afa0c72f5556284714e beryl-plugins-0.1.99.2.tar.bz2 +be876763b0bd9f2c11cca764ce348c3d beryl-plugins-0.1.9999.1.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 5 15:13:42 2007 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Mon, 5 Feb 2007 10:13:42 -0500 Subject: rpms/deltarpm/devel deltarpm-3.3-rpmdumpheader-corruption.patch, NONE, 1.1 deltarpm.spec, 1.2, 1.3 Message-ID: <200702051513.l15FDgAN030953@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/extras/rpms/deltarpm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30926 Modified Files: deltarpm.spec Added Files: deltarpm-3.3-rpmdumpheader-corruption.patch Log Message: * Mon Feb 05 2007 Adam Jackson 3.3-6 - Fix rpm db corruption in rpmdumpheader. (#227326) deltarpm-3.3-rpmdumpheader-corruption.patch: --- NEW FILE deltarpm-3.3-rpmdumpheader-corruption.patch --- --- rpmdumpheader.c 2005-02-03 19:41:51.000000000 +0100 +++ rpmdumpheader.c.patched 2007-02-05 10:59:33.000000000 +0100 @@ -70,9 +70,13 @@ { if (e) fprintf(stderr, "%s-%s:%s-%s is not installed\n", n, e, v, r); - else + else fprintf(stderr, "%s-%s-%s is not installed\n", n, v, r); + mi = rpmdbFreeIterator(mi); + ts = rpmtsFree(ts); exit(1); } + mi = rpmdbFreeIterator(mi); + ts = rpmtsFree(ts); exit(0); } Index: deltarpm.spec =================================================================== RCS file: /cvs/extras/rpms/deltarpm/devel/deltarpm.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- deltarpm.spec 11 Sep 2006 13:16:54 -0000 1.2 +++ deltarpm.spec 5 Feb 2007 15:13:10 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Create deltas between rpms Name: deltarpm Version: 3.3 -Release: 5%{?dist} +Release: 6%{?dist} License: BSD Group: System Environment/Base URL: http://www.novell.com/products/linuxpackages/professional/deltarpm.html @@ -9,6 +9,8 @@ Source: ftp://ftp.suse.com/pub/projects/deltarpm/deltarpm-3.3.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: deltarpm-3.3-rpmdumpheader-corruption.patch + BuildRequires: bzip2-devel, rpm-devel %description @@ -20,6 +22,7 @@ %prep %setup -q +%patch -p0 -b .rpmdumpheader %build %{__make} %{?_smp_mflags} bindir=%{_bindir} mandir=%{_mandir} prefix=%{_prefix} @@ -44,6 +47,9 @@ %{_bindir}/rpmdumpheader %changelog +* Mon Feb 05 2007 Adam Jackson 3.3-6 +- Fix rpm db corruption in rpmdumpheader. (#227326) + * Mon Sep 11 2006 Mihai Ibanescu - 3.3-5 - Rebuilding for new toolset From fedora-extras-commits at redhat.com Mon Feb 5 15:15:31 2007 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Mon, 5 Feb 2007 10:15:31 -0500 Subject: rpms/deltarpm/FC-6 deltarpm-3.3-rpmdumpheader-corruption.patch, NONE, 1.1 deltarpm.spec, 1.2, 1.3 Message-ID: <200702051515.l15FFVXQ031062@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/extras/rpms/deltarpm/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31038 Modified Files: deltarpm.spec Added Files: deltarpm-3.3-rpmdumpheader-corruption.patch Log Message: * Mon Feb 05 2007 Adam Jackson 3.3-6 - Fix rpm db corruption in rpmdumpheader. (#227326) deltarpm-3.3-rpmdumpheader-corruption.patch: --- NEW FILE deltarpm-3.3-rpmdumpheader-corruption.patch --- --- rpmdumpheader.c 2005-02-03 19:41:51.000000000 +0100 +++ rpmdumpheader.c.patched 2007-02-05 10:59:33.000000000 +0100 @@ -70,9 +70,13 @@ { if (e) fprintf(stderr, "%s-%s:%s-%s is not installed\n", n, e, v, r); - else + else fprintf(stderr, "%s-%s-%s is not installed\n", n, v, r); + mi = rpmdbFreeIterator(mi); + ts = rpmtsFree(ts); exit(1); } + mi = rpmdbFreeIterator(mi); + ts = rpmtsFree(ts); exit(0); } Index: deltarpm.spec =================================================================== RCS file: /cvs/extras/rpms/deltarpm/FC-6/deltarpm.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- deltarpm.spec 11 Sep 2006 13:16:54 -0000 1.2 +++ deltarpm.spec 5 Feb 2007 15:14:59 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Create deltas between rpms Name: deltarpm Version: 3.3 -Release: 5%{?dist} +Release: 6%{?dist} License: BSD Group: System Environment/Base URL: http://www.novell.com/products/linuxpackages/professional/deltarpm.html @@ -9,6 +9,8 @@ Source: ftp://ftp.suse.com/pub/projects/deltarpm/deltarpm-3.3.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: deltarpm-3.3-rpmdumpheader-corruption.patch + BuildRequires: bzip2-devel, rpm-devel %description @@ -20,6 +22,7 @@ %prep %setup -q +%patch -p0 -b .rpmdumpheader %build %{__make} %{?_smp_mflags} bindir=%{_bindir} mandir=%{_mandir} prefix=%{_prefix} @@ -44,6 +47,9 @@ %{_bindir}/rpmdumpheader %changelog +* Mon Feb 05 2007 Adam Jackson 3.3-6 +- Fix rpm db corruption in rpmdumpheader. (#227326) + * Mon Sep 11 2006 Mihai Ibanescu - 3.3-5 - Rebuilding for new toolset From fedora-extras-commits at redhat.com Mon Feb 5 15:18:44 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Mon, 5 Feb 2007 10:18:44 -0500 Subject: rpms/emerald/devel .cvsignore, 1.5, 1.6 emerald.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200702051518.l15FIi5e031146@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/emerald/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31122 Modified Files: .cvsignore emerald.spec sources Log Message: beryl 0.1.9999.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/emerald/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 29 Jan 2007 21:41:31 -0000 1.5 +++ .cvsignore 5 Feb 2007 15:18:12 -0000 1.6 @@ -2,3 +2,4 @@ emerald-0.1.3.tar.bz2 emerald-0.1.4.tar.bz2 emerald-0.1.99.2.tar.bz2 +emerald-0.1.9999.1.tar.bz2 Index: emerald.spec =================================================================== RCS file: /cvs/extras/rpms/emerald/devel/emerald.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- emerald.spec 29 Jan 2007 21:41:31 -0000 1.5 +++ emerald.spec 5 Feb 2007 15:18:12 -0000 1.6 @@ -2,7 +2,7 @@ Url: http://www.beryl-project.org/ License: GPL Group: User Interface/Desktops -Version: 0.1.99.2 +Version: 0.1.9999.1 Release: 1%{?dist} Summary: Themeable window decorator and compositing manager for Beryl @@ -109,6 +109,9 @@ %{_libdir}/libemeraldengine.so %changelog +* Mon Feb 05 2007 Jarod Wilson 0.1.9999.1-1 +- beryl 0.1.9999.1 (aka 0.2.0-rc1) + * Mon Jan 29 2007 Jarod Wilson 0.1.99.2-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/emerald/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 29 Jan 2007 21:41:31 -0000 1.5 +++ sources 5 Feb 2007 15:18:12 -0000 1.6 @@ -1 +1 @@ -fdcc88cd8e75e144a07138525e342370 emerald-0.1.99.2.tar.bz2 +c7d59e008ad031c65b621bbcd8868588 emerald-0.1.9999.1.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 5 15:20:53 2007 From: fedora-extras-commits at redhat.com (David Anderson (anderson)) Date: Mon, 5 Feb 2007 10:20:53 -0500 Subject: rpms/bibletime/devel .cvsignore, 1.3, 1.4 bibletime.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200702051520.l15FKrU5031192@cvs-int.fedora.redhat.com> Author: anderson Update of /cvs/extras/rpms/bibletime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31163 Modified Files: .cvsignore bibletime.spec sources Log Message: 1.6.3b Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bibletime/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 17 Jan 2007 16:46:40 -0000 1.3 +++ .cvsignore 5 Feb 2007 15:20:21 -0000 1.4 @@ -1,2 +1,2 @@ -bibletime-1.6.2.tar.bz2 -bibletime-i18n-1.6.2.tar.bz2 +bibletime-1.6.3b.tar.bz2 +bibletime-i18n-1.6.3b.tar.bz2 Index: bibletime.spec =================================================================== RCS file: /cvs/extras/rpms/bibletime/devel/bibletime.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- bibletime.spec 17 Jan 2007 16:46:40 -0000 1.2 +++ bibletime.spec 5 Feb 2007 15:20:21 -0000 1.3 @@ -1,13 +1,13 @@ Summary: BibleTime is an easy to use Bible study tool for KDE Name: bibletime -Version: 1.6.2 -Release: 4%{?dist} +Version: 1.6.3b +Release: 2%{?dist} License: GPL Url: http://www.bibletime.info/ Group: Applications/Productivity Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 Source1: http://downloads.sourceforge.net/%{name}/%{name}-i18n-%{version}.tar.bz2 -Patch0: bibletime-desktop.patch +Patch0: %{name}-desktop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sword-devel >= 1.5.9 clucene-core-devel >= 0.9.16a kdelibs-devel BuildRequires: desktop-file-utils gettext @@ -45,24 +45,25 @@ --delete-original \ %{buildroot}%{_datadir}/applications/%{name}.desktop -chmod 0644 %{buildroot}%{_datadir}/apps/bibletime/bibletimeui.rc -chmod 0644 %{buildroot}%{_datadir}/apps/bibletime/tips +chmod 0644 %{buildroot}%{_datadir}/apps/%{name}/bibletimeui.rc +chmod 0644 %{buildroot}%{_datadir}/apps/%{name}/tips cd %{name}-i18n-%{version} make DESTDIR=%{buildroot} install # remove empty file -[[ -s %{buildroot}/usr/share/doc/HTML/cs/bibletime/howto/how2-importance.docbook ]] || rm -f %{buildroot}/usr/share/doc/HTML/cs/bibletime/howto/how2-importance.docbook +[[ -s %{buildroot}%{_datadir}/doc/HTML/cs/%{name}/howto/how2-importance.docbook ]] || rm -f %{buildroot}%{_datadir}/doc/HTML/cs/%{name}/howto/how2-importance.docbook # rename wrongly-named locale -mv %{buildroot}/usr/share/locale/pt_br %{buildroot}/usr/share/locale/pt_BR || : +mv %{buildroot}%{_datadir}/locale/pt_br %{buildroot}%{_datadir}/locale/pt_BR || : +mv %{buildroot}%{_datadir}/doc/HTML/pt_br %{buildroot}%{_datadir}/doc/HTML/pt_BR || : -%find_lang bibletime || touch bibletime.lang +%find_lang %{name} || touch %{name}.lang HTML_DIR=$(kde-config --expandvars --install html) if [ -d %{buildroot}$HTML_DIR ]; then for lang_dir in %{buildroot}$HTML_DIR/* ; do lang=$(basename $lang_dir) - echo "%lang($lang) %doc $HTML_DIR/$lang/*" >> bibletime.lang + echo "%lang($lang) %doc $HTML_DIR/$lang/*" >> %{name}.lang done fi @@ -77,7 +78,7 @@ touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -%files -f %{name}-i18n-%{version}/bibletime.lang +%files -f %{name}-i18n-%{version}/%{name}.lang %defattr(-,root,root,-) %{_bindir}/* %{_datadir}/applications/*.desktop @@ -87,6 +88,12 @@ %doc README LICENSE %changelog +* Mon Feb 05 2007 David Anderson 1.6.3b-2 +- 1.6.3b + +* Sat Jan 27 2007 David Anderson 1.6.2-5 +- Correct wrong location of pt_BR files + * Mon Jan 15 2007 David Anderson 1.6.2-4 - Added internationalisation Index: sources =================================================================== RCS file: /cvs/extras/rpms/bibletime/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 17 Jan 2007 16:46:40 -0000 1.3 +++ sources 5 Feb 2007 15:20:21 -0000 1.4 @@ -1,2 +1,2 @@ -b2b8b624d21d397201aec742d43501e5 bibletime-1.6.2.tar.bz2 -a2d4dc8220253e39d8abf720c3ae8aff bibletime-i18n-1.6.2.tar.bz2 +50463409277994cf5da946cc12aefdd1 bibletime-1.6.3b.tar.bz2 +5ae7aeb18607971c80c68cf5a9c5ca4e bibletime-i18n-1.6.3b.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 5 15:21:43 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Mon, 5 Feb 2007 10:21:43 -0500 Subject: rpms/emerald-themes/devel .cvsignore, 1.5, 1.6 emerald-themes.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200702051521.l15FLhdJ031295@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/emerald-themes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31205 Modified Files: .cvsignore emerald-themes.spec sources Log Message: beryl 0.1.9999.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/emerald-themes/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 29 Jan 2007 21:43:42 -0000 1.5 +++ .cvsignore 5 Feb 2007 15:21:11 -0000 1.6 @@ -2,3 +2,4 @@ emerald-themes-0.1.3.tar.bz2 emerald-themes-0.1.4.tar.bz2 emerald-themes-0.1.99.2.tar.bz2 +emerald-themes-0.1.9999.1.tar.bz2 Index: emerald-themes.spec =================================================================== RCS file: /cvs/extras/rpms/emerald-themes/devel/emerald-themes.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- emerald-themes.spec 29 Jan 2007 21:43:42 -0000 1.4 +++ emerald-themes.spec 5 Feb 2007 15:21:11 -0000 1.5 @@ -2,7 +2,7 @@ Url: http://www.beryl-project.org/ License: GPL Group: User Interface/Desktops -Version: 0.1.99.2 +Version: 0.1.9999.1 Release: 1%{?dist} Summary: Themes for Emerald, the window decorator for Beryl @@ -47,6 +47,9 @@ %changelog +* Mon Feb 05 2007 Jarod Wilson 0.1.9999.1-1 +- beryl 0.1.9999.1 (aka 0.2.0-rc1) + * Mon Jan 29 2007 Jarod Wilson 0.1.99.2-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/emerald-themes/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 29 Jan 2007 21:43:42 -0000 1.5 +++ sources 5 Feb 2007 15:21:11 -0000 1.6 @@ -1 +1 @@ -abfe5c942e290ddd22db5e94d217fdb7 emerald-themes-0.1.99.2.tar.bz2 +6e22d32afa755b53dca15d65b3ac9ee3 emerald-themes-0.1.9999.1.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 5 15:24:50 2007 From: fedora-extras-commits at redhat.com (David Anderson (anderson)) Date: Mon, 5 Feb 2007 10:24:50 -0500 Subject: rpms/bibletime/FC-6 bibletime.spec,1.2,1.3 Message-ID: <200702051524.l15FOofA031361@cvs-int.fedora.redhat.com> Author: anderson Update of /cvs/extras/rpms/bibletime/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31328 Modified Files: bibletime.spec Log Message: 1.6.3b Index: bibletime.spec =================================================================== RCS file: /cvs/extras/rpms/bibletime/FC-6/bibletime.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- bibletime.spec 20 Jan 2007 15:41:50 -0000 1.2 +++ bibletime.spec 5 Feb 2007 15:24:18 -0000 1.3 @@ -1,13 +1,13 @@ Summary: BibleTime is an easy to use Bible study tool for KDE Name: bibletime -Version: 1.6.2 -Release: 4%{?dist} +Version: 1.6.3b +Release: 2%{?dist} License: GPL Url: http://www.bibletime.info/ Group: Applications/Productivity Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 Source1: http://downloads.sourceforge.net/%{name}/%{name}-i18n-%{version}.tar.bz2 -Patch0: bibletime-desktop.patch +Patch0: %{name}-desktop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sword-devel >= 1.5.9 clucene-core-devel >= 0.9.16a kdelibs-devel BuildRequires: desktop-file-utils gettext @@ -45,24 +45,25 @@ --delete-original \ %{buildroot}%{_datadir}/applications/%{name}.desktop -chmod 0644 %{buildroot}%{_datadir}/apps/bibletime/bibletimeui.rc -chmod 0644 %{buildroot}%{_datadir}/apps/bibletime/tips +chmod 0644 %{buildroot}%{_datadir}/apps/%{name}/bibletimeui.rc +chmod 0644 %{buildroot}%{_datadir}/apps/%{name}/tips cd %{name}-i18n-%{version} make DESTDIR=%{buildroot} install # remove empty file -[[ -s %{buildroot}/usr/share/doc/HTML/cs/bibletime/howto/how2-importance.docbook ]] || rm -f %{buildroot}/usr/share/doc/HTML/cs/bibletime/howto/how2-importance.docbook +[[ -s %{buildroot}%{_datadir}/doc/HTML/cs/%{name}/howto/how2-importance.docbook ]] || rm -f %{buildroot}%{_datadir}/doc/HTML/cs/%{name}/howto/how2-importance.docbook # rename wrongly-named locale -mv %{buildroot}/usr/share/locale/pt_br %{buildroot}/usr/share/locale/pt_BR || : +mv %{buildroot}%{_datadir}/locale/pt_br %{buildroot}%{_datadir}/locale/pt_BR || : +mv %{buildroot}%{_datadir}/doc/HTML/pt_br %{buildroot}%{_datadir}/doc/HTML/pt_BR || : -%find_lang bibletime || touch bibletime.lang +%find_lang %{name} || touch %{name}.lang HTML_DIR=$(kde-config --expandvars --install html) if [ -d %{buildroot}$HTML_DIR ]; then for lang_dir in %{buildroot}$HTML_DIR/* ; do lang=$(basename $lang_dir) - echo "%lang($lang) %doc $HTML_DIR/$lang/*" >> bibletime.lang + echo "%lang($lang) %doc $HTML_DIR/$lang/*" >> %{name}.lang done fi @@ -77,7 +78,7 @@ touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -%files -f %{name}-i18n-%{version}/bibletime.lang +%files -f %{name}-i18n-%{version}/%{name}.lang %defattr(-,root,root,-) %{_bindir}/* %{_datadir}/applications/*.desktop @@ -87,6 +88,12 @@ %doc README LICENSE %changelog +* Mon Feb 05 2007 David Anderson 1.6.3b-2 +- 1.6.3b + +* Sat Jan 27 2007 David Anderson 1.6.2-5 +- Correct wrong location of pt_BR files + * Mon Jan 15 2007 David Anderson 1.6.2-4 - Added internationalisation From fedora-extras-commits at redhat.com Mon Feb 5 15:26:04 2007 From: fedora-extras-commits at redhat.com (David Anderson (anderson)) Date: Mon, 5 Feb 2007 10:26:04 -0500 Subject: rpms/bibletime/FC-5 .cvsignore, 1.3, 1.4 bibletime.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200702051526.l15FQ45e031443@cvs-int.fedora.redhat.com> Author: anderson Update of /cvs/extras/rpms/bibletime/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31408 Modified Files: .cvsignore bibletime.spec sources Log Message: 1.6.3b Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bibletime/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 20 Jan 2007 15:45:07 -0000 1.3 +++ .cvsignore 5 Feb 2007 15:25:31 -0000 1.4 @@ -1,2 +1,2 @@ -bibletime-1.6.2.tar.bz2 -bibletime-i18n-1.6.2.tar.bz2 +bibletime-1.6.3b.tar.bz2 +bibletime-i18n-1.6.3b.tar.bz2 Index: bibletime.spec =================================================================== RCS file: /cvs/extras/rpms/bibletime/FC-5/bibletime.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- bibletime.spec 20 Jan 2007 15:45:07 -0000 1.2 +++ bibletime.spec 5 Feb 2007 15:25:31 -0000 1.3 @@ -1,13 +1,13 @@ Summary: BibleTime is an easy to use Bible study tool for KDE Name: bibletime -Version: 1.6.2 -Release: 4%{?dist} +Version: 1.6.3b +Release: 2%{?dist} License: GPL Url: http://www.bibletime.info/ Group: Applications/Productivity Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 Source1: http://downloads.sourceforge.net/%{name}/%{name}-i18n-%{version}.tar.bz2 -Patch0: bibletime-desktop.patch +Patch0: %{name}-desktop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sword-devel >= 1.5.9 clucene-core-devel >= 0.9.16a kdelibs-devel BuildRequires: desktop-file-utils gettext @@ -45,24 +45,25 @@ --delete-original \ %{buildroot}%{_datadir}/applications/%{name}.desktop -chmod 0644 %{buildroot}%{_datadir}/apps/bibletime/bibletimeui.rc -chmod 0644 %{buildroot}%{_datadir}/apps/bibletime/tips +chmod 0644 %{buildroot}%{_datadir}/apps/%{name}/bibletimeui.rc +chmod 0644 %{buildroot}%{_datadir}/apps/%{name}/tips cd %{name}-i18n-%{version} make DESTDIR=%{buildroot} install # remove empty file -[[ -s %{buildroot}/usr/share/doc/HTML/cs/bibletime/howto/how2-importance.docbook ]] || rm -f %{buildroot}/usr/share/doc/HTML/cs/bibletime/howto/how2-importance.docbook +[[ -s %{buildroot}%{_datadir}/doc/HTML/cs/%{name}/howto/how2-importance.docbook ]] || rm -f %{buildroot}%{_datadir}/doc/HTML/cs/%{name}/howto/how2-importance.docbook # rename wrongly-named locale -mv %{buildroot}/usr/share/locale/pt_br %{buildroot}/usr/share/locale/pt_BR || : +mv %{buildroot}%{_datadir}/locale/pt_br %{buildroot}%{_datadir}/locale/pt_BR || : +mv %{buildroot}%{_datadir}/doc/HTML/pt_br %{buildroot}%{_datadir}/doc/HTML/pt_BR || : -%find_lang bibletime || touch bibletime.lang +%find_lang %{name} || touch %{name}.lang HTML_DIR=$(kde-config --expandvars --install html) if [ -d %{buildroot}$HTML_DIR ]; then for lang_dir in %{buildroot}$HTML_DIR/* ; do lang=$(basename $lang_dir) - echo "%lang($lang) %doc $HTML_DIR/$lang/*" >> bibletime.lang + echo "%lang($lang) %doc $HTML_DIR/$lang/*" >> %{name}.lang done fi @@ -77,7 +78,7 @@ touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -%files -f %{name}-i18n-%{version}/bibletime.lang +%files -f %{name}-i18n-%{version}/%{name}.lang %defattr(-,root,root,-) %{_bindir}/* %{_datadir}/applications/*.desktop @@ -87,6 +88,12 @@ %doc README LICENSE %changelog +* Mon Feb 05 2007 David Anderson 1.6.3b-2 +- 1.6.3b + +* Sat Jan 27 2007 David Anderson 1.6.2-5 +- Correct wrong location of pt_BR files + * Mon Jan 15 2007 David Anderson 1.6.2-4 - Added internationalisation Index: sources =================================================================== RCS file: /cvs/extras/rpms/bibletime/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 20 Jan 2007 15:45:07 -0000 1.3 +++ sources 5 Feb 2007 15:25:31 -0000 1.4 @@ -1,2 +1,2 @@ -b2b8b624d21d397201aec742d43501e5 bibletime-1.6.2.tar.bz2 -a2d4dc8220253e39d8abf720c3ae8aff bibletime-i18n-1.6.2.tar.bz2 +50463409277994cf5da946cc12aefdd1 bibletime-1.6.3b.tar.bz2 +5ae7aeb18607971c80c68cf5a9c5ca4e bibletime-i18n-1.6.3b.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 5 15:29:14 2007 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Mon, 5 Feb 2007 10:29:14 -0500 Subject: rpms/gtkwave/devel .cvsignore, 1.30, 1.31 gtkwave.spec, 1.32, 1.33 sources, 1.30, 1.31 Message-ID: <200702051529.l15FTE2M031535@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31494 Modified Files: .cvsignore gtkwave.spec sources Log Message: update to 3.0.21 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/devel/.cvsignore,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- .cvsignore 24 Jan 2007 18:25:53 -0000 1.30 +++ .cvsignore 5 Feb 2007 15:28:42 -0000 1.31 @@ -1 +1 @@ -gtkwave-3.0.20.tar.gz +gtkwave-3.0.21.tar.gz Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/devel/gtkwave.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- gtkwave.spec 24 Jan 2007 18:25:53 -0000 1.32 +++ gtkwave.spec 5 Feb 2007 15:28:42 -0000 1.33 @@ -1,6 +1,6 @@ Summary: Waveform Viewer Name: gtkwave -Version: 3.0.20 +Version: 3.0.21 Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering @@ -89,6 +89,9 @@ %{_mandir}/man5/gtkwaverc.5* %changelog +* Mon Feb 5 2007 Paul Howarth 3.0.21-1 +- update to 3.0.21 + * Wed Jan 24 2007 Paul Howarth 3.0.20-1 - update to 3.0.20 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/devel/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 24 Jan 2007 18:25:53 -0000 1.30 +++ sources 5 Feb 2007 15:28:42 -0000 1.31 @@ -1 +1 @@ -235159d3ae5d9abbce979dceddd45c14 gtkwave-3.0.20.tar.gz +2fc49079acf649e081de1487a8cc6beb gtkwave-3.0.21.tar.gz From fedora-extras-commits at redhat.com Mon Feb 5 15:29:38 2007 From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu)) Date: Mon, 5 Feb 2007 10:29:38 -0500 Subject: rpms/sysprof-kmod/devel sysprof-kmod.spec,1.31,1.32 Message-ID: <200702051529.l15FTcCb031539@cvs-int.fedora.redhat.com> Author: giallu Update of /cvs/extras/rpms/sysprof-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31516 Modified Files: sysprof-kmod.spec Log Message: Rebuild for kernel 2.6.20-1.2922.fc7 Index: sysprof-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/sysprof-kmod/devel/sysprof-kmod.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- sysprof-kmod.spec 4 Feb 2007 22:13:51 -0000 1.31 +++ sysprof-kmod.spec 5 Feb 2007 15:29:06 -0000 1.32 @@ -4,7 +4,7 @@ # end stuff to be ... # hardcode for now: -%{!?kversion: %define kversion kernel-2.6.19-1.2919.fc7} +%{!?kversion: %define kversion 2.6.20-1.2922.fc7} # hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g. # --define "kversion 2.6.16-1.2096_FC5" From fedora-extras-commits at redhat.com Mon Feb 5 15:30:56 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Mon, 5 Feb 2007 10:30:56 -0500 Subject: rpms/heliodor/devel .cvsignore, 1.5, 1.6 heliodor.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200702051530.l15FUu4W031678@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/heliodor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31644 Modified Files: .cvsignore heliodor.spec sources Log Message: beryl 0.1.9999.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/heliodor/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 29 Jan 2007 21:46:33 -0000 1.5 +++ .cvsignore 5 Feb 2007 15:30:23 -0000 1.6 @@ -2,3 +2,4 @@ heliodor-0.1.3.tar.bz2 heliodor-0.1.4.tar.bz2 heliodor-0.1.99.2.tar.bz2 +heliodor-0.1.9999.1.tar.bz2 Index: heliodor.spec =================================================================== RCS file: /cvs/extras/rpms/heliodor/devel/heliodor.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- heliodor.spec 29 Jan 2007 21:46:33 -0000 1.5 +++ heliodor.spec 5 Feb 2007 15:30:23 -0000 1.6 @@ -2,7 +2,7 @@ Url: http://www.beryl-project.org/ License: GPL Group: User Interface/Desktops -Version: 0.1.99.2 +Version: 0.1.9999.1 Release: 1%{?dist} Summary: Beryl window decorator with Metacity theme support @@ -59,6 +59,9 @@ %changelog +* Mon Feb 05 2007 Jarod Wilson 0.1.9999.1-1 +- beryl 0.1.9999.1 (aka 0.2.0-rc1) + * Mon Jan 29 2007 Jarod Wilson 0.1.99.2-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/heliodor/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 29 Jan 2007 21:46:33 -0000 1.5 +++ sources 5 Feb 2007 15:30:23 -0000 1.6 @@ -1 +1 @@ -91a18d56cfa3be06dbb551e29b836921 heliodor-0.1.99.2.tar.bz2 +e790e20027b146567a99a758f5cf7c30 heliodor-0.1.9999.1.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 5 15:35:25 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Mon, 5 Feb 2007 10:35:25 -0500 Subject: rpms/aquamarine/devel .cvsignore, 1.5, 1.6 aquamarine.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200702051535.l15FZPWH031754@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/aquamarine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31720 Modified Files: .cvsignore aquamarine.spec sources Log Message: beryl 0.1.9999.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/aquamarine/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 29 Jan 2007 21:53:20 -0000 1.5 +++ .cvsignore 5 Feb 2007 15:34:53 -0000 1.6 @@ -2,3 +2,4 @@ aquamarine-0.1.3.tar.bz2 aquamarine-0.1.4.tar.bz2 aquamarine-0.1.99.2.tar.bz2 +aquamarine-0.1.9999.1.tar.bz2 Index: aquamarine.spec =================================================================== RCS file: /cvs/extras/rpms/aquamarine/devel/aquamarine.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- aquamarine.spec 29 Jan 2007 21:53:20 -0000 1.6 +++ aquamarine.spec 5 Feb 2007 15:34:53 -0000 1.7 @@ -2,7 +2,7 @@ Url: http://www.beryl-project.org/ License: GPL Group: User Interface/Desktops -Version: 0.1.99.2 +Version: 0.1.9999.1 Release: 1%{?dist} Summary: Themeable window decorator and compositing manager for Beryl @@ -65,6 +65,9 @@ %changelog +* Mon Feb 05 2007 Jarod Wilson 0.1.9999.1-1 +- beryl 0.1.9999.1 (aka 0.2.0-rc1) + * Mon Jan 29 2007 Jarod Wilson 0.1.99.2-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/aquamarine/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 29 Jan 2007 21:53:20 -0000 1.5 +++ sources 5 Feb 2007 15:34:53 -0000 1.6 @@ -1 +1 @@ -ddd1824eff9ef87cf94bad0529478853 aquamarine-0.1.99.2.tar.bz2 +aeb3fb74c880c7caa3e789b7248174bd aquamarine-0.1.9999.1.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 5 15:44:42 2007 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Mon, 5 Feb 2007 10:44:42 -0500 Subject: rpms/gtkwave/FC-6 .cvsignore, 1.30, 1.31 gtkwave.spec, 1.32, 1.33 sources, 1.30, 1.31 Message-ID: <200702051544.l15FigKY031884@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31857 Modified Files: .cvsignore gtkwave.spec sources Log Message: update to 3.0.21 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-6/.cvsignore,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- .cvsignore 24 Jan 2007 20:57:18 -0000 1.30 +++ .cvsignore 5 Feb 2007 15:44:10 -0000 1.31 @@ -1 +1 @@ -gtkwave-3.0.20.tar.gz +gtkwave-3.0.21.tar.gz Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-6/gtkwave.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- gtkwave.spec 24 Jan 2007 20:57:18 -0000 1.32 +++ gtkwave.spec 5 Feb 2007 15:44:10 -0000 1.33 @@ -1,6 +1,6 @@ Summary: Waveform Viewer Name: gtkwave -Version: 3.0.20 +Version: 3.0.21 Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering @@ -89,6 +89,9 @@ %{_mandir}/man5/gtkwaverc.5* %changelog +* Mon Feb 5 2007 Paul Howarth 3.0.21-1 +- update to 3.0.21 + * Wed Jan 24 2007 Paul Howarth 3.0.20-1 - update to 3.0.20 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-6/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 24 Jan 2007 20:57:18 -0000 1.30 +++ sources 5 Feb 2007 15:44:10 -0000 1.31 @@ -1 +1 @@ -235159d3ae5d9abbce979dceddd45c14 gtkwave-3.0.20.tar.gz +2fc49079acf649e081de1487a8cc6beb gtkwave-3.0.21.tar.gz From fedora-extras-commits at redhat.com Mon Feb 5 15:46:09 2007 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Mon, 5 Feb 2007 10:46:09 -0500 Subject: rpms/gtkwave/FC-5 .cvsignore, 1.30, 1.31 gtkwave.spec, 1.30, 1.31 sources, 1.30, 1.31 Message-ID: <200702051546.l15Fk93f031957@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31932 Modified Files: .cvsignore gtkwave.spec sources Log Message: update to 3.0.21 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-5/.cvsignore,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- .cvsignore 24 Jan 2007 20:59:01 -0000 1.30 +++ .cvsignore 5 Feb 2007 15:45:37 -0000 1.31 @@ -1 +1 @@ -gtkwave-3.0.20.tar.gz +gtkwave-3.0.21.tar.gz Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-5/gtkwave.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- gtkwave.spec 24 Jan 2007 20:59:01 -0000 1.30 +++ gtkwave.spec 5 Feb 2007 15:45:37 -0000 1.31 @@ -1,6 +1,6 @@ Summary: Waveform Viewer Name: gtkwave -Version: 3.0.20 +Version: 3.0.21 Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering @@ -89,6 +89,9 @@ %{_mandir}/man5/gtkwaverc.5* %changelog +* Mon Feb 5 2007 Paul Howarth 3.0.21-1 +- update to 3.0.21 + * Wed Jan 24 2007 Paul Howarth 3.0.20-1 - update to 3.0.20 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-5/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 24 Jan 2007 20:59:01 -0000 1.30 +++ sources 5 Feb 2007 15:45:37 -0000 1.31 @@ -1 +1 @@ -235159d3ae5d9abbce979dceddd45c14 gtkwave-3.0.20.tar.gz +2fc49079acf649e081de1487a8cc6beb gtkwave-3.0.21.tar.gz From fedora-extras-commits at redhat.com Mon Feb 5 16:09:24 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Mon, 5 Feb 2007 11:09:24 -0500 Subject: rpms/beryl-settings/devel .cvsignore, 1.5, 1.6 beryl-settings.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200702051609.l15G9Oek003041@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/beryl-settings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3020 Modified Files: .cvsignore beryl-settings.spec sources Log Message: beryl 0.1.9999.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/beryl-settings/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 29 Jan 2007 21:37:47 -0000 1.5 +++ .cvsignore 5 Feb 2007 16:08:52 -0000 1.6 @@ -4,3 +4,6 @@ beryl-settings-0.1.99.2.tar.bz2 beryl-settings-bindings-0.1.99.2.tar.bz2 beryl-settings-simple-0.1.99.2.tar.bz2 +beryl-settings-0.1.9999.1.tar.bz2 +beryl-settings-bindings-0.1.9999.1.tar.bz2 +beryl-settings-simple-0.1.9999.1.tar.bz2 Index: beryl-settings.spec =================================================================== RCS file: /cvs/extras/rpms/beryl-settings/devel/beryl-settings.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- beryl-settings.spec 29 Jan 2007 21:37:47 -0000 1.4 +++ beryl-settings.spec 5 Feb 2007 16:08:52 -0000 1.5 @@ -2,7 +2,7 @@ Url: http://www.beryl-project.org/ License: GPL Group: User Interface/Desktops -Version: 0.1.99.2 +Version: 0.1.9999.1 Release: 1%{?dist} Summary: Beryl OpenGL window and compositing manager GUI config utility @@ -10,12 +10,11 @@ Source0: http://releases.beryl-project.org/%{version}/%{name}-%{version}.tar.bz2 Source1: http://releases.beryl-project.org/%{version}/%{name}-bindings-%{version}.tar.bz2 Source2: http://releases.beryl-project.org/%{version}/%{name}-simple-%{version}.tar.bz2 -Source3: %{name}.desktop # libdrm is not available on these arches ExcludeArch: s390 s390x ppc64 -Requires: beryl-core >= %{version} +Requires: beryl-core >= %{version}, beryl-plugins >= %{version} BuildRequires: beryl-core-devel >= %{version} BuildRequires: gtk2-devel >= 2.8.0, gettext-devel @@ -36,16 +35,31 @@ manager. +%package simple +Summary: Simplified beryl settings GUI +Group: User Interface/Desktops +Requires: %{name} = %{version}-%{release} + + +%description simple +A beryl settings configuration utility that takes +a minimal, simplified approach to configuring beryl. + + %prep %setup -q -a 1 -a 2 %build -%configure -make %{?_smp_mflags} +# beryl-settings-bindings pushd beryl-settings-bindings-%{version} %configure make %{?_smp_mflags} popd +# beryl-settings +export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$RPM_BUILD_ROOT/beryl-settings-bindings-%{version}/ +%configure +make %{?_smp_mflags} +# beryl-settings-simple pushd beryl-settings-simple-%{version} %configure make %{?_smp_mflags} @@ -62,11 +76,14 @@ make DESTDIR=$RPM_BUILD_ROOT install popd find $RPM_BUILD_ROOT -type f -name "*.a" -o -name "*.la" | xargs rm -f -desktop-file-install --vendor fedora \ +desktop-file-install --vendor fedora --delete-original \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category X-Fedora %{name}.desktop +desktop-file-install --vendor fedora --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category X-Fedora %{SOURCE3} -# translations seem to have disappeared in 0.1.99.2... -#find_lang %{name} + --add-category X-Fedora %{name}-simple-%{version}/%{name}-simple.desktop +%find_lang %{name} +%find_lang %{name}-simple %clean @@ -83,28 +100,37 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : -#files -f %{name}.lang -%files +%files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README %{_bindir}/beryl-settings -%{_bindir}/beryl-settings-simple %{python_sitearch}/berylsettings.so %{_libdir}/pkgconfig/beryl-settings-bindings.pc %dir %{_datadir}/bsm %dir %{_datadir}/bsm/images -%dir %{_datadir}/beryl-settings-simple %{_datadir}/bsm/images/*.svg +%{_datadir}/icons/hicolor/scalable/apps/beryl-settings.svg +%{_datadir}/applications/*beryl-settings.desktop +# Man page went awol in 0.1.99.2... +#{_mandir}/man1/beryl-settings.1.gz + + +%files simple -f %{name}-simple.lang +%defattr(-,root,root,-) +%{_bindir}/beryl-settings-simple +%dir %{_datadir}/beryl-settings-simple %{_datadir}/beryl-settings-simple/*.svg %{_datadir}/beryl-settings-simple/*.png %{_datadir}/beryl-settings-simple/*.Profile -%{_datadir}/icons/hicolor/scalable/apps/beryl-settings.svg -%{_datadir}/applications/*.desktop -# Man page also went awol in 0.1.99.2... -#{_mandir}/man1/beryl-settings.1.gz +%{_datadir}/applications/*beryl-settings-simple.desktop %changelog +* Mon Feb 05 2007 Jarod Wilson 0.1.9999.1-1 +- beryl 0.1.9999.1 (aka 0.2.0-rc1) +- put beryl-settings-simple in its own package +- R: beryl-plugins, or there's nothing to configure + * Mon Jan 29 2007 Jarod Wilson 0.1.99.2-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/beryl-settings/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 29 Jan 2007 21:37:47 -0000 1.5 +++ sources 5 Feb 2007 16:08:52 -0000 1.6 @@ -1,3 +1,3 @@ -268098ad5bb563d0c5abbbc3af81f00f beryl-settings-0.1.99.2.tar.bz2 -84a1ad03e0ba5bfed8a80e7e15c00f7d beryl-settings-bindings-0.1.99.2.tar.bz2 -5d94ca4f8e85fad68029a11fb7cc9cff beryl-settings-simple-0.1.99.2.tar.bz2 +77d42004275638bbba38dd0abdbb3f95 beryl-settings-0.1.9999.1.tar.bz2 +b5d4b936c8ee43ed61f1125509ebe184 beryl-settings-bindings-0.1.9999.1.tar.bz2 +f34cfc2d55a7bd2c317f890262dde673 beryl-settings-simple-0.1.9999.1.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 5 16:16:53 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Mon, 5 Feb 2007 11:16:53 -0500 Subject: rpms/jd/devel .cvsignore, 1.61, 1.62 jd.spec, 1.72, 1.73 sources, 1.61, 1.62 Message-ID: <200702051616.l15GGrOA003423@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3384 Modified Files: .cvsignore jd.spec sources Log Message: * Mon Feb 5 2007 Mamoru Tasaka - 1.8.5-2.cvs070205 - cvs 070205 (22:35 JST) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- .cvsignore 4 Feb 2007 16:44:15 -0000 1.61 +++ .cvsignore 5 Feb 2007 16:16:20 -0000 1.62 @@ -1 +1 @@ -jd-1.8.5-cvs070204.tgz +jd-1.8.5-cvs070205.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- jd.spec 4 Feb 2007 17:02:21 -0000 1.72 +++ jd.spec 5 Feb 2007 16:16:20 -0000 1.73 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 1.8.5 -%define strtag cvs070204 +%define strtag cvs070205 %define repoid 23816 @@ -106,8 +106,8 @@ %{icondir}/%{name}.png %changelog -* Sun Feb 4 2007 Mamoru Tasaka - 1.8.5-2.cvs070204 -- cvs 070204 (15:25 JST) +* Mon Feb 5 2007 Mamoru Tasaka - 1.8.5-2.cvs070205 +- cvs 070205 (22:35 JST) * Fri Feb 2 2007 Mamoru Tasaka - 1.8.5-1 - 1.8.5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- sources 4 Feb 2007 16:44:15 -0000 1.61 +++ sources 5 Feb 2007 16:16:20 -0000 1.62 @@ -1 +1 @@ -8dd52e718a2e5847cbf49450bc8fb886 jd-1.8.5-cvs070204.tgz +d2c516c6c34cefa1d90b78f0b7f74c11 jd-1.8.5-cvs070205.tgz From fedora-extras-commits at redhat.com Mon Feb 5 16:17:44 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Mon, 5 Feb 2007 11:17:44 -0500 Subject: rpms/beryl-core/FC-6 .cvsignore, 1.6, 1.7 beryl-core.spec, 1.9, 1.10 sources, 1.6, 1.7 Message-ID: <200702051617.l15GHi4n003520@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/beryl-core/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3474 Modified Files: .cvsignore beryl-core.spec sources Log Message: beryl 0.1.9999.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/beryl-core/FC-6/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 29 Jan 2007 21:04:19 -0000 1.6 +++ .cvsignore 5 Feb 2007 16:17:12 -0000 1.7 @@ -5,3 +5,4 @@ beryl-mesa-0.1.4.tar.bz2 beryl-core-0.1.99.2.tar.bz2 beryl-mesa-0.1.99.2.tar.bz2 +beryl-core-0.1.9999.1.tar.bz2 Index: beryl-core.spec =================================================================== RCS file: /cvs/extras/rpms/beryl-core/FC-6/beryl-core.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- beryl-core.spec 30 Jan 2007 19:51:42 -0000 1.9 +++ beryl-core.spec 5 Feb 2007 16:17:12 -0000 1.10 @@ -2,13 +2,13 @@ Url: http://www.beryl-project.org/ License: GPL Group: User Interface/Desktops -Version: 0.1.99.2 +Version: 0.1.9999.1 Release: 2%{?dist} Summary: Beryl OpenGL window and compositing manager BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://releases.beryl-project.org/%{version}/%{name}-%{version}.tar.bz2 -Source1: http://releases.beryl-project.org/%{version}/beryl-mesa-%{version}.tar.bz2 +Source1: http://releases.beryl-project.org/0.1.99.2/beryl-mesa-0.1.99.2.tar.bz2 Patch0: mesa-6.4.1-x86_64-fixes-1.patch # libdrm is not avaliable on these arches @@ -70,8 +70,8 @@ Summary: Beryl meta-package to install all beryl components for Gnome Group: User Interface/Desktops Requires: %{name} = %{version}-%{release} -Requires: beryl-manager >= %{version}, beryl-settings >= %{version} -Requires: beryl-plugins >= %{version} +Requires: beryl-settings >= %{version}, beryl-settings-simple >= %{version} +Requires: beryl-manager >= %{version}, beryl-plugins >= %{version} #Requires: beryl-vidcap >= %{version} Requires: emerald >= %{version}, emerald-themes >= %{version} Requires: heliodor >= %{version} @@ -85,8 +85,8 @@ Summary: Beryl meta-package to install all beryl components for KDE Group: User Interface/Desktops Requires: %{name} = %{version}-%{release} -Requires: beryl-manager >= %{version}, beryl-settings >= %{version} -Requires: beryl-plugins >= %{version} +Requires: beryl-settings >= %{version}, beryl-settings-simple >= %{version} +Requires: beryl-manager >= %{version}, beryl-plugins >= %{version} #Requires: beryl-vidcap >= %{version} Requires: emerald >= %{version}, emerald-themes >= %{version} Requires: aquamarine >= %{version} @@ -159,6 +159,12 @@ %defattr(-,root,root,-) %changelog +* Mon Feb 05 2007 Jarod Wilson 0.1.9999.1-2 +- Add R: on beryl-settings-simple to meta-packages + +* Mon Feb 05 2007 Jarod Wilson 0.1.9999.1-1 +- beryl 0.1.9999.1 (aka 0.2.0-rc1) + * Tue Jan 30 2007 Jarod Wilson 0.1.99.2-2 - Un-require beryl-dbus, since its part of beryl-plugins now Index: sources =================================================================== RCS file: /cvs/extras/rpms/beryl-core/FC-6/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 29 Jan 2007 21:04:19 -0000 1.6 +++ sources 5 Feb 2007 16:17:12 -0000 1.7 @@ -1,2 +1,2 @@ -e439403ce19130e37f46185a65465c9b beryl-core-0.1.99.2.tar.bz2 387d068091bc5c6fa28f6d754e1296d1 beryl-mesa-0.1.99.2.tar.bz2 +e7f65f7caf72ed7ec55f46468099f694 beryl-core-0.1.9999.1.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 5 16:18:11 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Mon, 5 Feb 2007 11:18:11 -0500 Subject: rpms/beryl-core/devel beryl-core.spec,1.12,1.13 Message-ID: <200702051618.l15GIBDZ003556@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/beryl-core/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3500 Modified Files: beryl-core.spec Log Message: Add R: on beryl-settings-simple to meta-packages Index: beryl-core.spec =================================================================== RCS file: /cvs/extras/rpms/beryl-core/devel/beryl-core.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- beryl-core.spec 5 Feb 2007 15:09:49 -0000 1.12 +++ beryl-core.spec 5 Feb 2007 16:17:39 -0000 1.13 @@ -3,7 +3,7 @@ License: GPL Group: User Interface/Desktops Version: 0.1.9999.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Beryl OpenGL window and compositing manager BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -70,8 +70,8 @@ Summary: Beryl meta-package to install all beryl components for Gnome Group: User Interface/Desktops Requires: %{name} = %{version}-%{release} -Requires: beryl-manager >= %{version}, beryl-settings >= %{version} -Requires: beryl-plugins >= %{version} +Requires: beryl-settings >= %{version}, beryl-settings-simple >= %{version} +Requires: beryl-manager >= %{version}, beryl-plugins >= %{version} #Requires: beryl-vidcap >= %{version} Requires: emerald >= %{version}, emerald-themes >= %{version} Requires: heliodor >= %{version} @@ -85,8 +85,8 @@ Summary: Beryl meta-package to install all beryl components for KDE Group: User Interface/Desktops Requires: %{name} = %{version}-%{release} -Requires: beryl-manager >= %{version}, beryl-settings >= %{version} -Requires: beryl-plugins >= %{version} +Requires: beryl-settings >= %{version}, beryl-settings-simple >= %{version} +Requires: beryl-manager >= %{version}, beryl-plugins >= %{version} #Requires: beryl-vidcap >= %{version} Requires: emerald >= %{version}, emerald-themes >= %{version} Requires: aquamarine >= %{version} @@ -159,6 +159,9 @@ %defattr(-,root,root,-) %changelog +* Mon Feb 05 2007 Jarod Wilson 0.1.9999.1-2 +- Add R: on beryl-settings-simple to meta-packages + * Mon Feb 05 2007 Jarod Wilson 0.1.9999.1-1 - beryl 0.1.9999.1 (aka 0.2.0-rc1) From fedora-extras-commits at redhat.com Mon Feb 5 16:18:18 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Mon, 5 Feb 2007 11:18:18 -0500 Subject: rpms/beryl-manager/FC-6 .cvsignore, 1.5, 1.6 beryl-manager.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <200702051618.l15GIIlr003561@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/beryl-manager/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3529 Modified Files: .cvsignore beryl-manager.spec sources Log Message: beryl 0.1.9999.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/beryl-manager/FC-6/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 29 Jan 2007 21:23:03 -0000 1.5 +++ .cvsignore 5 Feb 2007 16:17:46 -0000 1.6 @@ -2,3 +2,4 @@ beryl-manager-0.1.3.tar.bz2 beryl-manager-0.1.4.tar.bz2 beryl-manager-0.1.99.2.tar.bz2 +beryl-manager-0.1.9999.1.tar.bz2 Index: beryl-manager.spec =================================================================== RCS file: /cvs/extras/rpms/beryl-manager/FC-6/beryl-manager.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- beryl-manager.spec 29 Jan 2007 21:23:03 -0000 1.7 +++ beryl-manager.spec 5 Feb 2007 16:17:46 -0000 1.8 @@ -2,7 +2,7 @@ Url: http://www.beryl-project.org/ License: GPL Group: User Interface/Desktops -Version: 0.1.99.2 +Version: 0.1.9999.1 Release: 1%{?dist} Summary: Beryl window decorator and theme management utility @@ -85,6 +85,9 @@ %changelog +* Mon Feb 05 2007 Jarod Wilson 0.1.9999.1-1 +- beryl 0.1.9999.1 (aka 0.2.0-rc1) + * Mon Jan 29 2007 Jarod Wilson 0.1.99.2-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/beryl-manager/FC-6/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 29 Jan 2007 21:23:03 -0000 1.5 +++ sources 5 Feb 2007 16:17:46 -0000 1.6 @@ -1 +1 @@ -e685d436599297b6921f88b59d4635c4 beryl-manager-0.1.99.2.tar.bz2 +805f50dc6c0fb5c3f8fa0d853710807f beryl-manager-0.1.9999.1.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 5 16:18:52 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Mon, 5 Feb 2007 11:18:52 -0500 Subject: rpms/beryl-plugins/FC-6 .cvsignore, 1.5, 1.6 beryl-plugins.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200702051618.l15GIqa7003599@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/beryl-plugins/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3567 Modified Files: .cvsignore beryl-plugins.spec sources Log Message: beryl 0.1.9999.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/beryl-plugins/FC-6/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 29 Jan 2007 21:35:33 -0000 1.5 +++ .cvsignore 5 Feb 2007 16:18:20 -0000 1.6 @@ -2,3 +2,4 @@ beryl-plugins-0.1.3.tar.bz2 beryl-plugins-0.1.4.tar.bz2 beryl-plugins-0.1.99.2.tar.bz2 +beryl-plugins-0.1.9999.1.tar.bz2 Index: beryl-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/beryl-plugins/FC-6/beryl-plugins.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- beryl-plugins.spec 30 Jan 2007 19:56:36 -0000 1.6 +++ beryl-plugins.spec 5 Feb 2007 16:18:20 -0000 1.7 @@ -2,8 +2,8 @@ Url: http://www.beryl-project.org/ License: GPL Group: User Interface/Desktops -Version: 0.1.99.2 -Release: 3%{?dist} +Version: 0.1.9999.1 +Release: 1%{?dist} Summary: Beryl OpenGL window and compositing manager plug-ins BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -62,6 +62,9 @@ %changelog +* Mon Feb 05 2007 Jarod Wilson 0.1.9999.1-1 +- beryl 0.1.9999.1 (aka 0.2.0-rc1) + * Tue Jan 30 2007 Jarod Wilson 0.1.99.2-3 - Forgot to Provides: beryl-dbus Index: sources =================================================================== RCS file: /cvs/extras/rpms/beryl-plugins/FC-6/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 29 Jan 2007 21:35:33 -0000 1.5 +++ sources 5 Feb 2007 16:18:20 -0000 1.6 @@ -1 +1 @@ -7b116756dd841afa0c72f5556284714e beryl-plugins-0.1.99.2.tar.bz2 +be876763b0bd9f2c11cca764ce348c3d beryl-plugins-0.1.9999.1.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 5 16:19:27 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Mon, 5 Feb 2007 11:19:27 -0500 Subject: rpms/beryl-settings/FC-6 .cvsignore, 1.5, 1.6 beryl-settings.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200702051619.l15GJRit003628@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/beryl-settings/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3605 Modified Files: .cvsignore beryl-settings.spec sources Log Message: beryl 0.1.9999.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/beryl-settings/FC-6/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 29 Jan 2007 21:38:49 -0000 1.5 +++ .cvsignore 5 Feb 2007 16:18:55 -0000 1.6 @@ -4,3 +4,6 @@ beryl-settings-0.1.99.2.tar.bz2 beryl-settings-bindings-0.1.99.2.tar.bz2 beryl-settings-simple-0.1.99.2.tar.bz2 +beryl-settings-0.1.9999.1.tar.bz2 +beryl-settings-bindings-0.1.9999.1.tar.bz2 +beryl-settings-simple-0.1.9999.1.tar.bz2 Index: beryl-settings.spec =================================================================== RCS file: /cvs/extras/rpms/beryl-settings/FC-6/beryl-settings.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- beryl-settings.spec 29 Jan 2007 21:38:49 -0000 1.4 +++ beryl-settings.spec 5 Feb 2007 16:18:55 -0000 1.5 @@ -2,7 +2,7 @@ Url: http://www.beryl-project.org/ License: GPL Group: User Interface/Desktops -Version: 0.1.99.2 +Version: 0.1.9999.1 Release: 1%{?dist} Summary: Beryl OpenGL window and compositing manager GUI config utility @@ -10,12 +10,11 @@ Source0: http://releases.beryl-project.org/%{version}/%{name}-%{version}.tar.bz2 Source1: http://releases.beryl-project.org/%{version}/%{name}-bindings-%{version}.tar.bz2 Source2: http://releases.beryl-project.org/%{version}/%{name}-simple-%{version}.tar.bz2 -Source3: %{name}.desktop # libdrm is not available on these arches ExcludeArch: s390 s390x ppc64 -Requires: beryl-core >= %{version} +Requires: beryl-core >= %{version}, beryl-plugins >= %{version} BuildRequires: beryl-core-devel >= %{version} BuildRequires: gtk2-devel >= 2.8.0, gettext-devel @@ -36,16 +35,31 @@ manager. +%package simple +Summary: Simplified beryl settings GUI +Group: User Interface/Desktops +Requires: %{name} = %{version}-%{release} + + +%description simple +A beryl settings configuration utility that takes +a minimal, simplified approach to configuring beryl. + + %prep %setup -q -a 1 -a 2 %build -%configure -make %{?_smp_mflags} +# beryl-settings-bindings pushd beryl-settings-bindings-%{version} %configure make %{?_smp_mflags} popd +# beryl-settings +export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$RPM_BUILD_ROOT/beryl-settings-bindings-%{version}/ +%configure +make %{?_smp_mflags} +# beryl-settings-simple pushd beryl-settings-simple-%{version} %configure make %{?_smp_mflags} @@ -62,11 +76,14 @@ make DESTDIR=$RPM_BUILD_ROOT install popd find $RPM_BUILD_ROOT -type f -name "*.a" -o -name "*.la" | xargs rm -f -desktop-file-install --vendor fedora \ +desktop-file-install --vendor fedora --delete-original \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category X-Fedora %{name}.desktop +desktop-file-install --vendor fedora --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category X-Fedora %{SOURCE3} -# translations seem to have disappeared in 0.1.99.2... -#find_lang %{name} + --add-category X-Fedora %{name}-simple-%{version}/%{name}-simple.desktop +%find_lang %{name} +%find_lang %{name}-simple %clean @@ -83,28 +100,37 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : -#files -f %{name}.lang -%files +%files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README %{_bindir}/beryl-settings -%{_bindir}/beryl-settings-simple %{python_sitearch}/berylsettings.so %{_libdir}/pkgconfig/beryl-settings-bindings.pc %dir %{_datadir}/bsm %dir %{_datadir}/bsm/images -%dir %{_datadir}/beryl-settings-simple %{_datadir}/bsm/images/*.svg +%{_datadir}/icons/hicolor/scalable/apps/beryl-settings.svg +%{_datadir}/applications/*beryl-settings.desktop +# Man page went awol in 0.1.99.2... +#{_mandir}/man1/beryl-settings.1.gz + + +%files simple -f %{name}-simple.lang +%defattr(-,root,root,-) +%{_bindir}/beryl-settings-simple +%dir %{_datadir}/beryl-settings-simple %{_datadir}/beryl-settings-simple/*.svg %{_datadir}/beryl-settings-simple/*.png %{_datadir}/beryl-settings-simple/*.Profile -%{_datadir}/icons/hicolor/scalable/apps/beryl-settings.svg -%{_datadir}/applications/*.desktop -# Man page also went awol in 0.1.99.2... -#{_mandir}/man1/beryl-settings.1.gz +%{_datadir}/applications/*beryl-settings-simple.desktop %changelog +* Mon Feb 05 2007 Jarod Wilson 0.1.9999.1-1 +- beryl 0.1.9999.1 (aka 0.2.0-rc1) +- put beryl-settings-simple in its own package +- R: beryl-plugins, or there's nothing to configure + * Mon Jan 29 2007 Jarod Wilson 0.1.99.2-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/beryl-settings/FC-6/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 29 Jan 2007 21:38:49 -0000 1.5 +++ sources 5 Feb 2007 16:18:55 -0000 1.6 @@ -1,3 +1,3 @@ -268098ad5bb563d0c5abbbc3af81f00f beryl-settings-0.1.99.2.tar.bz2 -84a1ad03e0ba5bfed8a80e7e15c00f7d beryl-settings-bindings-0.1.99.2.tar.bz2 -5d94ca4f8e85fad68029a11fb7cc9cff beryl-settings-simple-0.1.99.2.tar.bz2 +77d42004275638bbba38dd0abdbb3f95 beryl-settings-0.1.9999.1.tar.bz2 +b5d4b936c8ee43ed61f1125509ebe184 beryl-settings-bindings-0.1.9999.1.tar.bz2 +f34cfc2d55a7bd2c317f890262dde673 beryl-settings-simple-0.1.9999.1.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 5 16:20:02 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Mon, 5 Feb 2007 11:20:02 -0500 Subject: rpms/emerald/FC-6 .cvsignore, 1.5, 1.6 emerald.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200702051620.l15GK2eL003657@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/emerald/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3634 Modified Files: .cvsignore emerald.spec sources Log Message: beryl 0.1.9999.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/emerald/FC-6/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 29 Jan 2007 21:42:31 -0000 1.5 +++ .cvsignore 5 Feb 2007 16:19:30 -0000 1.6 @@ -2,3 +2,4 @@ emerald-0.1.3.tar.bz2 emerald-0.1.4.tar.bz2 emerald-0.1.99.2.tar.bz2 +emerald-0.1.9999.1.tar.bz2 Index: emerald.spec =================================================================== RCS file: /cvs/extras/rpms/emerald/FC-6/emerald.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- emerald.spec 29 Jan 2007 21:42:31 -0000 1.4 +++ emerald.spec 5 Feb 2007 16:19:30 -0000 1.5 @@ -2,7 +2,7 @@ Url: http://www.beryl-project.org/ License: GPL Group: User Interface/Desktops -Version: 0.1.99.2 +Version: 0.1.9999.1 Release: 1%{?dist} Summary: Themeable window decorator and compositing manager for Beryl @@ -109,6 +109,9 @@ %{_libdir}/libemeraldengine.so %changelog +* Mon Feb 05 2007 Jarod Wilson 0.1.9999.1-1 +- beryl 0.1.9999.1 (aka 0.2.0-rc1) + * Mon Jan 29 2007 Jarod Wilson 0.1.99.2-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/emerald/FC-6/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 29 Jan 2007 21:42:31 -0000 1.5 +++ sources 5 Feb 2007 16:19:30 -0000 1.6 @@ -1 +1 @@ -fdcc88cd8e75e144a07138525e342370 emerald-0.1.99.2.tar.bz2 +c7d59e008ad031c65b621bbcd8868588 emerald-0.1.9999.1.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 5 16:20:36 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Mon, 5 Feb 2007 11:20:36 -0500 Subject: rpms/emerald-themes/FC-6 .cvsignore, 1.5, 1.6 emerald-themes.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200702051620.l15GKad5003686@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/emerald-themes/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3663 Modified Files: .cvsignore emerald-themes.spec sources Log Message: beryl 0.1.9999.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/emerald-themes/FC-6/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 29 Jan 2007 21:44:55 -0000 1.5 +++ .cvsignore 5 Feb 2007 16:20:04 -0000 1.6 @@ -2,3 +2,4 @@ emerald-themes-0.1.3.tar.bz2 emerald-themes-0.1.4.tar.bz2 emerald-themes-0.1.99.2.tar.bz2 +emerald-themes-0.1.9999.1.tar.bz2 Index: emerald-themes.spec =================================================================== RCS file: /cvs/extras/rpms/emerald-themes/FC-6/emerald-themes.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- emerald-themes.spec 29 Jan 2007 21:44:55 -0000 1.4 +++ emerald-themes.spec 5 Feb 2007 16:20:04 -0000 1.5 @@ -2,7 +2,7 @@ Url: http://www.beryl-project.org/ License: GPL Group: User Interface/Desktops -Version: 0.1.99.2 +Version: 0.1.9999.1 Release: 1%{?dist} Summary: Themes for Emerald, the window decorator for Beryl @@ -47,6 +47,9 @@ %changelog +* Mon Feb 05 2007 Jarod Wilson 0.1.9999.1-1 +- beryl 0.1.9999.1 (aka 0.2.0-rc1) + * Mon Jan 29 2007 Jarod Wilson 0.1.99.2-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/emerald-themes/FC-6/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 29 Jan 2007 21:44:55 -0000 1.5 +++ sources 5 Feb 2007 16:20:04 -0000 1.6 @@ -1 +1 @@ -abfe5c942e290ddd22db5e94d217fdb7 emerald-themes-0.1.99.2.tar.bz2 +6e22d32afa755b53dca15d65b3ac9ee3 emerald-themes-0.1.9999.1.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 5 16:21:11 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Mon, 5 Feb 2007 11:21:11 -0500 Subject: rpms/heliodor/FC-6 .cvsignore, 1.5, 1.6 heliodor.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200702051621.l15GLBOM003720@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/heliodor/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3692 Modified Files: .cvsignore heliodor.spec sources Log Message: beryl 0.1.9999.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/heliodor/FC-6/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 29 Jan 2007 21:48:52 -0000 1.5 +++ .cvsignore 5 Feb 2007 16:20:38 -0000 1.6 @@ -2,3 +2,4 @@ heliodor-0.1.3.tar.bz2 heliodor-0.1.4.tar.bz2 heliodor-0.1.99.2.tar.bz2 +heliodor-0.1.9999.1.tar.bz2 Index: heliodor.spec =================================================================== RCS file: /cvs/extras/rpms/heliodor/FC-6/heliodor.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- heliodor.spec 29 Jan 2007 21:48:52 -0000 1.4 +++ heliodor.spec 5 Feb 2007 16:20:38 -0000 1.5 @@ -2,7 +2,7 @@ Url: http://www.beryl-project.org/ License: GPL Group: User Interface/Desktops -Version: 0.1.99.2 +Version: 0.1.9999.1 Release: 1%{?dist} Summary: Beryl window decorator with Metacity theme support @@ -59,6 +59,9 @@ %changelog +* Mon Feb 05 2007 Jarod Wilson 0.1.9999.1-1 +- beryl 0.1.9999.1 (aka 0.2.0-rc1) + * Mon Jan 29 2007 Jarod Wilson 0.1.99.2-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/heliodor/FC-6/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 29 Jan 2007 21:48:52 -0000 1.5 +++ sources 5 Feb 2007 16:20:38 -0000 1.6 @@ -1 +1 @@ -91a18d56cfa3be06dbb551e29b836921 heliodor-0.1.99.2.tar.bz2 +e790e20027b146567a99a758f5cf7c30 heliodor-0.1.9999.1.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 5 16:21:45 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Mon, 5 Feb 2007 11:21:45 -0500 Subject: rpms/aquamarine/FC-6 .cvsignore, 1.5, 1.6 aquamarine.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200702051621.l15GLjNg003748@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/aquamarine/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3726 Modified Files: .cvsignore aquamarine.spec sources Log Message: beryl 0.1.9999.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/aquamarine/FC-6/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 29 Jan 2007 22:00:37 -0000 1.5 +++ .cvsignore 5 Feb 2007 16:21:13 -0000 1.6 @@ -2,3 +2,4 @@ aquamarine-0.1.3.tar.bz2 aquamarine-0.1.4.tar.bz2 aquamarine-0.1.99.2.tar.bz2 +aquamarine-0.1.9999.1.tar.bz2 Index: aquamarine.spec =================================================================== RCS file: /cvs/extras/rpms/aquamarine/FC-6/aquamarine.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- aquamarine.spec 29 Jan 2007 22:00:37 -0000 1.5 +++ aquamarine.spec 5 Feb 2007 16:21:13 -0000 1.6 @@ -2,7 +2,7 @@ Url: http://www.beryl-project.org/ License: GPL Group: User Interface/Desktops -Version: 0.1.99.2 +Version: 0.1.9999.1 Release: 1%{?dist} Summary: Themeable window decorator and compositing manager for Beryl @@ -65,6 +65,9 @@ %changelog +* Mon Feb 05 2007 Jarod Wilson 0.1.9999.1-1 +- beryl 0.1.9999.1 (aka 0.2.0-rc1) + * Mon Jan 29 2007 Jarod Wilson 0.1.99.2-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/aquamarine/FC-6/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 29 Jan 2007 22:00:37 -0000 1.5 +++ sources 5 Feb 2007 16:21:13 -0000 1.6 @@ -1 +1 @@ -ddd1824eff9ef87cf94bad0529478853 aquamarine-0.1.99.2.tar.bz2 +aeb3fb74c880c7caa3e789b7248174bd aquamarine-0.1.9999.1.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 5 16:45:50 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Mon, 5 Feb 2007 11:45:50 -0500 Subject: rpms/beryl-settings/FC-6 beryl-settings.spec,1.5,1.6 Message-ID: <200702051645.l15Gjo62003983@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/beryl-settings/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3961 Modified Files: beryl-settings.spec Log Message: Fix up pkg-config search path so this actually builds... Index: beryl-settings.spec =================================================================== RCS file: /cvs/extras/rpms/beryl-settings/FC-6/beryl-settings.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- beryl-settings.spec 5 Feb 2007 16:18:55 -0000 1.5 +++ beryl-settings.spec 5 Feb 2007 16:45:18 -0000 1.6 @@ -56,7 +56,7 @@ make %{?_smp_mflags} popd # beryl-settings -export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$RPM_BUILD_ROOT/beryl-settings-bindings-%{version}/ +export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$RPM_BUILD_DIR/%{name}-%{version}/%{name}-bindings-%{version}/ %configure make %{?_smp_mflags} # beryl-settings-simple @@ -68,20 +68,23 @@ %install rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install +# beryl-settings-bindings pushd beryl-settings-bindings-%{version} make DESTDIR=$RPM_BUILD_ROOT install popd -pushd beryl-settings-simple-%{version} +# beryl-settings make DESTDIR=$RPM_BUILD_ROOT install -popd -find $RPM_BUILD_ROOT -type f -name "*.a" -o -name "*.la" | xargs rm -f desktop-file-install --vendor fedora --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora %{name}.desktop +# beryl-settings-simple +pushd beryl-settings-simple-%{version} +make DESTDIR=$RPM_BUILD_ROOT install desktop-file-install --vendor fedora --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category X-Fedora %{name}-simple-%{version}/%{name}-simple.desktop + --add-category X-Fedora %{name}-simple.desktop +popd +find $RPM_BUILD_ROOT -type f -name "*.a" -o -name "*.la" | xargs rm -f %find_lang %{name} %find_lang %{name}-simple From fedora-extras-commits at redhat.com Mon Feb 5 16:47:35 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Mon, 5 Feb 2007 11:47:35 -0500 Subject: rpms/beryl-settings/devel beryl-settings.spec,1.6,1.7 Message-ID: <200702051647.l15GlZuh004036@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/beryl-settings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4019 Modified Files: beryl-settings.spec Log Message: helps to bump the release properly... Index: beryl-settings.spec =================================================================== RCS file: /cvs/extras/rpms/beryl-settings/devel/beryl-settings.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- beryl-settings.spec 5 Feb 2007 16:45:01 -0000 1.6 +++ beryl-settings.spec 5 Feb 2007 16:47:03 -0000 1.7 @@ -3,7 +3,7 @@ License: GPL Group: User Interface/Desktops Version: 0.1.9999.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Beryl OpenGL window and compositing manager GUI config utility BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -129,6 +129,10 @@ %changelog +* Mon Feb 05 2007 Jarod Wilson 0.1.9999.1-2 +- Fix pkg-config path so this actually builds +- Reshuffle build section a bit + * Mon Feb 05 2007 Jarod Wilson 0.1.9999.1-1 - beryl 0.1.9999.1 (aka 0.2.0-rc1) - put beryl-settings-simple in its own package From fedora-extras-commits at redhat.com Mon Feb 5 16:49:16 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Mon, 5 Feb 2007 11:49:16 -0500 Subject: rpms/beryl-settings/FC-6 beryl-settings.spec,1.6,1.7 Message-ID: <200702051649.l15GnGuA004099@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/beryl-settings/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4082 Modified Files: beryl-settings.spec Log Message: helps to bump the release properly... Index: beryl-settings.spec =================================================================== RCS file: /cvs/extras/rpms/beryl-settings/FC-6/beryl-settings.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- beryl-settings.spec 5 Feb 2007 16:45:18 -0000 1.6 +++ beryl-settings.spec 5 Feb 2007 16:48:44 -0000 1.7 @@ -3,7 +3,7 @@ License: GPL Group: User Interface/Desktops Version: 0.1.9999.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Beryl OpenGL window and compositing manager GUI config utility BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -129,6 +129,10 @@ %changelog +* Mon Feb 05 2007 Jarod Wilson 0.1.9999.1-2 +- Fix pkg-config path so this actually builds +- Reshuffle build section a bit + * Mon Feb 05 2007 Jarod Wilson 0.1.9999.1-1 - beryl 0.1.9999.1 (aka 0.2.0-rc1) - put beryl-settings-simple in its own package From fedora-extras-commits at redhat.com Mon Feb 5 16:54:37 2007 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 5 Feb 2007 11:54:37 -0500 Subject: rpms/gnonlin/devel .cvsignore, 1.6, 1.7 gnonlin.spec, 1.11, 1.12 sources, 1.6, 1.7 Message-ID: <200702051654.l15Gsbtn004254@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gnonlin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4229 Modified Files: .cvsignore gnonlin.spec sources Log Message: * Mon Feb 5 2007 Brian Pepple - 0.10.7-1 - Update to 0.10.7. - Bump gstreamer version required. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnonlin/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 28 Nov 2006 17:26:50 -0000 1.6 +++ .cvsignore 5 Feb 2007 16:54:05 -0000 1.7 @@ -1 +1 @@ -gnonlin-0.10.6.tar.bz2 +gnonlin-0.10.7.tar.bz2 Index: gnonlin.spec =================================================================== RCS file: /cvs/extras/rpms/gnonlin/devel/gnonlin.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gnonlin.spec 28 Nov 2006 17:26:50 -0000 1.11 +++ gnonlin.spec 5 Feb 2007 16:54:05 -0000 1.12 @@ -1,8 +1,8 @@ -%define gst_req 0.10.8.1 +%define gst_req 0.10.9 %define gst_plugins_base_req 0.10.4 Name: gnonlin -Version: 0.10.6 +Version: 0.10.7 Release: 1%{?dist} Summary: GStreamer extension library for non-linear editing @@ -51,6 +51,10 @@ %changelog +* Mon Feb 5 2007 Brian Pepple - 0.10.7-1 +- Update to 0.10.7. +- Bump gstreamer version required. + * Tue Nov 28 2006 Brian Pepple - 0.10.6-1 - Add dist tag. - Update to 0.10.6. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnonlin/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 28 Nov 2006 17:26:50 -0000 1.6 +++ sources 5 Feb 2007 16:54:05 -0000 1.7 @@ -1 +1 @@ -9ea0467c03113b927e6953709e823dba gnonlin-0.10.6.tar.bz2 +81f683b7fca9a035635977d1235a1bf5 gnonlin-0.10.7.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 5 17:02:31 2007 From: fedora-extras-commits at redhat.com (John T. Guthrie III (guthrie)) Date: Mon, 5 Feb 2007 12:02:31 -0500 Subject: rpms/dxpc/devel dxpc-3.9.1b1-destdir.patch, NONE, 1.1 dxpc.spec, 1.15, 1.16 Message-ID: <200702051702.l15H2V1n007709@cvs-int.fedora.redhat.com> Author: guthrie Update of /cvs/extras/rpms/dxpc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7674 Modified Files: dxpc.spec Added Files: dxpc-3.9.1b1-destdir.patch Log Message: - Patched Makefile.in so that we can use the DESTDIR variable. dxpc-3.9.1b1-destdir.patch: --- NEW FILE dxpc-3.9.1b1-destdir.patch --- *** Makefile.in.orig 2007-02-02 14:04:40.000000000 -0500 --- Makefile.in 2007-02-04 21:31:57.000000000 -0500 *************** *** 73,88 **** install: install.bin install.man install.scripts install.bin: $(TARGET) ! $(srcdir)/mkinstalldirs $(bindir) ! $(INSTALL) $(TARGET) $(bindir)/$(TARGET) install.man: ! $(srcdir)/mkinstalldirs $(mandir)/man1 ! $(INSTALL_DATA) $(TARGET).man $(mandir)/man1/$(TARGET).1 install.scripts: ! $(srcdir)/mkinstalldirs $(mandir)/man1 ! $(INSTALL) $(TARGETSSH) $(bindir)/$(TARGETSSH) clean: -rm -f *~ *.o $(TARGET) pure_* quant_* *.bak core gmon.out --- 73,88 ---- install: install.bin install.man install.scripts install.bin: $(TARGET) ! $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) ! $(INSTALL) $(TARGET) $(DESTDIR)$(bindir)/$(TARGET) install.man: ! $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1 ! $(INSTALL_DATA) $(TARGET).man $(DESTDIR)$(mandir)/man1/$(TARGET).1 install.scripts: ! $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) ! $(INSTALL) $(TARGETSSH) $(DESTDIR)$(bindir)/$(TARGETSSH) clean: -rm -f *~ *.o $(TARGET) pure_* quant_* *.bak core gmon.out Index: dxpc.spec =================================================================== RCS file: /cvs/extras/rpms/dxpc/devel/dxpc.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- dxpc.spec 2 Feb 2007 22:27:02 -0000 1.15 +++ dxpc.spec 5 Feb 2007 17:01:59 -0000 1.16 @@ -1,7 +1,7 @@ Summary: A Differential X Protocol Compressor Name: dxpc Version: 3.9.1 -Release: 0.1.b1%{?dist} +Release: 0.2.b1%{?dist} License: BSD Group: User Interface/X @@ -9,6 +9,7 @@ Source: http://www.vigor.nu/dxpc-%{version}b1.tgz Patch0: dxpc-3.9.0-mandir.patch Patch1: dxpc-3.9.0-dxpcssh.patch +Patch2: dxpc-3.9.1b1-destdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: lzo-devel >= 1.08 @@ -29,6 +30,7 @@ %patch0 -p1 -b .mandir %patch1 -p0 -b .dxpcssh +%patch2 -p0 -b .destdir %build @@ -38,7 +40,7 @@ %install rm -rf %{buildroot} -%makeinstall +make DESTDIR=%{buildroot} install %clean @@ -53,6 +55,9 @@ %changelog +* Sun Feb 04 2007 John Guthrie - 3.9.1-0.2.b1 +- Patched Makefile.in so that we can use the DESTDIR variable + * Fri Feb 02 2007 John Guthrie - 3.9.1-0.1.b1 - Upgraded source code to 3.9.1-0.1.b1 From fedora-extras-commits at redhat.com Mon Feb 5 16:45:34 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Mon, 5 Feb 2007 11:45:34 -0500 Subject: rpms/beryl-settings/devel beryl-settings.spec,1.5,1.6 Message-ID: <200702051645.l15GjYYi003978@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/beryl-settings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3939 Modified Files: beryl-settings.spec Log Message: Fix up pkg-config search path so this actually builds... Index: beryl-settings.spec =================================================================== RCS file: /cvs/extras/rpms/beryl-settings/devel/beryl-settings.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- beryl-settings.spec 5 Feb 2007 16:08:52 -0000 1.5 +++ beryl-settings.spec 5 Feb 2007 16:45:01 -0000 1.6 @@ -56,7 +56,7 @@ make %{?_smp_mflags} popd # beryl-settings -export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$RPM_BUILD_ROOT/beryl-settings-bindings-%{version}/ +export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$RPM_BUILD_DIR/%{name}-%{version}/%{name}-bindings-%{version}/ %configure make %{?_smp_mflags} # beryl-settings-simple @@ -68,20 +68,23 @@ %install rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install +# beryl-settings-bindings pushd beryl-settings-bindings-%{version} make DESTDIR=$RPM_BUILD_ROOT install popd -pushd beryl-settings-simple-%{version} +# beryl-settings make DESTDIR=$RPM_BUILD_ROOT install -popd -find $RPM_BUILD_ROOT -type f -name "*.a" -o -name "*.la" | xargs rm -f desktop-file-install --vendor fedora --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora %{name}.desktop +# beryl-settings-simple +pushd beryl-settings-simple-%{version} +make DESTDIR=$RPM_BUILD_ROOT install desktop-file-install --vendor fedora --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category X-Fedora %{name}-simple-%{version}/%{name}-simple.desktop + --add-category X-Fedora %{name}-simple.desktop +popd +find $RPM_BUILD_ROOT -type f -name "*.a" -o -name "*.la" | xargs rm -f %find_lang %{name} %find_lang %{name}-simple From fedora-extras-commits at redhat.com Mon Feb 5 17:30:38 2007 From: fedora-extras-commits at redhat.com (John T. Guthrie III (guthrie)) Date: Mon, 5 Feb 2007 12:30:38 -0500 Subject: rpms/dxpc/FC-6 dxpc-3.9.1b1-destdir.patch, NONE, 1.1 dxpc.spec, 1.15, 1.16 Message-ID: <200702051730.l15HUcs0008122@cvs-int.fedora.redhat.com> Author: guthrie Update of /cvs/extras/rpms/dxpc/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8088 Modified Files: dxpc.spec Added Files: dxpc-3.9.1b1-destdir.patch Log Message: Sync'ing up from devel. - Patched Makefile.in so that we can use the DESTDIR variable. dxpc-3.9.1b1-destdir.patch: --- NEW FILE dxpc-3.9.1b1-destdir.patch --- *** Makefile.in.orig 2007-02-02 14:04:40.000000000 -0500 --- Makefile.in 2007-02-04 21:31:57.000000000 -0500 *************** *** 73,88 **** install: install.bin install.man install.scripts install.bin: $(TARGET) ! $(srcdir)/mkinstalldirs $(bindir) ! $(INSTALL) $(TARGET) $(bindir)/$(TARGET) install.man: ! $(srcdir)/mkinstalldirs $(mandir)/man1 ! $(INSTALL_DATA) $(TARGET).man $(mandir)/man1/$(TARGET).1 install.scripts: ! $(srcdir)/mkinstalldirs $(mandir)/man1 ! $(INSTALL) $(TARGETSSH) $(bindir)/$(TARGETSSH) clean: -rm -f *~ *.o $(TARGET) pure_* quant_* *.bak core gmon.out --- 73,88 ---- install: install.bin install.man install.scripts install.bin: $(TARGET) ! $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) ! $(INSTALL) $(TARGET) $(DESTDIR)$(bindir)/$(TARGET) install.man: ! $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1 ! $(INSTALL_DATA) $(TARGET).man $(DESTDIR)$(mandir)/man1/$(TARGET).1 install.scripts: ! $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) ! $(INSTALL) $(TARGETSSH) $(DESTDIR)$(bindir)/$(TARGETSSH) clean: -rm -f *~ *.o $(TARGET) pure_* quant_* *.bak core gmon.out Index: dxpc.spec =================================================================== RCS file: /cvs/extras/rpms/dxpc/FC-6/dxpc.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- dxpc.spec 2 Feb 2007 22:27:02 -0000 1.15 +++ dxpc.spec 5 Feb 2007 17:30:06 -0000 1.16 @@ -1,7 +1,7 @@ Summary: A Differential X Protocol Compressor Name: dxpc Version: 3.9.1 -Release: 0.1.b1%{?dist} +Release: 0.2.b1%{?dist} License: BSD Group: User Interface/X @@ -9,6 +9,7 @@ Source: http://www.vigor.nu/dxpc-%{version}b1.tgz Patch0: dxpc-3.9.0-mandir.patch Patch1: dxpc-3.9.0-dxpcssh.patch +Patch2: dxpc-3.9.1b1-destdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: lzo-devel >= 1.08 @@ -29,6 +30,7 @@ %patch0 -p1 -b .mandir %patch1 -p0 -b .dxpcssh +%patch2 -p0 -b .destdir %build @@ -38,7 +40,7 @@ %install rm -rf %{buildroot} -%makeinstall +make DESTDIR=%{buildroot} install %clean @@ -53,6 +55,9 @@ %changelog +* Sun Feb 04 2007 John Guthrie - 3.9.1-0.2.b1 +- Patched Makefile.in so that we can use the DESTDIR variable + * Fri Feb 02 2007 John Guthrie - 3.9.1-0.1.b1 - Upgraded source code to 3.9.1-0.1.b1 From fedora-extras-commits at redhat.com Mon Feb 5 18:09:36 2007 From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak)) Date: Mon, 5 Feb 2007 13:09:36 -0500 Subject: fedora-security/audit fc5,1.446,1.447 fc6,1.200,1.201 Message-ID: <200702051809.l15I9aus012102@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12081 Modified Files: fc5 fc6 Log Message: bind, makeinfo, libsoup, khtml Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.446 retrieving revision 1.447 diff -u -r1.446 -r1.447 --- fc5 2 Feb 2007 19:37:35 -0000 1.446 +++ fc5 5 Feb 2007 18:09:34 -0000 1.447 @@ -3,12 +3,9 @@ ** are items that need attention -CVE-2007-0537 VULNERABLE (kdebase) #225420 -CVE-2007-0459 VULNERABLE (wireshark, fixed 0.99.5) #227140 -CVE-2007-0458 VULNERABLE (wireshark, fixed 0.99.5) #227140 -CVE-2007-0457 VULNERABLE (wireshark, fixed 0.99.5) #227140 -CVE-2007-0456 VULNERABLE (wireshark, fixed 0.99.5) #227140 -CVE-2007-0455 VULNERABLE (gd) #224610 +CVE-2007-0650 ** tetex +CVE-2007-0494 version (bind, fixed 9.3.4) #225268 [since FEDORA-2007-164] +CVE-2007-0493 version (bind, fixed 9.3.4) #224443 [since FEDORA-2007-164] CVE-2007-0247 backport(squid, fixed 2.6.STABLE7) #222883 [since FEDORA-2007-092] CVE-2007-0235 VULNERABLE (libgtop2) #222637 not sure, will triage CVE-2007-0104 ignore (poppler) only client DoS @@ -20,6 +17,7 @@ CVE-2006-6772 backport (w3m) #221484 [since FEDORA-2007-078] CVE-2006-6719 backport (wget) #221469 [since FEDORA-2007-037] CVE-2006-6698 VULNERABLE (GConf2) #219280 +CVE-2006-6660 ignore (kdelibs) client Dos only, not reproducible CVE-2006-6385 ignore (kernel) windows only CVE-2006-6383 ignore (php) safe mode isn't safe CVE-2006-6333 ignore (kernel, 2.6.19 only) Index: fc6 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc6,v retrieving revision 1.200 retrieving revision 1.201 diff -u -r1.200 -r1.201 --- fc6 2 Feb 2007 19:37:35 -0000 1.200 +++ fc6 5 Feb 2007 18:09:34 -0000 1.201 @@ -3,7 +3,10 @@ ** are items that need attention +CVE-2007-0650 VULNERABLE (tetex) #225491 CVE-2007-0537 VULNERABLE (kdebase) #225420 +CVE-2007-0494 version (bind, fixed 9.3.4) #225268 [since FEDORA-2007-147] +CVE-2007-0493 version (bind, fixed 9.3.4) #224443 [since FEDORA-2007-147] CVE-2007-0459 VULNERABLE (wireshark, fixed 0.99.5) #227140 CVE-2007-0458 VULNERABLE (wireshark, fixed 0.99.5) #227140 CVE-2007-0457 VULNERABLE (wireshark, fixed 0.99.5) #227140 @@ -21,6 +24,7 @@ CVE-2006-6772 backport (w3m) #221484 [since FEDORA-2007-077] CVE-2006-6719 backport (wget) #221469 [since FEDORA-2007-043] CVE-2006-6698 VULNERABLE (GConf2) #219280 +CVE-2006-6660 ignore (kdelibs) client Dos only, not reproducible CVE-2006-6385 ignore (kernel) windows only CVE-2006-6383 ignore (php) safe mode isn't safe CVE-2006-6333 version (kernel, fixed 2.6.19.1) [since FEDORA-2007-058] @@ -51,7 +55,7 @@ CVE-2006-5974 ignore (fetchmail, fixed 6.3.6) only 6.3.5 CVE-2006-5973 VULNERABLE (dovecot, fixed 1.0.rc15) #216508 CVE-2006-5925 backport (elinks) [since FEDORA-2006-1278] but was never vulneable as didn't have smbclient support -CVE-2006-5876 VULNERABLE (libsoup) #223144 +CVE-2006-5876 version (libsoup) #223144 [since FEDORA-2007-109] CVE-2006-5871 version (kernel, fixed 2.6.10) CVE-2006-5868 VULNERABLE (ImageMagick, fixed 6.2.9.1) #217560 CVE-2006-5867 version (fetchmail, fixed 6.3.6) #221984 [since FEDORA-2007-042] From fedora-extras-commits at redhat.com Mon Feb 5 18:18:52 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Mon, 5 Feb 2007 13:18:52 -0500 Subject: rpms/bdock/devel .cvsignore, 1.5, 1.6 bdock.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200702051818.l15IIqFf012211@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/bdock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12188 Modified Files: .cvsignore bdock.spec sources Log Message: beryl 0.1.9999.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bdock/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 29 Jan 2007 22:01:54 -0000 1.5 +++ .cvsignore 5 Feb 2007 18:18:19 -0000 1.6 @@ -2,3 +2,4 @@ bdock-0.1.3.tar.bz2 bdock-0.1.4.tar.bz2 bdock-0.1.99.2.tar.bz2 +bdock-0.1.9999.1.tar.bz2 Index: bdock.spec =================================================================== RCS file: /cvs/extras/rpms/bdock/devel/bdock.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bdock.spec 29 Jan 2007 22:01:54 -0000 1.4 +++ bdock.spec 5 Feb 2007 18:18:19 -0000 1.5 @@ -2,7 +2,7 @@ Url: http://www.beryl-project.org/ License: GPL Group: User Interface/Desktops -Version: 0.1.99.2 +Version: 0.1.9999.1 Release: 1%{?dist} Summary: Beryl project's replacement windowmaker dock @@ -59,6 +59,9 @@ %{_mandir}/man1/bdock.1* %changelog +* Mon Feb 05 2007 Jarod Wilson 0.1.9999.1-1 +- beryl 0.1.9999.1 (aka 0.2.0-rc1) + * Mon Jan 29 2007 Jarod Wilson 0.1.99.2-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/bdock/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 29 Jan 2007 22:01:54 -0000 1.5 +++ sources 5 Feb 2007 18:18:19 -0000 1.6 @@ -1 +1 @@ -335581943eee9c6f86a9ee11ee72feff bdock-0.1.99.2.tar.bz2 +499e7a68cb28b0532b18fd245e75bc01 bdock-0.1.9999.1.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 5 18:19:26 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Mon, 5 Feb 2007 13:19:26 -0500 Subject: rpms/bdock/FC-6 .cvsignore, 1.5, 1.6 bdock.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200702051819.l15IJQft012278@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/bdock/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12217 Modified Files: .cvsignore bdock.spec sources Log Message: beryl 0.1.9999.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bdock/FC-6/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 29 Jan 2007 22:03:31 -0000 1.5 +++ .cvsignore 5 Feb 2007 18:18:53 -0000 1.6 @@ -2,3 +2,4 @@ bdock-0.1.3.tar.bz2 bdock-0.1.4.tar.bz2 bdock-0.1.99.2.tar.bz2 +bdock-0.1.9999.1.tar.bz2 Index: bdock.spec =================================================================== RCS file: /cvs/extras/rpms/bdock/FC-6/bdock.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bdock.spec 29 Jan 2007 22:03:31 -0000 1.4 +++ bdock.spec 5 Feb 2007 18:18:53 -0000 1.5 @@ -2,7 +2,7 @@ Url: http://www.beryl-project.org/ License: GPL Group: User Interface/Desktops -Version: 0.1.99.2 +Version: 0.1.9999.1 Release: 1%{?dist} Summary: Beryl project's replacement windowmaker dock @@ -59,6 +59,9 @@ %{_mandir}/man1/bdock.1* %changelog +* Mon Feb 05 2007 Jarod Wilson 0.1.9999.1-1 +- beryl 0.1.9999.1 (aka 0.2.0-rc1) + * Mon Jan 29 2007 Jarod Wilson 0.1.99.2-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/bdock/FC-6/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 29 Jan 2007 22:03:31 -0000 1.5 +++ sources 5 Feb 2007 18:18:53 -0000 1.6 @@ -1 +1 @@ -335581943eee9c6f86a9ee11ee72feff bdock-0.1.99.2.tar.bz2 +499e7a68cb28b0532b18fd245e75bc01 bdock-0.1.9999.1.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 5 18:48:02 2007 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 5 Feb 2007 13:48:02 -0500 Subject: rpms/liferea/devel .cvsignore, 1.43, 1.44 liferea.spec, 1.63, 1.64 sources, 1.44, 1.45 Message-ID: <200702051848.l15Im2xm012486@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12465 Modified Files: .cvsignore liferea.spec sources Log Message: * Mon Feb 5 2007 Brian Pepple - 1.2.5-1 - Update to 1.2.5. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- .cvsignore 22 Jan 2007 00:44:14 -0000 1.43 +++ .cvsignore 5 Feb 2007 18:47:30 -0000 1.44 @@ -1 +1 @@ -liferea-1.2.4.tar.gz +liferea-1.2.5.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- liferea.spec 22 Jan 2007 00:44:15 -0000 1.63 +++ liferea.spec 5 Feb 2007 18:47:30 -0000 1.64 @@ -1,5 +1,5 @@ Name: liferea -Version: 1.2.4 +Version: 1.2.5 Release: 1%{?dist} Summary: An RSS/RDF feed reader @@ -112,6 +112,9 @@ %changelog +* Mon Feb 5 2007 Brian Pepple - 1.2.5-1 +- Update to 1.2.5. + * Sun Jan 21 2007 Brian Pepple - 1.2.4-1 - Update to 1.2.4. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/sources,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- sources 22 Jan 2007 00:44:15 -0000 1.44 +++ sources 5 Feb 2007 18:47:30 -0000 1.45 @@ -1 +1 @@ -2bed06c06e7b90281cf51fa3e83ee023 liferea-1.2.4.tar.gz +3b901a9c7942be39e975446795788f0c liferea-1.2.5.tar.gz From fedora-extras-commits at redhat.com Mon Feb 5 19:39:29 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos)) Date: Mon, 5 Feb 2007 14:39:29 -0500 Subject: rpms/python-imaging/devel .cvsignore, 1.3, 1.4 python-imaging.spec, 1.12, 1.13 sources, 1.3, 1.4 Message-ID: <200702051939.l15JdTYW016327@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/python-imaging/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16304 Modified Files: .cvsignore python-imaging.spec sources Log Message: * Mon Feb 5 2007 Jos?? Matos - 1.1.6-1 - New upstream version. - Clean spec file and specify license as BSD. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-imaging/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 6 Mar 2006 01:31:12 -0000 1.3 +++ .cvsignore 5 Feb 2007 19:38:57 -0000 1.4 @@ -1 +1 @@ -Imaging-1.1.5.tar.gz +Imaging-1.1.6.tar.gz Index: python-imaging.spec =================================================================== RCS file: /cvs/extras/rpms/python-imaging/devel/python-imaging.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- python-imaging.spec 12 Dec 2006 00:30:05 -0000 1.12 +++ python-imaging.spec 5 Feb 2007 19:38:57 -0000 1.13 @@ -2,26 +2,24 @@ %define pyver %(%{__python} -c "import sys ; print sys.version[:3]") %define py_incdir %{_includedir}/python%{pyver} -Summary: Python's own image processing library -Name: python-imaging -Version: 1.1.5 -Release: 7%{?dist} - -License: Distributable -Group: Development/Languages -Source0: http://effbot.org/downloads/Imaging-%{version}.tar.gz -Patch0: %{name}-no-xv.patch -Patch1: %{name}-lib64.patch -Patch2: %{name}-giftrans.patch -URL: http://www.pythonware.com/products/pil/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Summary: Python's own image processing library +Name: python-imaging +Version: 1.1.6 +Release: 1%{?dist} + +License: BSD +Group: Development/Languages + +Source0: http://effbot.org/downloads/Imaging-%{version}.tar.gz +Patch0: %{name}-no-xv.patch +Patch1: %{name}-lib64.patch +Patch2: %{name}-giftrans.patch +URL: http://www.pythonware.com/products/pil/ +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel, libjpeg-devel, zlib-devel, freetype-devel BuildRequires: tkinter, tk-devel -Requires: libjpeg -Requires: zlib -Requires: freetype Requires: tkinter %description @@ -90,7 +88,7 @@ %files %defattr (-,root,root) -%doc README CHANGES-115 +%doc README CHANGES %{python_sitearch}/PIL.pth %dir %{python_sitearch}/PIL %{python_sitearch}/PIL/*.so @@ -103,6 +101,10 @@ %changelog +* Mon Feb 5 2007 Jos?? Matos - 1.1.6-1 +- New upstream version. +- Clean spec file and specify license as BSD. + * Tue Dec 12 2006 Jos?? Matos - 1.1.5-7 - Rebuild for python 2.5. Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-imaging/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 Mar 2006 01:31:12 -0000 1.3 +++ sources 5 Feb 2007 19:38:57 -0000 1.4 @@ -1 +1 @@ -a64512e39469213ced0d091b9eba76c0 Imaging-1.1.5.tar.gz +3a9b5c20ca52f0a9900512d2c7347622 Imaging-1.1.6.tar.gz From fedora-extras-commits at redhat.com Mon Feb 5 19:54:20 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos)) Date: Mon, 5 Feb 2007 14:54:20 -0500 Subject: rpms/python-imaging/FC-6 .cvsignore, 1.3, 1.4 python-imaging.spec, 1.11, 1.12 sources, 1.3, 1.4 Message-ID: <200702051954.l15JsKr9016489@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/python-imaging/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16466 Modified Files: .cvsignore python-imaging.spec sources Log Message: * Mon Feb 5 2007 Jos?? Matos - 1.1.6-1 - New upstream version. - Clean spec file and specify license as BSD. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-imaging/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 6 Mar 2006 01:31:12 -0000 1.3 +++ .cvsignore 5 Feb 2007 19:53:48 -0000 1.4 @@ -1 +1 @@ -Imaging-1.1.5.tar.gz +Imaging-1.1.6.tar.gz Index: python-imaging.spec =================================================================== RCS file: /cvs/extras/rpms/python-imaging/FC-6/python-imaging.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- python-imaging.spec 29 Aug 2006 22:28:59 -0000 1.11 +++ python-imaging.spec 5 Feb 2007 19:53:48 -0000 1.12 @@ -2,26 +2,24 @@ %define pyver %(%{__python} -c "import sys ; print sys.version[:3]") %define py_incdir %{_includedir}/python%{pyver} -Summary: Python's own image processing library -Name: python-imaging -Version: 1.1.5 -Release: 6%{?dist} - -License: Distributable -Group: Development/Languages -Source0: http://effbot.org/downloads/Imaging-%{version}.tar.gz -Patch0: %{name}-no-xv.patch -Patch1: %{name}-lib64.patch -Patch2: %{name}-giftrans.patch -URL: http://www.pythonware.com/products/pil/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Summary: Python's own image processing library +Name: python-imaging +Version: 1.1.6 +Release: 1%{?dist} + +License: BSD +Group: Development/Languages + +Source0: http://effbot.org/downloads/Imaging-%{version}.tar.gz +Patch0: %{name}-no-xv.patch +Patch1: %{name}-lib64.patch +Patch2: %{name}-giftrans.patch +URL: http://www.pythonware.com/products/pil/ +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel, libjpeg-devel, zlib-devel, freetype-devel BuildRequires: tkinter, tk-devel -Requires: libjpeg -Requires: zlib -Requires: freetype Requires: tkinter %description @@ -90,7 +88,7 @@ %files %defattr (-,root,root) -%doc README CHANGES-115 +%doc README CHANGES %{python_sitearch}/PIL.pth %dir %{python_sitearch}/PIL %{python_sitearch}/PIL/*.so @@ -103,6 +101,13 @@ %changelog +* Mon Feb 5 2007 Jos?? Matos - 1.1.6-1 +- New upstream version. +- Clean spec file and specify license as BSD. + +* Tue Dec 12 2006 Jos?? Matos - 1.1.5-7 +- Rebuild for python 2.5. + * Tue Aug 29 2006 Jos?? Matos - 1.1.5-6 - Rebuild for FE6 - Clean package, no need for python-abi requirement and ghost pyo files Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-imaging/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 Mar 2006 01:31:12 -0000 1.3 +++ sources 5 Feb 2007 19:53:48 -0000 1.4 @@ -1 +1 @@ -a64512e39469213ced0d091b9eba76c0 Imaging-1.1.5.tar.gz +3a9b5c20ca52f0a9900512d2c7347622 Imaging-1.1.6.tar.gz From fedora-extras-commits at redhat.com Mon Feb 5 19:56:18 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos)) Date: Mon, 5 Feb 2007 14:56:18 -0500 Subject: rpms/python-imaging/FC-5 .cvsignore, 1.3, 1.4 python-imaging.spec, 1.11, 1.12 sources, 1.3, 1.4 Message-ID: <200702051956.l15JuI1L016575@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/python-imaging/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16542 Modified Files: .cvsignore python-imaging.spec sources Log Message: * Mon Feb 5 2007 Jos?? Matos - 1.1.6-1 - New upstream version. - Clean spec file and specify license as BSD. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-imaging/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 6 Mar 2006 01:31:12 -0000 1.3 +++ .cvsignore 5 Feb 2007 19:55:46 -0000 1.4 @@ -1 +1 @@ -Imaging-1.1.5.tar.gz +Imaging-1.1.6.tar.gz Index: python-imaging.spec =================================================================== RCS file: /cvs/extras/rpms/python-imaging/FC-5/python-imaging.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- python-imaging.spec 6 Apr 2006 17:23:01 -0000 1.11 +++ python-imaging.spec 5 Feb 2007 19:55:46 -0000 1.12 @@ -2,27 +2,24 @@ %define pyver %(%{__python} -c "import sys ; print sys.version[:3]") %define py_incdir %{_includedir}/python%{pyver} -Summary: Python's own image processing library -Name: python-imaging -Version: 1.1.5 -Release: 5%{?dist} - -License: Distributable -Group: Development/Languages -Source0: http://effbot.org/downloads/Imaging-%{version}.tar.gz -Patch0: %{name}-no-xv.patch -Patch1: %{name}-lib64.patch -Patch2: %{name}-giftrans.patch -URL: http://www.pythonware.com/products/pil/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Summary: Python's own image processing library +Name: python-imaging +Version: 1.1.6 +Release: 1%{?dist} + +License: BSD +Group: Development/Languages + +Source0: http://effbot.org/downloads/Imaging-%{version}.tar.gz +Patch0: %{name}-no-xv.patch +Patch1: %{name}-lib64.patch +Patch2: %{name}-giftrans.patch +URL: http://www.pythonware.com/products/pil/ +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel, libjpeg-devel, zlib-devel, freetype-devel BuildRequires: tkinter, tk-devel -Requires: python-abi = %{pyver} -Requires: libjpeg -Requires: zlib -Requires: freetype Requires: tkinter %description @@ -91,13 +88,11 @@ %files %defattr (-,root,root) -%doc README CHANGES-115 +%doc README CHANGES %{python_sitearch}/PIL.pth %dir %{python_sitearch}/PIL %{python_sitearch}/PIL/*.so -%{python_sitearch}/PIL/*.py -%{python_sitearch}/PIL/*.pyc -%ghost %{python_sitearch}/PIL/*.pyo +%{python_sitearch}/PIL/*.py* %files devel %defattr (0644,root,root,755) @@ -106,19 +101,30 @@ %changelog -* Thu Apr 6 2006 Jos?? Matos - 1.1.5-5 +* Mon Feb 5 2007 Jos?? Matos - 1.1.6-1 +- New upstream version. +- Clean spec file and specify license as BSD. + +* Tue Dec 12 2006 Jos?? Matos - 1.1.5-7 +- Rebuild for python 2.5. + +* Tue Aug 29 2006 Jos?? Matos - 1.1.5-6 +- Rebuild for FE6 +- Clean package, no need for python-abi requirement and ghost pyo files + +* Thu Apr 6 2006 Jos?? Matos - 1.1.5-5 - Rebuild because of #187739 -* Tue Apr 4 2006 Jos?? Matos - 1.1.5-4 +* Tue Apr 4 2006 Jos?? Matos - 1.1.5-4 - Rebuild -* Tue Apr 4 2006 Jos?? Matos - 1.1.5-3 +* Tue Apr 4 2006 Jos?? Matos - 1.1.5-3 - Restore gif transparency patch. (bug #187875) -* Sun Apr 2 2006 Jos?? Matos - 1.1.5-2 +* Sun Apr 2 2006 Jos?? Matos - 1.1.5-2 - Fix bug #185203 (Thanks to Rick L Vinyard Jr) -* Sun Mar 5 2006 Jos?? Matos - 1.1.5-1 +* Sun Mar 5 2006 Jos?? Matos - 1.1.5-1 - Update to 1.1.5 * Sun May 22 2005 Jeremy Katz - 1.1.4-9 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-imaging/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 Mar 2006 01:31:12 -0000 1.3 +++ sources 5 Feb 2007 19:55:46 -0000 1.4 @@ -1 +1 @@ -a64512e39469213ced0d091b9eba76c0 Imaging-1.1.5.tar.gz +3a9b5c20ca52f0a9900512d2c7347622 Imaging-1.1.6.tar.gz From fedora-extras-commits at redhat.com Mon Feb 5 20:33:39 2007 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Mon, 5 Feb 2007 15:33:39 -0500 Subject: rpms/amarok/devel .cvsignore, 1.28, 1.29 amarok.spec, 1.72, 1.73 sources, 1.28, 1.29 Message-ID: <200702052033.l15KXdt9020247@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20219 Modified Files: .cvsignore amarok.spec sources Log Message: version 1.4.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 31 Oct 2006 11:01:45 -0000 1.28 +++ .cvsignore 5 Feb 2007 20:33:06 -0000 1.29 @@ -1 +1 @@ -amarok-1.4.4.tar.bz2 +amarok-1.4.5.tar.bz2 Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- amarok.spec 25 Jan 2007 19:12:30 -0000 1.72 +++ amarok.spec 5 Feb 2007 20:33:06 -0000 1.73 @@ -3,16 +3,14 @@ Name: amarok Summary: Media player for KDE -Version: 1.4.4 -Release: 7%{?dist} +Version: 1.4.5 +Release: 1%{?dist} Group: Applications/Multimedia License: GPL Url: http://amarok.kde.org # http://download.kde.org/download.php?url=stable/amarok/1.4.3/src Source0: http://mirrors.isc.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2 -Patch0: amarok-1.4.4-lastfm+xine-lib-1.1.3.patch -Patch1: amarok-1.4.4-libgpod-0.4.2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdemultimedia-devel >= 6:3.2 @@ -82,15 +80,11 @@ %prep %setup -q -%patch0 -p1 -b .lastfm -%patch1 -p1 -b .libgpod %build unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh -# work around an improper ${kdelibsuff} -export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include %configure \ --disable-debug \ --disable-rpath \ @@ -123,8 +117,6 @@ desktop-file-install --vendor "" \ --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \ --delete-original \ - --add-category Application \ - --add-category X-Fedora \ $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop #rm -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/amarokapp.desktop @@ -237,11 +229,14 @@ %files visualisation %defattr(-,root,root) %{_bindir}/amarok_libvisual -%{_bindir}/amarok_xmmswrapper2 %changelog +* Sat Feb 03 2007 Aurelien Bompard 1.4.5-1 +- version 1.4.5 +- drop patch0 and patch1 (merged upstream) + * Thu Jan 25 2007 Aurelien Bompard 1.4.4-7 - add patch to enable building with libgpod >= 0.4.2, thanks go to Todd Zullinger Index: sources =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 31 Oct 2006 11:01:45 -0000 1.28 +++ sources 5 Feb 2007 20:33:06 -0000 1.29 @@ -1 +1 @@ -56a9aec42088c338b81252f8e0651781 amarok-1.4.4.tar.bz2 +1dac1cb5ac9c9cdabdab5f69b39e92c8 amarok-1.4.5.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 5 20:40:42 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Mon, 5 Feb 2007 15:40:42 -0500 Subject: rpms/audacity/FC-6 audacity.spec,1.22,1.23 Message-ID: <200702052040.l15Keg4m020369@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/audacity/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20352 Modified Files: audacity.spec Log Message: compile with libsamplerate Index: audacity.spec =================================================================== RCS file: /cvs/extras/rpms/audacity/FC-6/audacity.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- audacity.spec 22 Jan 2007 14:54:27 -0000 1.22 +++ audacity.spec 5 Feb 2007 20:40:10 -0000 1.23 @@ -1,6 +1,6 @@ Name: audacity Version: 1.3.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A multitrack audio editor Group: Applications/Multimedia @@ -56,7 +56,7 @@ %build -%configure --with-help --with-libsndfile=system --with-libsamplerate=system --with-libflac=system --with-ladspa --with-vorbis=system --with-id3tag=system %{?_with_mp3:--with-libmad=system} %{?_with_portaudiov19:--with-portaudio=v19 --without-portmixer} +%configure --with-help --with-libsndfile=system --without-libresample --with-libsamplerate=system --with-libflac=system --with-ladspa --with-vorbis=system --with-id3tag=system %{?_with_mp3:--with-libmad=system} %{?_with_portaudiov19:--with-portaudio=v19 --without-portmixer} make @@ -117,6 +117,9 @@ %doc %{_datadir}/doc/* %changelog +* Mon Feb 5 2007 Gerard Milmeister - 1.3.2-4 +- compile with libsamplerate + * Mon Jan 22 2007 Gerard Milmeister - 1.3.2-3 - convert french locale to iso-8859-1 From fedora-extras-commits at redhat.com Mon Feb 5 20:43:56 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Mon, 5 Feb 2007 15:43:56 -0500 Subject: rpms/audacity/devel audacity.spec,1.25,1.26 Message-ID: <200702052043.l15Khu34020439@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/audacity/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20422 Modified Files: audacity.spec Log Message: compile with libsamplerate Index: audacity.spec =================================================================== RCS file: /cvs/extras/rpms/audacity/devel/audacity.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- audacity.spec 22 Jan 2007 16:04:15 -0000 1.25 +++ audacity.spec 5 Feb 2007 20:43:24 -0000 1.26 @@ -1,6 +1,6 @@ Name: audacity Version: 1.3.2 -Release: 6.20070106cvs%{?dist} +Release: 7.20070106cvs%{?dist} Summary: A multitrack audio editor Group: Applications/Multimedia @@ -56,7 +56,7 @@ %build -%configure --with-help --with-libsndfile=system --with-libsamplerate=system --with-libflac=system --with-ladspa --with-vorbis=system --with-id3tag=system %{?_with_mp3:--with-libmad=system} %{?_with_portaudiov19:--with-portaudio=v19 --without-portmixer} +%configure --with-help --with-libsndfile=system --without-libresample --with-libsamplerate=system --with-libflac=system --with-ladspa --with-vorbis=system --with-id3tag=system %{?_with_mp3:--with-libmad=system} %{?_with_portaudiov19:--with-portaudio=v19 --without-portmixer} make @@ -118,6 +118,9 @@ %changelog +* Mon Feb 5 2007 Gerard Milmeister - 1.3.2-7.20070106cvs +- compile with libsamplerate + * Mon Jan 22 2007 Gerard Milmeister - 1.3.2-6.20070106cvs - convert french locale to iso-8859-1 From fedora-extras-commits at redhat.com Mon Feb 5 20:48:04 2007 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 5 Feb 2007 15:48:04 -0500 Subject: rpms/loudmouth/devel .cvsignore, 1.8, 1.9 loudmouth.spec, 1.18, 1.19 sources, 1.8, 1.9 Message-ID: <200702052048.l15Km488020527@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/loudmouth/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20504 Modified Files: .cvsignore loudmouth.spec sources Log Message: * Mon Feb 5 2007 Brian Pepple - 1.2.0-1 - Update to 1.2.0. - Drop mono config option since it's been dropped from the tarball. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/loudmouth/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 11 Sep 2006 14:34:44 -0000 1.8 +++ .cvsignore 5 Feb 2007 20:47:31 -0000 1.9 @@ -1 +1 @@ -loudmouth-1.0.5.tar.gz +loudmouth-1.2.0.tar.gz Index: loudmouth.spec =================================================================== RCS file: /cvs/extras/rpms/loudmouth/devel/loudmouth.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- loudmouth.spec 11 Sep 2006 14:49:45 -0000 1.18 +++ loudmouth.spec 5 Feb 2007 20:47:31 -0000 1.19 @@ -1,8 +1,8 @@ %define with_ssl 1 Name: loudmouth -Version: 1.0.5 -Release: 2%{?dist} +Version: 1.2.0 +Release: 1%{?dist} Summary: Loudmouth is a Jabber programming library written in C Group: System Environment/Libraries @@ -49,7 +49,6 @@ %build %configure --enable-gtk-doc \ - --enable-mono=no \ --enable-static=no \ %if %{with_ssl} --with-ssl=yes @@ -63,8 +62,7 @@ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT - -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %clean @@ -92,6 +90,10 @@ %changelog +* Mon Feb 5 2007 Brian Pepple - 1.2.0-1 +- Update to 1.2.0. +- Drop mono config option since it's been dropped from the tarball. + * Mon Sep 11 2006 Brian Pepple - 1.0.5-2 - Change source to .gz. Index: sources =================================================================== RCS file: /cvs/extras/rpms/loudmouth/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 11 Sep 2006 14:34:44 -0000 1.8 +++ sources 5 Feb 2007 20:47:31 -0000 1.9 @@ -1 +1 @@ -415b025541b326d691ae93e6ea19f130 loudmouth-1.0.5.tar.gz +571fccdfe2f220c86210139a98e86511 loudmouth-1.2.0.tar.gz From fedora-extras-commits at redhat.com Mon Feb 5 20:50:21 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos)) Date: Mon, 5 Feb 2007 15:50:21 -0500 Subject: rpms/python-amara/devel python-amara.spec, 1.15, 1.16 python-amara-1.1.7-version.patch, 1.1, NONE Message-ID: <200702052050.l15KoLQQ020612@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/python-amara/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20595 Modified Files: python-amara.spec Removed Files: python-amara-1.1.7-version.patch Log Message: * Mon Feb 5 2007 Jos?? Matos - 1.1.9-5 - Clean spec file. Index: python-amara.spec =================================================================== RCS file: /cvs/extras/rpms/python-amara/devel/python-amara.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- python-amara.spec 12 Dec 2006 00:38:20 -0000 1.15 +++ python-amara.spec 5 Feb 2007 20:49:48 -0000 1.16 @@ -2,14 +2,13 @@ Name: python-amara Version: 1.1.9 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A collection of Pythonic tools for XML data binding Group: Development/Libraries License: ASL-derived URL: http://uche.ogbuji.net/uche.ogbuji.net/tech/4Suite/amara/ Source0: http://uche.ogbuji.net/tech/4Suite/etc/Amara-%{version}.tar.bz2 -Patch: python-amara-1.1.7-version.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Needs python-4Suite-XML >= 1.0b2 @@ -30,14 +29,13 @@ %prep %setup -q -n Amara-%{version} -%patch -p 1 -b .version %build %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install -O1 --skip-build --prefix=$RPM_BUILD_ROOT%{_prefix} +%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT @@ -48,9 +46,12 @@ %dir %{python_sitelib}/amara %{python_sitelib}/amara/*.py %{python_sitelib}/amara/*.py[co] -%doc CHANGES COPYING demo manual.html README TODO +%doc CHANGES COPYING demo docs README TODO %changelog +* Mon Feb 5 2007 Jos?? Matos - 1.1.9-5 +- Clean spec file. + * Tue Dec 12 2006 Jos?? Matos - 1.1.9-4 - Respin (part II). --- python-amara-1.1.7-version.patch DELETED --- From fedora-extras-commits at redhat.com Mon Feb 5 21:23:34 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos)) Date: Mon, 5 Feb 2007 16:23:34 -0500 Subject: rpms/python-amara/devel python-amara.spec,1.16,1.17 Message-ID: <200702052123.l15LNYlV024288@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/python-amara/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24271 Modified Files: python-amara.spec Log Message: * Mon Feb 5 2007 Jos?? Matos - 1.1.9-6 - Add egg-info. Index: python-amara.spec =================================================================== RCS file: /cvs/extras/rpms/python-amara/devel/python-amara.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- python-amara.spec 5 Feb 2007 20:49:48 -0000 1.16 +++ python-amara.spec 5 Feb 2007 21:23:02 -0000 1.17 @@ -1,8 +1,9 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-amara Version: 1.1.9 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A collection of Pythonic tools for XML data binding Group: Development/Libraries @@ -44,11 +45,15 @@ %defattr(-,root,root,-) %{_bindir}/* %dir %{python_sitelib}/amara -%{python_sitelib}/amara/*.py -%{python_sitelib}/amara/*.py[co] +%{python_sitelib}/amara/*.py* +%{python_sitearch}/Amara-*.egg-info + %doc CHANGES COPYING demo docs README TODO %changelog +* Mon Feb 5 2007 Jos?? Matos - 1.1.9-6 +- Add egg-info. + * Mon Feb 5 2007 Jos?? Matos - 1.1.9-5 - Clean spec file. From fedora-extras-commits at redhat.com Mon Feb 5 21:38:02 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 5 Feb 2007 16:38:02 -0500 Subject: rpms/kalgebra - New directory Message-ID: <200702052138.l15Lc20E024504@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/kalgebra In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24499/kalgebra Log Message: Directory /cvs/extras/rpms/kalgebra added to the repository From fedora-extras-commits at redhat.com Mon Feb 5 21:38:10 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 5 Feb 2007 16:38:10 -0500 Subject: rpms/kalgebra/devel - New directory Message-ID: <200702052138.l15LcAYk024518@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/kalgebra/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24499/kalgebra/devel Log Message: Directory /cvs/extras/rpms/kalgebra/devel added to the repository From fedora-extras-commits at redhat.com Mon Feb 5 21:44:52 2007 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Mon, 5 Feb 2007 16:44:52 -0500 Subject: rpms/uudeview/devel uudeview.spec,1.11,1.12 Message-ID: <200702052144.l15LiqU2024599@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/uudeview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24582 Modified Files: uudeview.spec Log Message: * Mon Feb 05 2007 Adrian Reber - 0.5.20-10 - rebuilt Index: uudeview.spec =================================================================== RCS file: /cvs/extras/rpms/uudeview/devel/uudeview.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- uudeview.spec 15 Sep 2006 20:36:54 -0000 1.11 +++ uudeview.spec 5 Feb 2007 21:44:20 -0000 1.12 @@ -1,6 +1,6 @@ Name: uudeview Version: 0.5.20 -Release: 9 +Release: 10 License: GPL Group: Applications/File @@ -83,7 +83,10 @@ %{_libdir}/*.a %changelog -* Fri Sep 15 2006 Adrian Reber - 0.5.20-7 +* Mon Feb 05 2007 Adrian Reber - 0.5.20-10 +- rebuilt + +* Fri Sep 15 2006 Adrian Reber - 0.5.20-9 - rebuilt * Mon Mar 13 2006 Adrian Reber - 0.5.20-8 From fedora-extras-commits at redhat.com Mon Feb 5 21:55:17 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 5 Feb 2007 16:55:17 -0500 Subject: rpms/kalgebra Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702052155.l15LtHuA024796@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/kalgebra In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24787 Added Files: Makefile import.log pkg.acl Log Message: setup --- NEW FILE Makefile --- all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Mon Feb 5 21:55:25 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 5 Feb 2007 16:55:25 -0500 Subject: rpms/kalgebra/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702052155.l15LtP0w024813@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/kalgebra/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24787/devel Added Files: .cvsignore Makefile sources Log Message: setup --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Feb 5 22:01:56 2007 From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat)) Date: Mon, 5 Feb 2007 17:01:56 -0500 Subject: rpms/ktorrent/devel .cvsignore, 1.6, 1.7 ktorrent.spec, 1.17, 1.18 sources, 1.6, 1.7 Message-ID: <200702052201.l15M1uOU028305@cvs-int.fedora.redhat.com> Author: liquidat Update of /cvs/extras/rpms/ktorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28275 Modified Files: .cvsignore ktorrent.spec sources Log Message: Update to upstream version 2.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ktorrent/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 13 Oct 2006 17:27:40 -0000 1.6 +++ .cvsignore 5 Feb 2007 22:01:24 -0000 1.7 @@ -1 +1 @@ -ktorrent-2.0.3.tar.gz +ktorrent-2.1.tar.gz Index: ktorrent.spec =================================================================== RCS file: /cvs/extras/rpms/ktorrent/devel/ktorrent.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ktorrent.spec 14 Oct 2006 11:14:34 -0000 1.17 +++ ktorrent.spec 5 Feb 2007 22:01:24 -0000 1.18 @@ -1,14 +1,13 @@ %define desktopvendor fedora Name: ktorrent -Version: 2.0.3 -Release: 4%{?dist} +Version: 2.1 +Release: 1%{?dist} Summary: A BitTorrent program for KDE Group: Applications/Internet License: GPL URL: http://ktorrent.pwsp.net/ -Source0: http://ktorrent.org/downloads/2.0.3/ktorrent-2.0.3.tar.gz -Patch0: ktorrent-2.0.3-znow.patch +Source0: http://ktorrent.org/downloads/2.1/ktorrent-2.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel kdelibs-devel desktop-file-utils gettext gmp-devel @@ -23,7 +22,6 @@ %prep %setup -q -%patch -p1 -b .znow %build %configure --disable-rpath @@ -68,6 +66,7 @@ %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README TODO %exclude %{_libdir}/lib*.la +%exclude %{_libdir}/kde3/kt*.la %{_bindir}/ktcachecheck %{_bindir}/ktorrent %{_bindir}/kttorinfo @@ -77,24 +76,20 @@ %{_libdir}/libktorrent.so.0 %{_libdir}/libktorrent.so.0.0.0 %{_libdir}/kde3/ktinfowidgetplugin.so -%{_libdir}/kde3/ktinfowidgetplugin.la %{_libdir}/kde3/ktipfilterplugin.so -%{_libdir}/kde3/ktipfilterplugin.la %{_libdir}/kde3/ktlogviewerplugin.so -%{_libdir}/kde3/ktlogviewerplugin.la %{_libdir}/kde3/ktpartfileimportplugin.so -%{_libdir}/kde3/ktpartfileimportplugin.la -%{_libdir}/kde3/ktscanfolderplugin.la +%{_libdir}/kde3/ktrssfeedplugin.so %{_libdir}/kde3/ktscanfolderplugin.so -%{_libdir}/kde3/ktschedulerplugin.la %{_libdir}/kde3/ktschedulerplugin.so %{_libdir}/kde3/ktsearchplugin.so -%{_libdir}/kde3/ktsearchplugin.la %{_libdir}/kde3/ktupnpplugin.so -%{_libdir}/kde3/ktupnpplugin.la +%{_libdir}/kde3/ktwebinterfaceplugin.so +%{_libdir}/kde3/ktzeroconfplugin.so %{_datadir}/applications/kde/ktorrent.desktop %{_datadir}/apps/ktorrent %{_datadir}/config.kcfg/ktlogviewerplugin.kcfg +%{_datadir}/config.kcfg/ktrssfeedplugin.kcfg %{_datadir}/config.kcfg/ktscanfolderplugin.kcfg %{_datadir}/config.kcfg/ktschedulerplugin.kcfg %{_datadir}/config.kcfg/ktinfowidgetplugin.kcfg @@ -102,6 +97,7 @@ %{_datadir}/config.kcfg/ktorrent.kcfg %{_datadir}/config.kcfg/ktsearchplugin.kcfg %{_datadir}/config.kcfg/ktupnpplugin.kcfg +%{_datadir}/config.kcfg/ktwebinterfaceplugin.kcfg %{_datadir}/icons/hicolor/128x128/apps/ktorrent.png %{_datadir}/icons/hicolor/16x16/apps/ktorrent.png %{_datadir}/icons/hicolor/22x22/apps/ktorrent.png @@ -122,11 +118,17 @@ %{_datadir}/services/ktipfilterplugin.desktop %{_datadir}/services/ktlogviewerplugin.desktop %{_datadir}/services/ktpartfileimportplugin.desktop +%{_datadir}/services/ktrssfeedplugin.desktop %{_datadir}/services/ktsearchplugin.desktop %{_datadir}/services/ktupnpplugin.desktop %{_datadir}/servicetypes/ktorrentplugin.desktop +%{_datadir}/services/ktwebinterfaceplugin.desktop +%{_datadir}/services/ktzeroconfplugin.desktop %changelog +* Mon Feb 05 2007 Roland Wolters 2.1-1 +- Update to upstream version 2.1 + * Fri Oct 13 2006 Roland Wolters 2.0.3-4 - Update to upstream version 2.0.3 - added znow patch for ppc Index: sources =================================================================== RCS file: /cvs/extras/rpms/ktorrent/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 13 Oct 2006 17:27:40 -0000 1.6 +++ sources 5 Feb 2007 22:01:24 -0000 1.7 @@ -1 +1 @@ -f0297ab9ead77ee11f9f46cffa904b89 ktorrent-2.0.3.tar.gz +2e3c350fe02b68936a6f8f6460fae8f6 ktorrent-2.1.tar.gz From fedora-extras-commits at redhat.com Mon Feb 5 22:02:45 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 5 Feb 2007 17:02:45 -0500 Subject: rpms/duel3 Makefile,NONE,1.1 import.log,NONE,1.1 pkg.acl,NONE,1.1 Message-ID: <200702052202.l15M2jYt028331@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/duel3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28322 Added Files: Makefile import.log pkg.acl Log Message: finish pre-import --- NEW FILE Makefile --- all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Mon Feb 5 22:02:52 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 5 Feb 2007 17:02:52 -0500 Subject: rpms/duel3/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702052202.l15M2qnU028348@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/duel3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28322/devel Added Files: .cvsignore Makefile sources Log Message: finish pre-import --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Feb 5 22:04:03 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 5 Feb 2007 17:04:03 -0500 Subject: rpms/irsim - New directory Message-ID: <200702052204.l15M43AN028459@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/irsim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28454/irsim Log Message: Directory /cvs/extras/rpms/irsim added to the repository From fedora-extras-commits at redhat.com Mon Feb 5 22:04:10 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 5 Feb 2007 17:04:10 -0500 Subject: rpms/irsim/devel - New directory Message-ID: <200702052204.l15M4ADJ028491@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/irsim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28454/irsim/devel Log Message: Directory /cvs/extras/rpms/irsim/devel added to the repository From fedora-extras-commits at redhat.com Mon Feb 5 22:04:23 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 5 Feb 2007 17:04:23 -0500 Subject: rpms/irsim Makefile,NONE,1.1 import.log,NONE,1.1 pkg.acl,NONE,1.1 Message-ID: <200702052204.l15M4NR8028524@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/irsim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28515 Added Files: Makefile import.log pkg.acl Log Message: Setup of module irsim --- NEW FILE Makefile --- # Top level Makefile for module irsim all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Mon Feb 5 22:04:31 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 5 Feb 2007 17:04:31 -0500 Subject: rpms/irsim/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702052204.l15M4VgD028541@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/irsim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28515/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module irsim --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Feb 5 22:17:37 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Mon, 5 Feb 2007 17:17:37 -0500 Subject: rpms/irsim import.log,1.1,1.2 Message-ID: <200702052217.l15MHbhs029074@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/irsim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29030 Modified Files: import.log Log Message: auto-import irsim-9.7.41-4 on branch FC-6 from irsim-9.7.41-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/irsim/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 5 Feb 2007 22:04:21 -0000 1.1 +++ import.log 5 Feb 2007 22:17:05 -0000 1.2 @@ -0,0 +1 @@ +irsim-9_7_41-4:FC-6:irsim-9.7.41-4.src.rpm:1170713781 From fedora-extras-commits at redhat.com Mon Feb 5 22:17:39 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Mon, 5 Feb 2007 17:17:39 -0500 Subject: rpms/irsim/FC-6 README.fedora, NONE, 1.1 irsim.spec, NONE, 1.1 screenshot1.png, NONE, 1.1 screenshot2.png, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702052217.l15MHdgf029078@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/irsim/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29030/FC-6 Modified Files: .cvsignore sources Added Files: README.fedora irsim.spec screenshot1.png screenshot2.png Log Message: auto-import irsim-9.7.41-4 on branch FC-6 from irsim-9.7.41-4.src.rpm --- NEW FILE README.fedora --- IRSIM Known Issue. No output on analyser (see screenshot1.png) If you struck against a no output on analyser, this is because the background is being drawn white, and the traces are drawn white, so the result is white-on-white, and invisible! The display was being redrawn. The Tcl/Tk version was hacked on top of the X11 version, and some things aren't properly configured for Tcl/Tk. In Magic and XCircuit, the X defaults has been moved to Tcl, where they are read from a Tcl script. In IRSIM, the properties are still controlled by X11 and the X11 resource manager. The white-on-white probably comes from a default .Xdefaults or possibly .Xresources setting "*background: white" which makes all backgrounds white by default. You can avoid this by adding to your home .Xdefaults file: irsim.background: black and then reloading with "xrdb -load .Xdefaults". (see screenshot2.png) Meanwhile, upstream is working to find a fix. Chitlesh Goorah chitlesh [AT] fedoraproject DOT org --- NEW FILE irsim.spec --- Name: irsim Version: 9.7.41 Release: 4%{?dist} Summary: Switch-level simulator License: GPL Group: Applications/Engineering URL: http://opencircuitdesign.com/%{name} Source0: http://opencircuitdesign.com/%{name}/archive/%{name}-%{version}.tgz Source1: README.fedora Source2: screenshot1.png Source3: screenshot2.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: tk-devel m4 libXt-devel %description IRSIM is a tool for simulating digital circuits. It is a "switch-level" simulator; that is, it treats transistors as ideal switches. Extracted capacitance and lumped resistance values are used to make the switch a little bit more realistic than the ideal, using the RC time constants to predict the relative timing of events. %prep # tarball includes unneeded symlink, so we firstly # create a directory and expand tarball there. %setup -q -T -c %{name}-%{version} -a 0 cd %{name}-%{version} %{__sed} -i.cflags -e 's|CFLAGS=.*CFLAGS|:|' configure %{__sed} -i 's|magic-hackers at csl.cornell.edu|http://bugzilla.redhat.com|' scripts/configure %build cd %{name}-%{version} %configure %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} cd %{name}-%{version} %{__make} install \ DESTDIR=%{buildroot} \ INSTALL="%{__install} -c -p" \ CP="%{__cp} -p" %{__cp} -p doc/faultsim/fsim.ps .. %{__mv} %{buildroot}%{_libdir}/%{name}/doc/powerEst.doc .. # remove duplicates %{__rm} -rf %{buildroot}%{_libdir}/%{name}/doc/ # applying timestamps %{__cp} -p README VERSION .. %{__cp} -p %{SOURCE1} %{SOURCE2} %{SOURCE3} .. %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root,-) %doc README VERSION powerEst.doc fsim.ps README.fedora screenshot* %{_bindir}/%{name} %{_libdir}/%{name}/ %{_mandir}/man1/%{name}* %{_mandir}/man5/netchange.5.gz %{_mandir}/man3/%{name}-analyzer.3.gz %Changelog * Mon Feb 05 2007 Chitlesh Goorah - 9.7.41-4 - dropped patch0 which was used to test analyzer's status - added README.fedora and screenshots to explain the white-on-white output on analyser * Mon Feb 05 2007 Mamoru Tasaka - 9.7.41-3.1 - Rewrite * Fri Feb 02 2007 Chitlesh Goorah - 9.7.41-3 - Rebuild * Thu Feb 01 2007 Mamoru Tasaka - 9.7.41-2.1 - Once create a directory and expand the source there so that all files expanded are removed correctly - Another way to treat CFLAGS - Keep timestamps * Thu Feb 01 2007 Chitlesh Goorah - 9.7.41-2 - fix for CFLAGS * Wed Jan 31 2006 Chitlesh Goorah - 9.7.41-1 - Initial package. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/irsim/FC-6/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Feb 2007 22:04:29 -0000 1.1 +++ .cvsignore 5 Feb 2007 22:17:07 -0000 1.2 @@ -0,0 +1 @@ +irsim-9.7.41.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/irsim/FC-6/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Feb 2007 22:04:29 -0000 1.1 +++ sources 5 Feb 2007 22:17:07 -0000 1.2 @@ -0,0 +1 @@ +3fb5b9a7f5afbd308a28f059d9b350a3 irsim-9.7.41.tgz From fedora-extras-commits at redhat.com Mon Feb 5 22:20:41 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Mon, 5 Feb 2007 17:20:41 -0500 Subject: rpms/irsim import.log,1.2,1.3 Message-ID: <200702052220.l15MKf51029280@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/irsim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29214 Modified Files: import.log Log Message: auto-import irsim-9.7.41-4 on branch devel from irsim-9.7.41-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/irsim/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 5 Feb 2007 22:17:05 -0000 1.2 +++ import.log 5 Feb 2007 22:20:09 -0000 1.3 @@ -1 +1,2 @@ irsim-9_7_41-4:FC-6:irsim-9.7.41-4.src.rpm:1170713781 +irsim-9_7_41-4:HEAD:irsim-9.7.41-4.src.rpm:1170713969 From fedora-extras-commits at redhat.com Mon Feb 5 22:20:44 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Mon, 5 Feb 2007 17:20:44 -0500 Subject: rpms/irsim/devel README.fedora, NONE, 1.1 irsim.spec, NONE, 1.1 screenshot1.png, NONE, 1.1 screenshot2.png, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702052220.l15MKila029285@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/irsim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29214/devel Modified Files: .cvsignore sources Added Files: README.fedora irsim.spec screenshot1.png screenshot2.png Log Message: auto-import irsim-9.7.41-4 on branch devel from irsim-9.7.41-4.src.rpm --- NEW FILE README.fedora --- IRSIM Known Issue. No output on analyser (see screenshot1.png) If you struck against a no output on analyser, this is because the background is being drawn white, and the traces are drawn white, so the result is white-on-white, and invisible! The display was being redrawn. The Tcl/Tk version was hacked on top of the X11 version, and some things aren't properly configured for Tcl/Tk. In Magic and XCircuit, the X defaults has been moved to Tcl, where they are read from a Tcl script. In IRSIM, the properties are still controlled by X11 and the X11 resource manager. The white-on-white probably comes from a default .Xdefaults or possibly .Xresources setting "*background: white" which makes all backgrounds white by default. You can avoid this by adding to your home .Xdefaults file: irsim.background: black and then reloading with "xrdb -load .Xdefaults". (see screenshot2.png) Meanwhile, upstream is working to find a fix. Chitlesh Goorah chitlesh [AT] fedoraproject DOT org --- NEW FILE irsim.spec --- Name: irsim Version: 9.7.41 Release: 4%{?dist} Summary: Switch-level simulator License: GPL Group: Applications/Engineering URL: http://opencircuitdesign.com/%{name} Source0: http://opencircuitdesign.com/%{name}/archive/%{name}-%{version}.tgz Source1: README.fedora Source2: screenshot1.png Source3: screenshot2.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: tk-devel m4 libXt-devel %description IRSIM is a tool for simulating digital circuits. It is a "switch-level" simulator; that is, it treats transistors as ideal switches. Extracted capacitance and lumped resistance values are used to make the switch a little bit more realistic than the ideal, using the RC time constants to predict the relative timing of events. %prep # tarball includes unneeded symlink, so we firstly # create a directory and expand tarball there. %setup -q -T -c %{name}-%{version} -a 0 cd %{name}-%{version} %{__sed} -i.cflags -e 's|CFLAGS=.*CFLAGS|:|' configure %{__sed} -i 's|magic-hackers at csl.cornell.edu|http://bugzilla.redhat.com|' scripts/configure %build cd %{name}-%{version} %configure %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} cd %{name}-%{version} %{__make} install \ DESTDIR=%{buildroot} \ INSTALL="%{__install} -c -p" \ CP="%{__cp} -p" %{__cp} -p doc/faultsim/fsim.ps .. %{__mv} %{buildroot}%{_libdir}/%{name}/doc/powerEst.doc .. # remove duplicates %{__rm} -rf %{buildroot}%{_libdir}/%{name}/doc/ # applying timestamps %{__cp} -p README VERSION .. %{__cp} -p %{SOURCE1} %{SOURCE2} %{SOURCE3} .. %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root,-) %doc README VERSION powerEst.doc fsim.ps README.fedora screenshot* %{_bindir}/%{name} %{_libdir}/%{name}/ %{_mandir}/man1/%{name}* %{_mandir}/man5/netchange.5.gz %{_mandir}/man3/%{name}-analyzer.3.gz %Changelog * Mon Feb 05 2007 Chitlesh Goorah - 9.7.41-4 - dropped patch0 which was used to test analyzer's status - added README.fedora and screenshots to explain the white-on-white output on analyser * Mon Feb 05 2007 Mamoru Tasaka - 9.7.41-3.1 - Rewrite * Fri Feb 02 2007 Chitlesh Goorah - 9.7.41-3 - Rebuild * Thu Feb 01 2007 Mamoru Tasaka - 9.7.41-2.1 - Once create a directory and expand the source there so that all files expanded are removed correctly - Another way to treat CFLAGS - Keep timestamps * Thu Feb 01 2007 Chitlesh Goorah - 9.7.41-2 - fix for CFLAGS * Wed Jan 31 2006 Chitlesh Goorah - 9.7.41-1 - Initial package. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/irsim/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Feb 2007 22:04:29 -0000 1.1 +++ .cvsignore 5 Feb 2007 22:20:11 -0000 1.2 @@ -0,0 +1 @@ +irsim-9.7.41.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/irsim/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Feb 2007 22:04:29 -0000 1.1 +++ sources 5 Feb 2007 22:20:11 -0000 1.2 @@ -0,0 +1 @@ +3fb5b9a7f5afbd308a28f059d9b350a3 irsim-9.7.41.tgz From fedora-extras-commits at redhat.com Mon Feb 5 22:21:53 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Mon, 5 Feb 2007 17:21:53 -0500 Subject: rpms/kalgebra import.log,1.1,1.2 Message-ID: <200702052221.l15MLr6K029377@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/kalgebra In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29336 Modified Files: import.log Log Message: auto-import kalgebra-0.5-3 on branch FC-6 from kalgebra-0.5-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/kalgebra/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 5 Feb 2007 21:55:15 -0000 1.1 +++ import.log 5 Feb 2007 22:21:21 -0000 1.2 @@ -0,0 +1 @@ +kalgebra-0_5-3:FC-6:kalgebra-0.5-3.src.rpm:1170714113 From fedora-extras-commits at redhat.com Mon Feb 5 22:21:55 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Mon, 5 Feb 2007 17:21:55 -0500 Subject: rpms/kalgebra/FC-6 kalgebra-0.5-autotools.patch, NONE, 1.1 kalgebra.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702052221.l15MLt4q029381@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/kalgebra/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29336/FC-6 Modified Files: .cvsignore sources Added Files: kalgebra-0.5-autotools.patch kalgebra.spec Log Message: auto-import kalgebra-0.5-3 on branch FC-6 from kalgebra-0.5-3.src.rpm kalgebra-0.5-autotools.patch: --- NEW FILE kalgebra-0.5-autotools.patch --- --- admin/cvs.sh 2006-04-07 19:07:27.000000000 +0200 +++ cvs.sh 2006-12-18 08:41:24.000000000 +0100 @@ -29,7 +29,7 @@ { AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1` case $AUTOCONF_VERSION in - Autoconf*2.5* | autoconf*2.5* ) : ;; + Autoconf*2.6* | autoconf*2.6* ) : ;; "" ) echo "*** AUTOCONF NOT FOUND!." echo "*** KDE requires autoconf 2.52, 2.53 or 2.54" @@ -41,10 +41,10 @@ exit 1 ;; esac - + AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1` case $AUTOHEADER_VERSION in - Autoconf*2.5* | autoheader*2.5* ) : ;; + Autoconf*2.6* | autoheader*2.6* ) : ;; "" ) echo "*** AUTOHEADER NOT FOUND!." echo "*** KDE requires autoheader 2.52 or 2.53 (part of autoconf)" @@ -64,7 +64,7 @@ echo "*** KDE requires automake 1.6.1 or newer" exit 1 ;; - automake*1.6.* | automake*1.7* | automake*1.8.* | automake*1.9* ) : ;; + automake*1.6.* | automake*1.7* | automake*1.8.* | automake*1.9* | automake*1.10* ) : ;; "" ) echo "*** AUTOMAKE NOT FOUND!." echo "*** KDE requires automake 1.6.1 or newer" @@ -85,12 +85,12 @@ cvs() { check_autotool_versions - + ### Produce acinclude.m4 if grep '\$(top_srcdir)/acinclude.m4:' $makefile_am >/dev/null; then echo "*** Creating acinclude.m4" rm -f acinclude.m4 configure.files - + strip_makefile $MAKE -f $makefile_wo top_srcdir=. ./acinclude.m4 fi @@ -105,7 +105,7 @@ if test -r Makefile.am.in; then echo "*** Creating Makefile.am" - if grep '\$(top_srcdir)/Makefile.am:' $makefile_am >/dev/null; then + if grep '\$(top_srcdir)/Makefile.am:' $makefile_am >/dev/null; then strip_makefile $MAKE -f $makefile_wo top_srcdir=. ./Makefile.am || exit 1 else @@ -235,7 +235,7 @@ done fi -for topleveldir in $topleveldirs; do +for topleveldir in $topleveldirs; do if test -f $topleveldir/configure.in; then continue fi @@ -256,7 +256,7 @@ files=`cat configure.files` list=`egrep '^dnl AC_OUTPUT\(.*\)' $files | sed -e "s#^.*dnl AC_OUTPUT(\(.*\))#\1#"` -for file in $list; do +for file in $list; do echo "AC_CONFIG_FILES([ $file ])" >> configure.in.new done @@ -287,10 +287,10 @@ VERSION="\"3.1.0\"" fi if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then - modulename=`pwd`; + modulename=`pwd`; modulename=`basename $modulename` esc_VERSION=`echo $VERSION | sed -e "s#[^.0-9a-zA-Z]##g"` - modulename=`echo $modulename | sed -e "s#-$esc_VERSION##"` + modulename=`echo $modulename | sed -e "s#-$esc_VERSION##"` fi if test -n "$kde_use_qt_param"; then @@ -338,7 +338,7 @@ create_subdirs() { -if grep '\$(top_srcdir)/subdirs:' $makefile_am >/dev/null; then +if grep '\$(top_srcdir)/subdirs:' $makefile_am >/dev/null; then # as many modules contain rules to create subdirs without any # dependencies make won't create it unless there is no file. # so we check if that's a dummy rule or one that works @@ -350,7 +350,7 @@ $MAKE -f $makefile_wo top_srcdir=. ./subdirs || exit 1 if test -f subdirs.cvs.sh.$$; then if test -s subdirs; then - rm subdirs.cvs.sh.$$ + rm subdirs.cvs.sh.$$ else mv subdirs.cvs.sh.$$ subdirs fi @@ -387,7 +387,7 @@ echo $d >> ./_SUBDIRS done -(for d in $dirs; do +(for d in $dirs; do list=`sed -ne "s#^COMPILE_BEFORE_$d""[ ]*=[ ]*##p" $makefile_am | head -n 1` for s in $list; do echo $s $d @@ -518,7 +518,7 @@ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" \ XGETTEXT="${XGETTEXT:-xgettext} -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale -x ${includedir:-${KDEDIR:-/usr/local/kde}/include}/kde.pot" \ - messages + messages exit_code=$? if test "$exit_code" != 0; then echo "make exit code: $exit_code" --- NEW FILE kalgebra.spec --- %define real_version 20060501 Name: kalgebra Version: 0.5 Release: 3%{?dist} Summary: MathML-based graph calculator License: GPL Group: Applications/Engineering URL: http://%{name}.berlios.de Source: http://download.berlios.de/kalgebra/kalgebra-%{real_version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: %{name}-%{version}-autotools.patch BuildRequires: kdelibs-devel, gettext, automake %description KAlgebra is a MathML-based graph calculator. Besides it was initially mathml oriented now it can be used by everyone with little mathematic knowledge. %prep %setup -q -n %{name} # fix for autoconf >= 2.6 & automake >= 2.10 on admin/cvs.sh %if "%{?fedora}" > "6" %patch -p0 -b .autotools %endif %{__make} -f admin/Makefile.common cvs %build %configure --disable-rpath %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} %{__make} DESTDIR=%{buildroot} install desktop-file-install --vendor "" \ --add-category "Education" \ --add-category "Math" \ --dir %{buildroot}%{_datadir}/applications/ \ --delete-original \ %{buildroot}%{_datadir}/applnk/Utilities/%{name}.desktop ## File lists # locale's %find_lang %{name} || touch %{name}.lang # HTML (1.0) HTML_DIR=$(kde-config --expandvars --install html) if [ -d %{buildroot}$HTML_DIR ]; then for lang_dir in %{buildroot}$HTML_DIR/* ; do if [ -d $lang_dir ]; then lang=$(basename $lang_dir) echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang # replace absolute symlinks with relative ones pushd $lang_dir for i in *; do [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common done popd fi done fi %clean %{__rm} -rf %{buildroot} %post touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %postun touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING %{_bindir}/%{name} %{_datadir}/icons/crystalsvg/*/*/%{name}.png %{_datadir}/applications/%{name}.desktop %{_datadir}/apps/%{name}/ %Changelog * Thu Feb 01 2007 Chitlesh Goorah - 0.5-3 - Fix presence in gnome menu * Sat Jan 27 2007 Chitlesh Goorah - 0.5-2 - dropped duplicate files * Sat Jun 03 2006 Chitlesh Goorah - 0.5-1 - Initial package. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kalgebra/FC-6/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Feb 2007 21:55:23 -0000 1.1 +++ .cvsignore 5 Feb 2007 22:21:23 -0000 1.2 @@ -0,0 +1 @@ +kalgebra-20060501.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kalgebra/FC-6/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Feb 2007 21:55:23 -0000 1.1 +++ sources 5 Feb 2007 22:21:23 -0000 1.2 @@ -0,0 +1 @@ +8fb7edabb6b59c7606decf2f70da8dcd kalgebra-20060501.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 5 22:25:48 2007 From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat)) Date: Mon, 5 Feb 2007 17:25:48 -0500 Subject: rpms/ktorrent/devel ktorrent.spec,1.18,1.19 Message-ID: <200702052225.l15MPmkW029541@cvs-int.fedora.redhat.com> Author: liquidat Update of /cvs/extras/rpms/ktorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29510 Modified Files: ktorrent.spec Log Message: Small bug in spec file corrected Index: ktorrent.spec =================================================================== RCS file: /cvs/extras/rpms/ktorrent/devel/ktorrent.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- ktorrent.spec 5 Feb 2007 22:01:24 -0000 1.18 +++ ktorrent.spec 5 Feb 2007 22:25:16 -0000 1.19 @@ -73,8 +73,6 @@ %{_bindir}/ktshell %{_bindir}/ktupnptest %{_libdir}/libktorrent.so -%{_libdir}/libktorrent.so.0 -%{_libdir}/libktorrent.so.0.0.0 %{_libdir}/kde3/ktinfowidgetplugin.so %{_libdir}/kde3/ktipfilterplugin.so %{_libdir}/kde3/ktlogviewerplugin.so From fedora-extras-commits at redhat.com Mon Feb 5 22:27:04 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Mon, 5 Feb 2007 17:27:04 -0500 Subject: rpms/kalgebra/devel kalgebra-0.5-autotools.patch, NONE, 1.1 kalgebra.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702052227.l15MR4TG029626@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/kalgebra/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29578/devel Modified Files: .cvsignore sources Added Files: kalgebra-0.5-autotools.patch kalgebra.spec Log Message: auto-import kalgebra-0.5-3 on branch devel from kalgebra-0.5-3.src.rpm kalgebra-0.5-autotools.patch: --- NEW FILE kalgebra-0.5-autotools.patch --- --- admin/cvs.sh 2006-04-07 19:07:27.000000000 +0200 +++ cvs.sh 2006-12-18 08:41:24.000000000 +0100 @@ -29,7 +29,7 @@ { AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1` case $AUTOCONF_VERSION in - Autoconf*2.5* | autoconf*2.5* ) : ;; + Autoconf*2.6* | autoconf*2.6* ) : ;; "" ) echo "*** AUTOCONF NOT FOUND!." echo "*** KDE requires autoconf 2.52, 2.53 or 2.54" @@ -41,10 +41,10 @@ exit 1 ;; esac - + AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1` case $AUTOHEADER_VERSION in - Autoconf*2.5* | autoheader*2.5* ) : ;; + Autoconf*2.6* | autoheader*2.6* ) : ;; "" ) echo "*** AUTOHEADER NOT FOUND!." echo "*** KDE requires autoheader 2.52 or 2.53 (part of autoconf)" @@ -64,7 +64,7 @@ echo "*** KDE requires automake 1.6.1 or newer" exit 1 ;; - automake*1.6.* | automake*1.7* | automake*1.8.* | automake*1.9* ) : ;; + automake*1.6.* | automake*1.7* | automake*1.8.* | automake*1.9* | automake*1.10* ) : ;; "" ) echo "*** AUTOMAKE NOT FOUND!." echo "*** KDE requires automake 1.6.1 or newer" @@ -85,12 +85,12 @@ cvs() { check_autotool_versions - + ### Produce acinclude.m4 if grep '\$(top_srcdir)/acinclude.m4:' $makefile_am >/dev/null; then echo "*** Creating acinclude.m4" rm -f acinclude.m4 configure.files - + strip_makefile $MAKE -f $makefile_wo top_srcdir=. ./acinclude.m4 fi @@ -105,7 +105,7 @@ if test -r Makefile.am.in; then echo "*** Creating Makefile.am" - if grep '\$(top_srcdir)/Makefile.am:' $makefile_am >/dev/null; then + if grep '\$(top_srcdir)/Makefile.am:' $makefile_am >/dev/null; then strip_makefile $MAKE -f $makefile_wo top_srcdir=. ./Makefile.am || exit 1 else @@ -235,7 +235,7 @@ done fi -for topleveldir in $topleveldirs; do +for topleveldir in $topleveldirs; do if test -f $topleveldir/configure.in; then continue fi @@ -256,7 +256,7 @@ files=`cat configure.files` list=`egrep '^dnl AC_OUTPUT\(.*\)' $files | sed -e "s#^.*dnl AC_OUTPUT(\(.*\))#\1#"` -for file in $list; do +for file in $list; do echo "AC_CONFIG_FILES([ $file ])" >> configure.in.new done @@ -287,10 +287,10 @@ VERSION="\"3.1.0\"" fi if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then - modulename=`pwd`; + modulename=`pwd`; modulename=`basename $modulename` esc_VERSION=`echo $VERSION | sed -e "s#[^.0-9a-zA-Z]##g"` - modulename=`echo $modulename | sed -e "s#-$esc_VERSION##"` + modulename=`echo $modulename | sed -e "s#-$esc_VERSION##"` fi if test -n "$kde_use_qt_param"; then @@ -338,7 +338,7 @@ create_subdirs() { -if grep '\$(top_srcdir)/subdirs:' $makefile_am >/dev/null; then +if grep '\$(top_srcdir)/subdirs:' $makefile_am >/dev/null; then # as many modules contain rules to create subdirs without any # dependencies make won't create it unless there is no file. # so we check if that's a dummy rule or one that works @@ -350,7 +350,7 @@ $MAKE -f $makefile_wo top_srcdir=. ./subdirs || exit 1 if test -f subdirs.cvs.sh.$$; then if test -s subdirs; then - rm subdirs.cvs.sh.$$ + rm subdirs.cvs.sh.$$ else mv subdirs.cvs.sh.$$ subdirs fi @@ -387,7 +387,7 @@ echo $d >> ./_SUBDIRS done -(for d in $dirs; do +(for d in $dirs; do list=`sed -ne "s#^COMPILE_BEFORE_$d""[ ]*=[ ]*##p" $makefile_am | head -n 1` for s in $list; do echo $s $d @@ -518,7 +518,7 @@ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" \ XGETTEXT="${XGETTEXT:-xgettext} -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale -x ${includedir:-${KDEDIR:-/usr/local/kde}/include}/kde.pot" \ - messages + messages exit_code=$? if test "$exit_code" != 0; then echo "make exit code: $exit_code" --- NEW FILE kalgebra.spec --- %define real_version 20060501 Name: kalgebra Version: 0.5 Release: 3%{?dist} Summary: MathML-based graph calculator License: GPL Group: Applications/Engineering URL: http://%{name}.berlios.de Source: http://download.berlios.de/kalgebra/kalgebra-%{real_version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: %{name}-%{version}-autotools.patch BuildRequires: kdelibs-devel, gettext, automake %description KAlgebra is a MathML-based graph calculator. Besides it was initially mathml oriented now it can be used by everyone with little mathematic knowledge. %prep %setup -q -n %{name} # fix for autoconf >= 2.6 & automake >= 2.10 on admin/cvs.sh %if "%{?fedora}" > "6" %patch -p0 -b .autotools %endif %{__make} -f admin/Makefile.common cvs %build %configure --disable-rpath %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} %{__make} DESTDIR=%{buildroot} install desktop-file-install --vendor "" \ --add-category "Education" \ --add-category "Math" \ --dir %{buildroot}%{_datadir}/applications/ \ --delete-original \ %{buildroot}%{_datadir}/applnk/Utilities/%{name}.desktop ## File lists # locale's %find_lang %{name} || touch %{name}.lang # HTML (1.0) HTML_DIR=$(kde-config --expandvars --install html) if [ -d %{buildroot}$HTML_DIR ]; then for lang_dir in %{buildroot}$HTML_DIR/* ; do if [ -d $lang_dir ]; then lang=$(basename $lang_dir) echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang # replace absolute symlinks with relative ones pushd $lang_dir for i in *; do [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common done popd fi done fi %clean %{__rm} -rf %{buildroot} %post touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %postun touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING %{_bindir}/%{name} %{_datadir}/icons/crystalsvg/*/*/%{name}.png %{_datadir}/applications/%{name}.desktop %{_datadir}/apps/%{name}/ %Changelog * Thu Feb 01 2007 Chitlesh Goorah - 0.5-3 - Fix presence in gnome menu * Sat Jan 27 2007 Chitlesh Goorah - 0.5-2 - dropped duplicate files * Sat Jun 03 2006 Chitlesh Goorah - 0.5-1 - Initial package. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kalgebra/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Feb 2007 21:55:23 -0000 1.1 +++ .cvsignore 5 Feb 2007 22:26:32 -0000 1.2 @@ -0,0 +1 @@ +kalgebra-20060501.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kalgebra/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Feb 2007 21:55:23 -0000 1.1 +++ sources 5 Feb 2007 22:26:32 -0000 1.2 @@ -0,0 +1 @@ +8fb7edabb6b59c7606decf2f70da8dcd kalgebra-20060501.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 5 22:27:02 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Mon, 5 Feb 2007 17:27:02 -0500 Subject: rpms/kalgebra import.log,1.2,1.3 Message-ID: <200702052227.l15MR2os029620@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/kalgebra In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29578 Modified Files: import.log Log Message: auto-import kalgebra-0.5-3 on branch devel from kalgebra-0.5-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/kalgebra/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 5 Feb 2007 22:21:21 -0000 1.2 +++ import.log 5 Feb 2007 22:26:30 -0000 1.3 @@ -1 +1,2 @@ kalgebra-0_5-3:FC-6:kalgebra-0.5-3.src.rpm:1170714113 +kalgebra-0_5-3:HEAD:kalgebra-0.5-3.src.rpm:1170714423 From fedora-extras-commits at redhat.com Mon Feb 5 22:28:39 2007 From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat)) Date: Mon, 5 Feb 2007 17:28:39 -0500 Subject: rpms/ktorrent/devel ktorrent.spec,1.19,1.20 Message-ID: <200702052228.l15MSdfN029743@cvs-int.fedora.redhat.com> Author: liquidat Update of /cvs/extras/rpms/ktorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29676 Modified Files: ktorrent.spec Log Message: Minor version in spec file corrected Index: ktorrent.spec =================================================================== RCS file: /cvs/extras/rpms/ktorrent/devel/ktorrent.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- ktorrent.spec 5 Feb 2007 22:25:16 -0000 1.19 +++ ktorrent.spec 5 Feb 2007 22:28:06 -0000 1.20 @@ -2,7 +2,7 @@ Name: ktorrent Version: 2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A BitTorrent program for KDE Group: Applications/Internet License: GPL @@ -124,7 +124,7 @@ %{_datadir}/services/ktzeroconfplugin.desktop %changelog -* Mon Feb 05 2007 Roland Wolters 2.1-1 +* Mon Feb 05 2007 Roland Wolters 2.1-2 - Update to upstream version 2.1 * Fri Oct 13 2006 Roland Wolters 2.0.3-4 From fedora-extras-commits at redhat.com Mon Feb 5 22:44:22 2007 From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat)) Date: Mon, 5 Feb 2007 17:44:22 -0500 Subject: rpms/ktorrent/devel ktorrent.spec,1.20,1.21 Message-ID: <200702052244.l15MiMNr030132@cvs-int.fedora.redhat.com> Author: liquidat Update of /cvs/extras/rpms/ktorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30115 Modified Files: ktorrent.spec Log Message: Yet another minor bugfix update. Index: ktorrent.spec =================================================================== RCS file: /cvs/extras/rpms/ktorrent/devel/ktorrent.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- ktorrent.spec 5 Feb 2007 22:28:06 -0000 1.20 +++ ktorrent.spec 5 Feb 2007 22:43:50 -0000 1.21 @@ -2,7 +2,7 @@ Name: ktorrent Version: 2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A BitTorrent program for KDE Group: Applications/Internet License: GPL @@ -73,6 +73,7 @@ %{_bindir}/ktshell %{_bindir}/ktupnptest %{_libdir}/libktorrent.so +%{_libdir}/libktorrent-2.1.so %{_libdir}/kde3/ktinfowidgetplugin.so %{_libdir}/kde3/ktipfilterplugin.so %{_libdir}/kde3/ktlogviewerplugin.so @@ -124,7 +125,7 @@ %{_datadir}/services/ktzeroconfplugin.desktop %changelog -* Mon Feb 05 2007 Roland Wolters 2.1-2 +* Mon Feb 05 2007 Roland Wolters 2.1-3 - Update to upstream version 2.1 * Fri Oct 13 2006 Roland Wolters 2.0.3-4 From fedora-extras-commits at redhat.com Mon Feb 5 22:46:57 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Mon, 5 Feb 2007 17:46:57 -0500 Subject: rpms/irsim/FC-6 irsim.spec,1.1,1.2 Message-ID: <200702052246.l15MkvJQ030241@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/irsim/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30202/FC-6 Modified Files: irsim.spec Log Message: auto-import irsim-9.7.41-5 on branch FC-6 from irsim-9.7.41-5.src.rpm Index: irsim.spec =================================================================== RCS file: /cvs/extras/rpms/irsim/FC-6/irsim.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- irsim.spec 5 Feb 2007 22:17:07 -0000 1.1 +++ irsim.spec 5 Feb 2007 22:46:25 -0000 1.2 @@ -1,6 +1,6 @@ Name: irsim Version: 9.7.41 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Switch-level simulator License: GPL @@ -64,7 +64,7 @@ %files %defattr(-,root,root,-) %doc README VERSION powerEst.doc fsim.ps README.fedora screenshot* -%{_bindir}/%{name} +%{_bindir}/* %{_libdir}/%{name}/ %{_mandir}/man1/%{name}* %{_mandir}/man5/netchange.5.gz @@ -72,6 +72,9 @@ %Changelog +* Mon Feb 05 2007 Chitlesh Goorah - 9.7.41-5 +- fixed for other binaries - genspktbl, gentbl + * Mon Feb 05 2007 Chitlesh Goorah - 9.7.41-4 - dropped patch0 which was used to test analyzer's status - added README.fedora and screenshots to explain the white-on-white output on analyser From fedora-extras-commits at redhat.com Mon Feb 5 22:46:55 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Mon, 5 Feb 2007 17:46:55 -0500 Subject: rpms/irsim import.log,1.3,1.4 Message-ID: <200702052246.l15MktMa030238@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/irsim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30202 Modified Files: import.log Log Message: auto-import irsim-9.7.41-5 on branch FC-6 from irsim-9.7.41-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/irsim/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 5 Feb 2007 22:20:09 -0000 1.3 +++ import.log 5 Feb 2007 22:46:23 -0000 1.4 @@ -1,2 +1,3 @@ irsim-9_7_41-4:FC-6:irsim-9.7.41-4.src.rpm:1170713781 irsim-9_7_41-4:HEAD:irsim-9.7.41-4.src.rpm:1170713969 +irsim-9_7_41-5:FC-6:irsim-9.7.41-5.src.rpm:1170715579 From fedora-extras-commits at redhat.com Mon Feb 5 22:49:24 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Mon, 5 Feb 2007 17:49:24 -0500 Subject: rpms/irsim/devel irsim.spec,1.1,1.2 Message-ID: <200702052249.l15MnOJD030364@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/irsim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30320/devel Modified Files: irsim.spec Log Message: auto-import irsim-9.7.41-5 on branch devel from irsim-9.7.41-5.src.rpm Index: irsim.spec =================================================================== RCS file: /cvs/extras/rpms/irsim/devel/irsim.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- irsim.spec 5 Feb 2007 22:20:11 -0000 1.1 +++ irsim.spec 5 Feb 2007 22:48:52 -0000 1.2 @@ -1,6 +1,6 @@ Name: irsim Version: 9.7.41 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Switch-level simulator License: GPL @@ -64,7 +64,7 @@ %files %defattr(-,root,root,-) %doc README VERSION powerEst.doc fsim.ps README.fedora screenshot* -%{_bindir}/%{name} +%{_bindir}/* %{_libdir}/%{name}/ %{_mandir}/man1/%{name}* %{_mandir}/man5/netchange.5.gz @@ -72,6 +72,9 @@ %Changelog +* Mon Feb 05 2007 Chitlesh Goorah - 9.7.41-5 +- fixed for other binaries - genspktbl, gentbl + * Mon Feb 05 2007 Chitlesh Goorah - 9.7.41-4 - dropped patch0 which was used to test analyzer's status - added README.fedora and screenshots to explain the white-on-white output on analyser From fedora-extras-commits at redhat.com Mon Feb 5 22:49:22 2007 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Mon, 5 Feb 2007 17:49:22 -0500 Subject: rpms/irsim import.log,1.4,1.5 Message-ID: <200702052249.l15MnMxS030358@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/irsim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30320 Modified Files: import.log Log Message: auto-import irsim-9.7.41-5 on branch devel from irsim-9.7.41-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/irsim/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 5 Feb 2007 22:46:23 -0000 1.4 +++ import.log 5 Feb 2007 22:48:49 -0000 1.5 @@ -1,3 +1,4 @@ irsim-9_7_41-4:FC-6:irsim-9.7.41-4.src.rpm:1170713781 irsim-9_7_41-4:HEAD:irsim-9.7.41-4.src.rpm:1170713969 irsim-9_7_41-5:FC-6:irsim-9.7.41-5.src.rpm:1170715579 +irsim-9_7_41-5:HEAD:irsim-9.7.41-5.src.rpm:1170715726 From fedora-extras-commits at redhat.com Mon Feb 5 23:07:15 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Mon, 5 Feb 2007 18:07:15 -0500 Subject: rpms/skencil/devel skencil.spec,1.14,1.15 Message-ID: <200702052307.l15N7FrY001635@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/skencil/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1593 Modified Files: skencil.spec Log Message: add support for tcltk 8.5 Index: skencil.spec =================================================================== RCS file: /cvs/extras/rpms/skencil/devel/skencil.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- skencil.spec 3 Feb 2007 15:28:27 -0000 1.14 +++ skencil.spec 5 Feb 2007 23:06:43 -0000 1.15 @@ -45,6 +45,7 @@ %patch0 -p1 grep -rl lib/ . | xargs perl -pi -e's,lib/,%{_lib}/,g' grep -rl lib\' . | xargs perl -pi -es,lib\',%{_lib}\',g +sed -i 's|8.4|8.5|' setup.py %build find \( -name \*.sk -or -name \*.ppm -or -name \*.jpg \) -exec chmod 644 \{\} \; @@ -117,6 +118,9 @@ %changelog +* Tue Feb 6 2007 Gerard Milmeister - 0.6.17-11 +- add support for tcltk 8.5 + * Sat Feb 3 2007 Gerard Milmeister - 0.6.17-10 - fix font files From fedora-extras-commits at redhat.com Mon Feb 5 23:07:23 2007 From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat)) Date: Mon, 5 Feb 2007 18:07:23 -0500 Subject: rpms/ktorrent/FC-6 .cvsignore, 1.6, 1.7 ktorrent.spec, 1.17, 1.18 sources, 1.6, 1.7 Message-ID: <200702052307.l15N7Nr4001640@cvs-int.fedora.redhat.com> Author: liquidat Update of /cvs/extras/rpms/ktorrent/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1613 Modified Files: .cvsignore ktorrent.spec sources Log Message: New upstream version 2.1. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ktorrent/FC-6/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 13 Oct 2006 17:27:40 -0000 1.6 +++ .cvsignore 5 Feb 2007 23:06:50 -0000 1.7 @@ -1 +1 @@ -ktorrent-2.0.3.tar.gz +ktorrent-2.1.tar.gz Index: ktorrent.spec =================================================================== RCS file: /cvs/extras/rpms/ktorrent/FC-6/ktorrent.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ktorrent.spec 14 Oct 2006 11:14:34 -0000 1.17 +++ ktorrent.spec 5 Feb 2007 23:06:50 -0000 1.18 @@ -1,14 +1,13 @@ %define desktopvendor fedora Name: ktorrent -Version: 2.0.3 -Release: 4%{?dist} +Version: 2.1 +Release: 3%{?dist} Summary: A BitTorrent program for KDE Group: Applications/Internet License: GPL URL: http://ktorrent.pwsp.net/ -Source0: http://ktorrent.org/downloads/2.0.3/ktorrent-2.0.3.tar.gz -Patch0: ktorrent-2.0.3-znow.patch +Source0: http://ktorrent.org/downloads/2.1/ktorrent-2.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel kdelibs-devel desktop-file-utils gettext gmp-devel @@ -23,7 +22,6 @@ %prep %setup -q -%patch -p1 -b .znow %build %configure --disable-rpath @@ -68,33 +66,29 @@ %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README TODO %exclude %{_libdir}/lib*.la +%exclude %{_libdir}/kde3/kt*.la %{_bindir}/ktcachecheck %{_bindir}/ktorrent %{_bindir}/kttorinfo %{_bindir}/ktshell %{_bindir}/ktupnptest %{_libdir}/libktorrent.so -%{_libdir}/libktorrent.so.0 -%{_libdir}/libktorrent.so.0.0.0 +%{_libdir}/libktorrent-2.1.so %{_libdir}/kde3/ktinfowidgetplugin.so -%{_libdir}/kde3/ktinfowidgetplugin.la %{_libdir}/kde3/ktipfilterplugin.so -%{_libdir}/kde3/ktipfilterplugin.la %{_libdir}/kde3/ktlogviewerplugin.so -%{_libdir}/kde3/ktlogviewerplugin.la %{_libdir}/kde3/ktpartfileimportplugin.so -%{_libdir}/kde3/ktpartfileimportplugin.la -%{_libdir}/kde3/ktscanfolderplugin.la +%{_libdir}/kde3/ktrssfeedplugin.so %{_libdir}/kde3/ktscanfolderplugin.so -%{_libdir}/kde3/ktschedulerplugin.la %{_libdir}/kde3/ktschedulerplugin.so %{_libdir}/kde3/ktsearchplugin.so -%{_libdir}/kde3/ktsearchplugin.la %{_libdir}/kde3/ktupnpplugin.so -%{_libdir}/kde3/ktupnpplugin.la +%{_libdir}/kde3/ktwebinterfaceplugin.so +%{_libdir}/kde3/ktzeroconfplugin.so %{_datadir}/applications/kde/ktorrent.desktop %{_datadir}/apps/ktorrent %{_datadir}/config.kcfg/ktlogviewerplugin.kcfg +%{_datadir}/config.kcfg/ktrssfeedplugin.kcfg %{_datadir}/config.kcfg/ktscanfolderplugin.kcfg %{_datadir}/config.kcfg/ktschedulerplugin.kcfg %{_datadir}/config.kcfg/ktinfowidgetplugin.kcfg @@ -102,6 +96,7 @@ %{_datadir}/config.kcfg/ktorrent.kcfg %{_datadir}/config.kcfg/ktsearchplugin.kcfg %{_datadir}/config.kcfg/ktupnpplugin.kcfg +%{_datadir}/config.kcfg/ktwebinterfaceplugin.kcfg %{_datadir}/icons/hicolor/128x128/apps/ktorrent.png %{_datadir}/icons/hicolor/16x16/apps/ktorrent.png %{_datadir}/icons/hicolor/22x22/apps/ktorrent.png @@ -122,11 +117,17 @@ %{_datadir}/services/ktipfilterplugin.desktop %{_datadir}/services/ktlogviewerplugin.desktop %{_datadir}/services/ktpartfileimportplugin.desktop +%{_datadir}/services/ktrssfeedplugin.desktop %{_datadir}/services/ktsearchplugin.desktop %{_datadir}/services/ktupnpplugin.desktop %{_datadir}/servicetypes/ktorrentplugin.desktop +%{_datadir}/services/ktwebinterfaceplugin.desktop +%{_datadir}/services/ktzeroconfplugin.desktop %changelog +* Mon Feb 05 2007 Roland Wolters 2.1-3 +- Update to upstream version 2.1 + * Fri Oct 13 2006 Roland Wolters 2.0.3-4 - Update to upstream version 2.0.3 - added znow patch for ppc Index: sources =================================================================== RCS file: /cvs/extras/rpms/ktorrent/FC-6/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 13 Oct 2006 17:27:40 -0000 1.6 +++ sources 5 Feb 2007 23:06:50 -0000 1.7 @@ -1 +1 @@ -f0297ab9ead77ee11f9f46cffa904b89 ktorrent-2.0.3.tar.gz +2e3c350fe02b68936a6f8f6460fae8f6 ktorrent-2.1.tar.gz From fedora-extras-commits at redhat.com Mon Feb 5 23:08:34 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Mon, 5 Feb 2007 18:08:34 -0500 Subject: rpms/skencil/devel skencil.spec,1.15,1.16 Message-ID: <200702052308.l15N8YgS001753@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/skencil/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1721 Modified Files: skencil.spec Log Message: Index: skencil.spec =================================================================== RCS file: /cvs/extras/rpms/skencil/devel/skencil.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- skencil.spec 5 Feb 2007 23:06:43 -0000 1.15 +++ skencil.spec 5 Feb 2007 23:08:02 -0000 1.16 @@ -1,6 +1,6 @@ Name: skencil Version: 0.6.17 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Vector drawing program From fedora-extras-commits at redhat.com Mon Feb 5 23:09:07 2007 From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat)) Date: Mon, 5 Feb 2007 18:09:07 -0500 Subject: rpms/ktorrent/FC-5 .cvsignore, 1.6, 1.7 ktorrent.spec, 1.11, 1.12 sources, 1.6, 1.7 Message-ID: <200702052309.l15N971c001821@cvs-int.fedora.redhat.com> Author: liquidat Update of /cvs/extras/rpms/ktorrent/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1756 Modified Files: .cvsignore ktorrent.spec sources Log Message: New upstream version 2.1. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ktorrent/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 13 Oct 2006 17:28:38 -0000 1.6 +++ .cvsignore 5 Feb 2007 23:08:35 -0000 1.7 @@ -1 +1 @@ -ktorrent-2.0.3.tar.gz +ktorrent-2.1.tar.gz Index: ktorrent.spec =================================================================== RCS file: /cvs/extras/rpms/ktorrent/FC-5/ktorrent.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ktorrent.spec 13 Oct 2006 22:13:20 -0000 1.11 +++ ktorrent.spec 5 Feb 2007 23:08:35 -0000 1.12 @@ -1,14 +1,13 @@ %define desktopvendor fedora Name: ktorrent -Version: 2.0.3 -Release: 4%{?dist} +Version: 2.1 +Release: 3%{?dist} Summary: A BitTorrent program for KDE Group: Applications/Internet License: GPL URL: http://ktorrent.pwsp.net/ -Source0: http://ktorrent.org/downloads/2.0.3/ktorrent-2.0.3.tar.gz -Patch0: ktorrent-2.0.3-znow.patch +Source0: http://ktorrent.org/downloads/2.1/ktorrent-2.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel kdelibs-devel desktop-file-utils gettext gmp-devel @@ -23,7 +22,6 @@ %prep %setup -q -%patch -p1 -b .znow %build %configure --disable-rpath @@ -68,33 +66,29 @@ %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README TODO %exclude %{_libdir}/lib*.la +%exclude %{_libdir}/kde3/kt*.la %{_bindir}/ktcachecheck %{_bindir}/ktorrent %{_bindir}/kttorinfo %{_bindir}/ktshell %{_bindir}/ktupnptest %{_libdir}/libktorrent.so -%{_libdir}/libktorrent.so.0 -%{_libdir}/libktorrent.so.0.0.0 +%{_libdir}/libktorrent-2.1.so %{_libdir}/kde3/ktinfowidgetplugin.so -%{_libdir}/kde3/ktinfowidgetplugin.la %{_libdir}/kde3/ktipfilterplugin.so -%{_libdir}/kde3/ktipfilterplugin.la %{_libdir}/kde3/ktlogviewerplugin.so -%{_libdir}/kde3/ktlogviewerplugin.la %{_libdir}/kde3/ktpartfileimportplugin.so -%{_libdir}/kde3/ktpartfileimportplugin.la -%{_libdir}/kde3/ktscanfolderplugin.la +%{_libdir}/kde3/ktrssfeedplugin.so %{_libdir}/kde3/ktscanfolderplugin.so -%{_libdir}/kde3/ktschedulerplugin.la %{_libdir}/kde3/ktschedulerplugin.so %{_libdir}/kde3/ktsearchplugin.so -%{_libdir}/kde3/ktsearchplugin.la %{_libdir}/kde3/ktupnpplugin.so -%{_libdir}/kde3/ktupnpplugin.la +%{_libdir}/kde3/ktwebinterfaceplugin.so +%{_libdir}/kde3/ktzeroconfplugin.so %{_datadir}/applications/kde/ktorrent.desktop %{_datadir}/apps/ktorrent %{_datadir}/config.kcfg/ktlogviewerplugin.kcfg +%{_datadir}/config.kcfg/ktrssfeedplugin.kcfg %{_datadir}/config.kcfg/ktscanfolderplugin.kcfg %{_datadir}/config.kcfg/ktschedulerplugin.kcfg %{_datadir}/config.kcfg/ktinfowidgetplugin.kcfg @@ -102,6 +96,7 @@ %{_datadir}/config.kcfg/ktorrent.kcfg %{_datadir}/config.kcfg/ktsearchplugin.kcfg %{_datadir}/config.kcfg/ktupnpplugin.kcfg +%{_datadir}/config.kcfg/ktwebinterfaceplugin.kcfg %{_datadir}/icons/hicolor/128x128/apps/ktorrent.png %{_datadir}/icons/hicolor/16x16/apps/ktorrent.png %{_datadir}/icons/hicolor/22x22/apps/ktorrent.png @@ -122,11 +117,17 @@ %{_datadir}/services/ktipfilterplugin.desktop %{_datadir}/services/ktlogviewerplugin.desktop %{_datadir}/services/ktpartfileimportplugin.desktop +%{_datadir}/services/ktrssfeedplugin.desktop %{_datadir}/services/ktsearchplugin.desktop %{_datadir}/services/ktupnpplugin.desktop %{_datadir}/servicetypes/ktorrentplugin.desktop +%{_datadir}/services/ktwebinterfaceplugin.desktop +%{_datadir}/services/ktzeroconfplugin.desktop %changelog +* Mon Feb 05 2007 Roland Wolters 2.1-3 +- Update to upstream version 2.1 + * Fri Oct 13 2006 Roland Wolters 2.0.3-4 - Update to upstream version 2.0.3 - added znow patch for ppc Index: sources =================================================================== RCS file: /cvs/extras/rpms/ktorrent/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 13 Oct 2006 17:28:38 -0000 1.6 +++ sources 5 Feb 2007 23:08:35 -0000 1.7 @@ -1 +1 @@ -f0297ab9ead77ee11f9f46cffa904b89 ktorrent-2.0.3.tar.gz +2e3c350fe02b68936a6f8f6460fae8f6 ktorrent-2.1.tar.gz From fedora-extras-commits at redhat.com Mon Feb 5 23:43:49 2007 From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat)) Date: Mon, 5 Feb 2007 18:43:49 -0500 Subject: rpms/ktorrent/FC-5 ktorrent.spec,1.12,1.13 Message-ID: <200702052343.l15NhnEj002135@cvs-int.fedora.redhat.com> Author: liquidat Update of /cvs/extras/rpms/ktorrent/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2116 Modified Files: ktorrent.spec Log Message: Added avahi-devel dependency Index: ktorrent.spec =================================================================== RCS file: /cvs/extras/rpms/ktorrent/FC-5/ktorrent.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ktorrent.spec 5 Feb 2007 23:08:35 -0000 1.12 +++ ktorrent.spec 5 Feb 2007 23:43:17 -0000 1.13 @@ -2,7 +2,7 @@ Name: ktorrent Version: 2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A BitTorrent program for KDE Group: Applications/Internet License: GPL @@ -10,7 +10,7 @@ Source0: http://ktorrent.org/downloads/2.1/ktorrent-2.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: qt-devel kdelibs-devel desktop-file-utils gettext gmp-devel +BuildRequires: qt-devel kdelibs-devel desktop-file-utils gettext gmp-devel avahi-devel Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -125,6 +125,9 @@ %{_datadir}/services/ktzeroconfplugin.desktop %changelog +* Tue Feb 06 2007 Roland Wolters 2.1-4 +- added avahi-devel dependecy + * Mon Feb 05 2007 Roland Wolters 2.1-3 - Update to upstream version 2.1 From fedora-extras-commits at redhat.com Mon Feb 5 23:45:16 2007 From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat)) Date: Mon, 5 Feb 2007 18:45:16 -0500 Subject: rpms/ktorrent/FC-6 ktorrent.spec,1.18,1.19 Message-ID: <200702052345.l15NjGWr002201@cvs-int.fedora.redhat.com> Author: liquidat Update of /cvs/extras/rpms/ktorrent/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2180 Modified Files: ktorrent.spec Log Message: Added avahi-devel dependency Index: ktorrent.spec =================================================================== RCS file: /cvs/extras/rpms/ktorrent/FC-6/ktorrent.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- ktorrent.spec 5 Feb 2007 23:06:50 -0000 1.18 +++ ktorrent.spec 5 Feb 2007 23:44:44 -0000 1.19 @@ -2,7 +2,7 @@ Name: ktorrent Version: 2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A BitTorrent program for KDE Group: Applications/Internet License: GPL @@ -10,7 +10,7 @@ Source0: http://ktorrent.org/downloads/2.1/ktorrent-2.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: qt-devel kdelibs-devel desktop-file-utils gettext gmp-devel +BuildRequires: qt-devel kdelibs-devel desktop-file-utils gettext gmp-devel avahi-devel Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -125,6 +125,9 @@ %{_datadir}/services/ktzeroconfplugin.desktop %changelog +* Tue Feb 06 2007 Roland Wolters 2.1-4 +- added avahi-devel dependecy + * Mon Feb 05 2007 Roland Wolters 2.1-3 - Update to upstream version 2.1 From fedora-extras-commits at redhat.com Mon Feb 5 23:48:32 2007 From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat)) Date: Mon, 5 Feb 2007 18:48:32 -0500 Subject: rpms/ktorrent/devel ktorrent.spec,1.21,1.22 Message-ID: <200702052348.l15NmWZ1002283@cvs-int.fedora.redhat.com> Author: liquidat Update of /cvs/extras/rpms/ktorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2257 Modified Files: ktorrent.spec Log Message: Added avahi-devel dependency Index: ktorrent.spec =================================================================== RCS file: /cvs/extras/rpms/ktorrent/devel/ktorrent.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- ktorrent.spec 5 Feb 2007 22:43:50 -0000 1.21 +++ ktorrent.spec 5 Feb 2007 23:48:00 -0000 1.22 @@ -2,7 +2,7 @@ Name: ktorrent Version: 2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A BitTorrent program for KDE Group: Applications/Internet License: GPL @@ -10,7 +10,7 @@ Source0: http://ktorrent.org/downloads/2.1/ktorrent-2.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: qt-devel kdelibs-devel desktop-file-utils gettext gmp-devel +BuildRequires: qt-devel kdelibs-devel desktop-file-utils gettext gmp-devel avahi-devel Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -125,6 +125,9 @@ %{_datadir}/services/ktzeroconfplugin.desktop %changelog +* Tue Feb 06 2007 Roland Wolters 2.1-4 +- added avahi-devel dependecy + * Mon Feb 05 2007 Roland Wolters 2.1-3 - Update to upstream version 2.1 From fedora-extras-commits at redhat.com Tue Feb 6 00:06:10 2007 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Mon, 5 Feb 2007 19:06:10 -0500 Subject: fedora-release fedora-release.spec,1.35,1.36 Message-ID: <200702060006.l1606Avb005841@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/fedora/fedora-release In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5824 Modified Files: fedora-release.spec Log Message: drop the legacy repo, get changes jeremy made Index: fedora-release.spec =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- fedora-release.spec 16 Oct 2006 14:27:55 -0000 1.35 +++ fedora-release.spec 6 Feb 2007 00:06:08 -0000 1.36 @@ -1,31 +1,31 @@ %define release_name Rawhide -Summary: Fedora Core release files +Summary: Fedora release files Name: fedora-release -Version: 6 -Release: 89 +Version: 6.90 +Release: 3 License: GFDL Group: System Environment/Base URL: http://fedoraproject.org -Source: fedora-release-%{version}.tar.gz +Source: fedora-release-6.tar.gz Obsoletes: redhat-release Provides: redhat-release -Requires: fedora-release-notes >= %{version} +Requires: fedora-release-notes >= 6 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %description -Fedora Core release files +Fedora release files %prep -%setup -q -n fedora-release-%{version} +%setup -q -n fedora-release-6 %build %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/etc -echo "Fedora Core release %{version} (%{release_name})" > $RPM_BUILD_ROOT/etc/fedora-release +echo "Fedora release %{version} (%{release_name})" > $RPM_BUILD_ROOT/etc/fedora-release cp $RPM_BUILD_ROOT/etc/fedora-release $RPM_BUILD_ROOT/etc/issue echo "Kernel \r on an \m" >> $RPM_BUILD_ROOT/etc/issue cp $RPM_BUILD_ROOT/etc/issue $RPM_BUILD_ROOT/etc/issue.net @@ -63,6 +63,15 @@ /etc/pki/rpm-gpg/* %changelog +* Mon Feb 05 2007 Jesse Keating - 6.90-3 +- Drop the legacy repo file. + +* Fri Jan 26 2007 Jesse Keating - 6.90-2 +- Core? What Core? + +* Wed Jan 24 2007 Jeremy Katz - 6.90-1 +- Bump to 6.90. Keep working with older release notes + * Mon Oct 16 2006 Jesse Keating - 6-89 - Keep version 6, bump release. Saves from having to rebuild release notes all the time From fedora-extras-commits at redhat.com Tue Feb 6 02:50:49 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos)) Date: Mon, 5 Feb 2007 21:50:49 -0500 Subject: rpms/python-amara/devel python-amara.spec,1.17,1.18 Message-ID: <200702060250.l162onts013183@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/python-amara/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13164 Modified Files: python-amara.spec Log Message: * Tue Feb 6 2007 Jos?? Matos - 1.1.9-7 - BR python-setuptools. Index: python-amara.spec =================================================================== RCS file: /cvs/extras/rpms/python-amara/devel/python-amara.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- python-amara.spec 5 Feb 2007 21:23:02 -0000 1.17 +++ python-amara.spec 6 Feb 2007 02:50:17 -0000 1.18 @@ -3,7 +3,7 @@ Name: python-amara Version: 1.1.9 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A collection of Pythonic tools for XML data binding Group: Development/Libraries @@ -15,6 +15,7 @@ # Needs python-4Suite-XML >= 1.0b2 BuildRequires: python-devel BuildRequires: python-4Suite-XML +BuildRequires: python-setuptools Requires: python-4Suite-XML BuildArch: noarch @@ -51,6 +52,9 @@ %doc CHANGES COPYING demo docs README TODO %changelog +* Tue Feb 6 2007 Jos?? Matos - 1.1.9-7 +- BR python-setuptools. + * Mon Feb 5 2007 Jos?? Matos - 1.1.9-6 - Add egg-info. From fedora-extras-commits at redhat.com Tue Feb 6 03:05:37 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos)) Date: Mon, 5 Feb 2007 22:05:37 -0500 Subject: rpms/python-amara/FC-6 .cvsignore, 1.4, 1.5 python-amara.spec, 1.12, 1.13 sources, 1.4, 1.5 python-amara-1.1.7-version.patch, 1.1, NONE Message-ID: <200702060305.l1635bTG017108@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/python-amara/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17082 Modified Files: .cvsignore python-amara.spec sources Removed Files: python-amara-1.1.7-version.patch Log Message: * Tue Feb 6 2007 Jos?? Matos - 1.1.9-7 - BR python-setuptools. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-amara/FC-6/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Feb 2006 07:20:43 -0000 1.4 +++ .cvsignore 6 Feb 2007 03:05:05 -0000 1.5 @@ -1 +1 @@ -Amara-1.1.7.tar.bz2 +Amara-1.1.9.tar.bz2 Index: python-amara.spec =================================================================== RCS file: /cvs/extras/rpms/python-amara/FC-6/python-amara.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- python-amara.spec 11 Sep 2006 18:34:55 -0000 1.12 +++ python-amara.spec 6 Feb 2007 03:05:05 -0000 1.13 @@ -1,21 +1,21 @@ -%{!?pyver: %define pyver %(%{__python} -c 'import sys;print(sys.version[0:3])')} -%{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-amara -Version: 1.1.7 -Release: 2%{?dist} +Version: 1.1.9 +Release: 7%{?dist} Summary: A collection of Pythonic tools for XML data binding Group: Development/Libraries License: ASL-derived URL: http://uche.ogbuji.net/uche.ogbuji.net/tech/4Suite/amara/ Source0: http://uche.ogbuji.net/tech/4Suite/etc/Amara-%{version}.tar.bz2 -Patch: python-amara-1.1.7-version.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Needs python-4Suite-XML >= 1.0b2 -BuildRequires: python +BuildRequires: python-devel BuildRequires: python-4Suite-XML +BuildRequires: python-setuptools Requires: python-4Suite-XML BuildArch: noarch @@ -31,14 +31,13 @@ %prep %setup -q -n Amara-%{version} -%patch -p 1 -b .version %build %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install -O1 --skip-build --prefix=$RPM_BUILD_ROOT%{_prefix} +%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT @@ -47,11 +46,33 @@ %defattr(-,root,root,-) %{_bindir}/* %dir %{python_sitelib}/amara -%{python_sitelib}/amara/*.py -%{python_sitelib}/amara/*.py[co] -%doc CHANGES COPYING demo manual.html README TODO +%{python_sitelib}/amara/*.py* +%{python_sitearch}/Amara-*.egg-info + +%doc CHANGES COPYING demo docs README TODO %changelog +* Tue Feb 6 2007 Jos?? Matos - 1.1.9-7 +- BR python-setuptools. + +* Mon Feb 5 2007 Jos?? Matos - 1.1.9-6 +- Add egg-info. + +* Mon Feb 5 2007 Jos?? Matos - 1.1.9-5 +- Clean spec file. + +* Tue Dec 12 2006 Jos?? Matos - 1.1.9-4 +- Respin (part II). + +* Tue Dec 12 2006 Jos?? Matos - 1.1.9-3 +- Respin. + +* Tue Dec 12 2006 Jos?? Matos - 1.1.9-2 +- Rebuild for python 2.5. + +* Tue Sep 19 2006 Jos?? Matos - 1.1.9-1 +- New upstream release. + * Mon Sep 11 2006 Jos?? Matos - 1.1.7-2 - Rebuild for FC6. Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-amara/FC-6/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Feb 2006 07:20:43 -0000 1.4 +++ sources 6 Feb 2007 03:05:05 -0000 1.5 @@ -1 +1 @@ -12ae537e9c517a258194878e65c85672 Amara-1.1.7.tar.bz2 +4b3e74e3cb0af7427160f0a77705efae Amara-1.1.9.tar.bz2 --- python-amara-1.1.7-version.patch DELETED --- From fedora-extras-commits at redhat.com Tue Feb 6 03:07:06 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos)) Date: Mon, 5 Feb 2007 22:07:06 -0500 Subject: rpms/python-amara/FC-5 .cvsignore, 1.4, 1.5 python-amara.spec, 1.11, 1.12 sources, 1.4, 1.5 python-amara-1.1.7-version.patch, 1.1, NONE Message-ID: <200702060307.l16376fO017180@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/python-amara/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17159 Modified Files: .cvsignore python-amara.spec sources Removed Files: python-amara-1.1.7-version.patch Log Message: * Tue Feb 6 2007 Jos?? Matos - 1.1.9-7 - BR python-setuptools. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-amara/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Feb 2006 07:20:43 -0000 1.4 +++ .cvsignore 6 Feb 2007 03:06:34 -0000 1.5 @@ -1 +1 @@ -Amara-1.1.7.tar.bz2 +Amara-1.1.9.tar.bz2 Index: python-amara.spec =================================================================== RCS file: /cvs/extras/rpms/python-amara/FC-5/python-amara.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- python-amara.spec 13 Feb 2006 07:20:43 -0000 1.11 +++ python-amara.spec 6 Feb 2007 03:06:34 -0000 1.12 @@ -1,21 +1,22 @@ -%{!?pyver: %define pyver %(%{__python} -c 'import sys;print(sys.version[0:3])')} -%{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-amara -Version: 1.1.7 -Release: 1%{?dist} +Version: 1.1.9 +Release: 7%{?dist} Summary: A collection of Pythonic tools for XML data binding Group: Development/Libraries License: ASL-derived URL: http://uche.ogbuji.net/uche.ogbuji.net/tech/4Suite/amara/ Source0: http://uche.ogbuji.net/tech/4Suite/etc/Amara-%{version}.tar.bz2 -Patch: python-amara-1.1.7-version.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Needs python-4Suite-XML >= 1.0b2 -BuildRequires: python python-4Suite-XML -Requires: python-abi = %{pyver} python-4Suite-XML +BuildRequires: python-devel +BuildRequires: python-4Suite-XML +BuildRequires: python-setuptools +Requires: python-4Suite-XML BuildArch: noarch %description @@ -30,14 +31,13 @@ %prep %setup -q -n Amara-%{version} -%patch -p 1 -b .version %build %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install -O1 --skip-build --prefix=$RPM_BUILD_ROOT%{_prefix} +%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT @@ -46,12 +46,36 @@ %defattr(-,root,root,-) %{_bindir}/* %dir %{python_sitelib}/amara -%{python_sitelib}/amara/*.py -%{python_sitelib}/amara/*.pyc -%ghost %{python_sitelib}/amara/*.pyo -%doc CHANGES COPYING demo manual.html README TODO +%{python_sitelib}/amara/*.py* +%{python_sitearch}/Amara-*.egg-info + +%doc CHANGES COPYING demo docs README TODO %changelog +* Tue Feb 6 2007 Jos?? Matos - 1.1.9-7 +- BR python-setuptools. + +* Mon Feb 5 2007 Jos?? Matos - 1.1.9-6 +- Add egg-info. + +* Mon Feb 5 2007 Jos?? Matos - 1.1.9-5 +- Clean spec file. + +* Tue Dec 12 2006 Jos?? Matos - 1.1.9-4 +- Respin (part II). + +* Tue Dec 12 2006 Jos?? Matos - 1.1.9-3 +- Respin. + +* Tue Dec 12 2006 Jos?? Matos - 1.1.9-2 +- Rebuild for python 2.5. + +* Tue Sep 19 2006 Jos?? Matos - 1.1.9-1 +- New upstream release. + +* Mon Sep 11 2006 Jos?? Matos - 1.1.7-2 +- Rebuild for FC6. + * Mon Feb 13 2006 Ignacio Vazquez-Abrams 1.1.7-1 - Upstream update Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-amara/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Feb 2006 07:20:43 -0000 1.4 +++ sources 6 Feb 2007 03:06:34 -0000 1.5 @@ -1 +1 @@ -12ae537e9c517a258194878e65c85672 Amara-1.1.7.tar.bz2 +4b3e74e3cb0af7427160f0a77705efae Amara-1.1.9.tar.bz2 --- python-amara-1.1.7-version.patch DELETED --- From fedora-extras-commits at redhat.com Tue Feb 6 09:50:47 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 6 Feb 2007 04:50:47 -0500 Subject: rpms/csmash/devel csmash-0.6.6-configure.patch, 1.1, 1.2 csmash.spec, 1.14, 1.15 Message-ID: <200702060950.l169ol6s008731@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/csmash/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8698 Modified Files: csmash-0.6.6-configure.patch csmash.spec Log Message: Fix to use CFLAGS and don't re-run autotools (#227379, Ville Skytt??). csmash-0.6.6-configure.patch: Index: csmash-0.6.6-configure.patch =================================================================== RCS file: /cvs/extras/rpms/csmash/devel/csmash-0.6.6-configure.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- csmash-0.6.6-configure.patch 30 Aug 2006 12:29:03 -0000 1.1 +++ csmash-0.6.6-configure.patch 6 Feb 2007 09:50:15 -0000 1.2 @@ -7,7 +7,7 @@ -CFLAGS="-I $x_includes" -LDFLAGS="-L/usr/local/lib -L$x_libraries -L$libdir" -+CFLAGS="$x_includes" ++CFLAGS="$CFLAGS $x_includes" +LDFLAGS="-L$x_libraries -L$libdir" CXXFLAGS="$CFLAGS -Wall" @@ -21,7 +21,7 @@ -CFLAGS="-I $x_includes" -LDFLAGS="-L/usr/local/lib -L$x_libraries -L$libdir" -+CFLAGS="$x_includes" ++CFLAGS="$CFLAGS $x_includes" +LDFLAGS="-L$x_libraries -L$libdir" CXXFLAGS="$CFLAGS -Wall" Index: csmash.spec =================================================================== RCS file: /cvs/extras/rpms/csmash/devel/csmash.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- csmash.spec 30 Aug 2006 12:29:03 -0000 1.14 +++ csmash.spec 6 Feb 2007 09:50:15 -0000 1.15 @@ -1,7 +1,7 @@ Summary: 3D tabletennis game Name: csmash Version: 0.6.6 -Release: 13%{?dist} +Release: 14%{?dist} License: GPL Group: Amusements/Games URL: http://cannonsmash.sourceforge.net/ @@ -19,8 +19,6 @@ %else BuildRequires: xorg-x11-devel, Mesa-devel %endif -# Required because we patch configure -BuildRequires: autoconf, automake17 %description CannonSmash is a 3D tabletennis game. The goal of this project is to @@ -33,11 +31,14 @@ %setup %patch0 -p1 -b .64bit-gcc4 %patch1 -p1 -b .extraqualif +# Hack to not have to re-run autotools +touch -r configure.in configure.in.stamp %patch2 -p1 -b .configure +touch -r configure.in.stamp configure.in %build -%configure +%configure --disable-dependency-tracking %{__make} %{?_smp_mflags} @@ -79,6 +80,9 @@ %changelog +* Tue Feb 6 2007 Matthias Saou 0.6.6-14 +- Fix to use CFLAGS and don't re-run autotools (#227379, Ville Skytt??). + * Mon Aug 28 2006 Matthias Saou 0.6.6-13 - FC6 rebuild. - Remove gcc-c++ build requirement, it's a default. From fedora-extras-commits at redhat.com Tue Feb 6 09:54:19 2007 From: fedora-extras-commits at redhat.com (Bernard Johnson (bjohnson)) Date: Tue, 6 Feb 2007 04:54:19 -0500 Subject: rpms/libsieve/devel .cvsignore, 1.2, 1.3 libsieve.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200702060954.l169sJPr008779@cvs-int.fedora.redhat.com> Author: bjohnson Update of /cvs/extras/rpms/libsieve/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8753 Modified Files: .cvsignore libsieve.spec sources Log Message: update to 2.2.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libsieve/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 29 Jan 2007 19:19:31 -0000 1.2 +++ .cvsignore 6 Feb 2007 09:53:47 -0000 1.3 @@ -1 +1 @@ -libsieve-2.2.4.tar.gz +libsieve-2.2.5.tar.gz Index: libsieve.spec =================================================================== RCS file: /cvs/extras/rpms/libsieve/devel/libsieve.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libsieve.spec 29 Jan 2007 19:19:31 -0000 1.1 +++ libsieve.spec 6 Feb 2007 09:53:47 -0000 1.2 @@ -1,6 +1,6 @@ Name: libsieve -Version: 2.2.4 -Release: 2%{?dist}%{?repotag:.%{repotag}} +Version: 2.2.5 +Release: 1%{?dist}%{?repotag:.%{repotag}} Summary: A library for parsing, sorting and filtering your mail Group: System Environment/Libraries @@ -25,11 +25,6 @@ %build cd src -# CFLAGS are not properly passed, fix it -%{__sed} -i.cflags \ - -e 's|^\(CFLAGS = -Wall\)|\1 @CFLAGS@|' \ - `find . -name Makefile -or -name Makefile.in` - %configure make %{?_smp_mflags} @@ -74,6 +69,10 @@ %{_includedir}/* %changelog +* Tue Feb 06 2007 Bernard Johnson - 2.2.5-1 +- 2.2.5 +- remove sed surgery since tarball is fixed to pass CFLAGS + * Mon Jan 29 2007 Bernard Johnson - 2.2.4-2 - add note regarding why license tag is GPL - sed surgery on Makefile.in files so that CFLAGS is passed properly Index: sources =================================================================== RCS file: /cvs/extras/rpms/libsieve/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 29 Jan 2007 19:19:31 -0000 1.2 +++ sources 6 Feb 2007 09:53:47 -0000 1.3 @@ -1 +1 @@ -20d68f1018b89879036c09f94f639ed8 libsieve-2.2.4.tar.gz +f0adbfa59254d07611d907f78aaa20cd libsieve-2.2.5.tar.gz From fedora-extras-commits at redhat.com Tue Feb 6 10:33:40 2007 From: fedora-extras-commits at redhat.com (Bernard Johnson (bjohnson)) Date: Tue, 6 Feb 2007 05:33:40 -0500 Subject: rpms/libsieve/FC-6 libsieve.spec,1.1,1.2 sources,1.2,1.3 Message-ID: <200702061033.l16AXejU012648@cvs-int.fedora.redhat.com> Author: bjohnson Update of /cvs/extras/rpms/libsieve/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12590 Modified Files: libsieve.spec sources Log Message: update to 2.2.5 Index: libsieve.spec =================================================================== RCS file: /cvs/extras/rpms/libsieve/FC-6/libsieve.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libsieve.spec 29 Jan 2007 19:19:31 -0000 1.1 +++ libsieve.spec 6 Feb 2007 10:33:08 -0000 1.2 @@ -1,6 +1,6 @@ Name: libsieve -Version: 2.2.4 -Release: 2%{?dist}%{?repotag:.%{repotag}} +Version: 2.2.5 +Release: 1%{?dist}%{?repotag:.%{repotag}} Summary: A library for parsing, sorting and filtering your mail Group: System Environment/Libraries @@ -25,11 +25,6 @@ %build cd src -# CFLAGS are not properly passed, fix it -%{__sed} -i.cflags \ - -e 's|^\(CFLAGS = -Wall\)|\1 @CFLAGS@|' \ - `find . -name Makefile -or -name Makefile.in` - %configure make %{?_smp_mflags} @@ -74,6 +69,10 @@ %{_includedir}/* %changelog +* Tue Feb 06 2007 Bernard Johnson - 2.2.5-1 +- 2.2.5 +- remove sed surgery since tarball is fixed to pass CFLAGS + * Mon Jan 29 2007 Bernard Johnson - 2.2.4-2 - add note regarding why license tag is GPL - sed surgery on Makefile.in files so that CFLAGS is passed properly Index: sources =================================================================== RCS file: /cvs/extras/rpms/libsieve/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 29 Jan 2007 19:19:31 -0000 1.2 +++ sources 6 Feb 2007 10:33:08 -0000 1.3 @@ -1 +1 @@ -20d68f1018b89879036c09f94f639ed8 libsieve-2.2.4.tar.gz +f0adbfa59254d07611d907f78aaa20cd libsieve-2.2.5.tar.gz From fedora-extras-commits at redhat.com Tue Feb 6 11:02:39 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 6 Feb 2007 06:02:39 -0500 Subject: rpms/proftpd/FC-5 proftpd-1.3.0a-ctrls-bug2867.patch, NONE, 1.1 proftpd.spec, 1.18, 1.19 Message-ID: <200702061102.l16B2d70016337@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/proftpd/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12926/FC-5 Modified Files: proftpd.spec Added Files: proftpd-1.3.0a-ctrls-bug2867.patch Log Message: Patch to fix local user buffer overflow in controls request handling (#219938). proftpd-1.3.0a-ctrls-bug2867.patch: --- NEW FILE proftpd-1.3.0a-ctrls-bug2867.patch --- --- src/ctrls.c 2006/10/24 16:13:31 1.14 +++ src/ctrls.c 2006/12/12 16:34:43 1.15 @@ -534,11 +534,20 @@ return -1; } + if (reqarglen >= sizeof(reqaction)) { + pr_signals_unblock(); + errno = ENOMEM; + return -1; + } + + memset(reqaction, '\0', sizeof(reqaction)); + if (read(cl->cl_fd, reqaction, reqarglen) < 0) { pr_signals_unblock(); return -1; } + reqaction[sizeof(reqaction)-1] = '\0'; nreqargs--; /* Find a matching action object, and use it to populate a ctrl object, @@ -657,17 +666,16 @@ return -1; } - memset(response, '\0', sizeof(response)); - /* Make sure resparglen is not too big */ - if (resparglen > sizeof(response)) { + if (resparglen >= sizeof(response)) { pr_signals_unblock(); errno = ENOMEM; return -1; } - bread = read(ctrls_sockfd, response, resparglen); + memset(response, '\0', sizeof(response)); + bread = read(ctrls_sockfd, response, resparglen); while (bread != resparglen) { if (bread < 0) { pr_signals_unblock(); Index: proftpd.spec =================================================================== RCS file: /cvs/extras/rpms/proftpd/FC-5/proftpd.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- proftpd.spec 29 Nov 2006 12:44:48 -0000 1.18 +++ proftpd.spec 6 Feb 2007 11:02:07 -0000 1.19 @@ -1,7 +1,7 @@ Summary: Flexible, stable and highly-configurable FTP server Name: proftpd Version: 1.3.0a -Release: 1%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Daemons URL: http://www.proftpd.org/ @@ -16,6 +16,7 @@ Patch1: proftpd-1.3.0-ctrls-restart.patch Patch2: proftpd-1.3.0-cmdbufsize.patch Patch3: proftpd-1.3.0-mod_tls.patch +Patch4: proftpd-1.3.0a-ctrls-bug2867.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: pam >= 0.59 Requires(post): /sbin/chkconfig @@ -70,6 +71,7 @@ %patch1 -p0 -b .ctrls-restart %patch2 -p1 -b .cmdbufsize %patch3 -p0 -b .mod_tls +%patch4 -p0 -b .ctrls-bug2867 %build @@ -190,6 +192,13 @@ %changelog +* Tue Feb 6 2007 Matthias Saou 1.3.0a-3 +- Patch to fix local user buffer overflow in controls request handling, rhbz + bug #219938, proftpd bug #2867. + +* Mon Dec 11 2006 Matthias Saou 1.3.0a-2 +- Rebuild against new PostgreSQL. + * Mon Nov 27 2006 Matthias Saou 1.3.0a-1 - Update to 1.3.0a, which actually fixes CVE-2006-5815... yes, #214820!). From fedora-extras-commits at redhat.com Tue Feb 6 11:02:42 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 6 Feb 2007 06:02:42 -0500 Subject: rpms/proftpd/FC-6 proftpd-1.3.0a-ctrls-bug2867.patch, NONE, 1.1 proftpd.spec, 1.21, 1.22 Message-ID: <200702061102.l16B2gPe016340@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/proftpd/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12926/FC-6 Modified Files: proftpd.spec Added Files: proftpd-1.3.0a-ctrls-bug2867.patch Log Message: Patch to fix local user buffer overflow in controls request handling (#219938). proftpd-1.3.0a-ctrls-bug2867.patch: --- NEW FILE proftpd-1.3.0a-ctrls-bug2867.patch --- --- src/ctrls.c 2006/10/24 16:13:31 1.14 +++ src/ctrls.c 2006/12/12 16:34:43 1.15 @@ -534,11 +534,20 @@ return -1; } + if (reqarglen >= sizeof(reqaction)) { + pr_signals_unblock(); + errno = ENOMEM; + return -1; + } + + memset(reqaction, '\0', sizeof(reqaction)); + if (read(cl->cl_fd, reqaction, reqarglen) < 0) { pr_signals_unblock(); return -1; } + reqaction[sizeof(reqaction)-1] = '\0'; nreqargs--; /* Find a matching action object, and use it to populate a ctrl object, @@ -657,17 +666,16 @@ return -1; } - memset(response, '\0', sizeof(response)); - /* Make sure resparglen is not too big */ - if (resparglen > sizeof(response)) { + if (resparglen >= sizeof(response)) { pr_signals_unblock(); errno = ENOMEM; return -1; } - bread = read(ctrls_sockfd, response, resparglen); + memset(response, '\0', sizeof(response)); + bread = read(ctrls_sockfd, response, resparglen); while (bread != resparglen) { if (bread < 0) { pr_signals_unblock(); Index: proftpd.spec =================================================================== RCS file: /cvs/extras/rpms/proftpd/FC-6/proftpd.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- proftpd.spec 29 Nov 2006 12:44:49 -0000 1.21 +++ proftpd.spec 6 Feb 2007 11:02:09 -0000 1.22 @@ -1,7 +1,7 @@ Summary: Flexible, stable and highly-configurable FTP server Name: proftpd Version: 1.3.0a -Release: 1%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Daemons URL: http://www.proftpd.org/ @@ -16,6 +16,7 @@ Patch1: proftpd-1.3.0-ctrls-restart.patch Patch2: proftpd-1.3.0-cmdbufsize.patch Patch3: proftpd-1.3.0-mod_tls.patch +Patch4: proftpd-1.3.0a-ctrls-bug2867.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: pam >= 0.59 Requires(post): /sbin/chkconfig @@ -70,6 +71,7 @@ %patch1 -p0 -b .ctrls-restart %patch2 -p1 -b .cmdbufsize %patch3 -p0 -b .mod_tls +%patch4 -p0 -b .ctrls-bug2867 %build @@ -190,6 +192,13 @@ %changelog +* Tue Feb 6 2007 Matthias Saou 1.3.0a-3 +- Patch to fix local user buffer overflow in controls request handling, rhbz + bug #219938, proftpd bug #2867. + +* Mon Dec 11 2006 Matthias Saou 1.3.0a-2 +- Rebuild against new PostgreSQL. + * Mon Nov 27 2006 Matthias Saou 1.3.0a-1 - Update to 1.3.0a, which actually fixes CVE-2006-5815... yes, #214820!). From fedora-extras-commits at redhat.com Tue Feb 6 11:02:44 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 6 Feb 2007 06:02:44 -0500 Subject: rpms/proftpd/devel proftpd-1.3.0a-ctrls-bug2867.patch, NONE, 1.1 proftpd.spec, 1.26, 1.27 Message-ID: <200702061102.l16B2iY7016343@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/proftpd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12926/devel Modified Files: proftpd.spec Added Files: proftpd-1.3.0a-ctrls-bug2867.patch Log Message: Patch to fix local user buffer overflow in controls request handling (#219938). proftpd-1.3.0a-ctrls-bug2867.patch: --- NEW FILE proftpd-1.3.0a-ctrls-bug2867.patch --- --- src/ctrls.c 2006/10/24 16:13:31 1.14 +++ src/ctrls.c 2006/12/12 16:34:43 1.15 @@ -534,11 +534,20 @@ return -1; } + if (reqarglen >= sizeof(reqaction)) { + pr_signals_unblock(); + errno = ENOMEM; + return -1; + } + + memset(reqaction, '\0', sizeof(reqaction)); + if (read(cl->cl_fd, reqaction, reqarglen) < 0) { pr_signals_unblock(); return -1; } + reqaction[sizeof(reqaction)-1] = '\0'; nreqargs--; /* Find a matching action object, and use it to populate a ctrl object, @@ -657,17 +666,16 @@ return -1; } - memset(response, '\0', sizeof(response)); - /* Make sure resparglen is not too big */ - if (resparglen > sizeof(response)) { + if (resparglen >= sizeof(response)) { pr_signals_unblock(); errno = ENOMEM; return -1; } - bread = read(ctrls_sockfd, response, resparglen); + memset(response, '\0', sizeof(response)); + bread = read(ctrls_sockfd, response, resparglen); while (bread != resparglen) { if (bread < 0) { pr_signals_unblock(); Index: proftpd.spec =================================================================== RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- proftpd.spec 11 Dec 2006 10:35:30 -0000 1.26 +++ proftpd.spec 6 Feb 2007 11:02:12 -0000 1.27 @@ -1,7 +1,7 @@ Summary: Flexible, stable and highly-configurable FTP server Name: proftpd Version: 1.3.0a -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Daemons URL: http://www.proftpd.org/ @@ -16,6 +16,7 @@ Patch1: proftpd-1.3.0-ctrls-restart.patch Patch2: proftpd-1.3.0-cmdbufsize.patch Patch3: proftpd-1.3.0-mod_tls.patch +Patch4: proftpd-1.3.0a-ctrls-bug2867.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: pam >= 0.59 Requires(post): /sbin/chkconfig @@ -70,6 +71,7 @@ %patch1 -p0 -b .ctrls-restart %patch2 -p1 -b .cmdbufsize %patch3 -p0 -b .mod_tls +%patch4 -p0 -b .ctrls-bug2867 %build @@ -190,6 +192,10 @@ %changelog +* Tue Feb 6 2007 Matthias Saou 1.3.0a-3 +- Patch to fix local user buffer overflow in controls request handling, rhbz + bug #219938, proftpd bug #2867. + * Mon Dec 11 2006 Matthias Saou 1.3.0a-2 - Rebuild against new PostgreSQL. From fedora-extras-commits at redhat.com Tue Feb 6 11:07:23 2007 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Tue, 6 Feb 2007 06:07:23 -0500 Subject: rpms/yum-utils/FC-6 sources,1.7,1.8 yum-utils.spec,1.14,1.15 Message-ID: <200702061107.l16B7Ngg016552@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yum-utils/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16514/FC-6 Modified Files: sources yum-utils.spec Log Message: yum-utils release 1.0.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/yum-utils/FC-6/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 31 Oct 2006 14:33:08 -0000 1.7 +++ sources 6 Feb 2007 11:06:51 -0000 1.8 @@ -1,2 +1 @@ -e9af7d38f47e5d2cd945790061fa5f8b yum-utils-1.0.tar.gz -53ba387a337b605c5490eac8229da32d yum-utils-1.0.1.tar.gz +3d63ecea2d0472ca2e1d893e7b5bfb78 yum-utils-1.0.2.tar.gz Index: yum-utils.spec =================================================================== RCS file: /cvs/extras/rpms/yum-utils/FC-6/yum-utils.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- yum-utils.spec 31 Oct 2006 14:33:08 -0000 1.14 +++ yum-utils.spec 6 Feb 2007 11:06:51 -0000 1.15 @@ -1,7 +1,7 @@ Summary: Utilities based around the yum package manager Name: yum-utils -Version: 1.0.1 -Release: 1%{?dist} +Version: 1.0.2 +Release: 1 License: GPL Group: Development/Tools Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz @@ -157,7 +157,7 @@ %preun -n yum-updateonboot if [ $1 = 0 ]; then /sbin/service yum-updateonboot stop >/dev/null 2>&1 || :; - /sbin/chkconfig --del yum >/dev/null 2>&1 || :; + /sbin/chkconfig --del yum-updateonboot >/dev/null 2>&1 || :; fi %files @@ -240,6 +240,9 @@ %changelog +* Sun Dec 31 2006 Tim Lauridsen +- mark it as 1.0.2 + * Tue Oct 31 2006 Tim Lauridsen - mark it as 1.0.1 From fedora-extras-commits at redhat.com Tue Feb 6 11:07:25 2007 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Tue, 6 Feb 2007 06:07:25 -0500 Subject: rpms/yum-utils/devel .cvsignore, 1.6, 1.7 sources, 1.7, 1.8 yum-utils.spec, 1.14, 1.15 Message-ID: <200702061107.l16B7Piq016557@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yum-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16514/devel Modified Files: .cvsignore sources yum-utils.spec Log Message: yum-utils release 1.0.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yum-utils/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 5 Oct 2006 03:32:28 -0000 1.6 +++ .cvsignore 6 Feb 2007 11:06:53 -0000 1.7 @@ -1 +1 @@ -yum-utils-1.0.tar.gz +yum-utils-1.0.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yum-utils/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 31 Oct 2006 14:39:17 -0000 1.7 +++ sources 6 Feb 2007 11:06:53 -0000 1.8 @@ -1,2 +1 @@ -e9af7d38f47e5d2cd945790061fa5f8b yum-utils-1.0.tar.gz -53ba387a337b605c5490eac8229da32d yum-utils-1.0.1.tar.gz +3d63ecea2d0472ca2e1d893e7b5bfb78 yum-utils-1.0.2.tar.gz Index: yum-utils.spec =================================================================== RCS file: /cvs/extras/rpms/yum-utils/devel/yum-utils.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- yum-utils.spec 31 Oct 2006 14:39:17 -0000 1.14 +++ yum-utils.spec 6 Feb 2007 11:06:53 -0000 1.15 @@ -1,7 +1,7 @@ Summary: Utilities based around the yum package manager Name: yum-utils -Version: 1.0.1 -Release: 1%{?dist} +Version: 1.0.2 +Release: 1 License: GPL Group: Development/Tools Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz @@ -157,7 +157,7 @@ %preun -n yum-updateonboot if [ $1 = 0 ]; then /sbin/service yum-updateonboot stop >/dev/null 2>&1 || :; - /sbin/chkconfig --del yum >/dev/null 2>&1 || :; + /sbin/chkconfig --del yum-updateonboot >/dev/null 2>&1 || :; fi %files @@ -240,6 +240,9 @@ %changelog +* Sun Dec 31 2006 Tim Lauridsen +- mark it as 1.0.2 + * Tue Oct 31 2006 Tim Lauridsen - mark it as 1.0.1 From fedora-extras-commits at redhat.com Tue Feb 6 11:18:26 2007 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Tue, 6 Feb 2007 06:18:26 -0500 Subject: rpms/yum-utils/FC-6 yum-utils.spec,1.15,1.16 Message-ID: <200702061118.l16BIQdE016797@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yum-utils/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16765/FC-6 Modified Files: yum-utils.spec Log Message: Added dist tag and bumped release Index: yum-utils.spec =================================================================== RCS file: /cvs/extras/rpms/yum-utils/FC-6/yum-utils.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- yum-utils.spec 6 Feb 2007 11:06:51 -0000 1.15 +++ yum-utils.spec 6 Feb 2007 11:17:54 -0000 1.16 @@ -1,7 +1,7 @@ Summary: Utilities based around the yum package manager Name: yum-utils Version: 1.0.2 -Release: 1 +Release: 2%{?dist} License: GPL Group: Development/Tools Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz @@ -240,6 +240,10 @@ %changelog + +* Tue Feb 6 2007 Tim Lauridsen +- bumped release and added %%{dist} tag + * Sun Dec 31 2006 Tim Lauridsen - mark it as 1.0.2 From fedora-extras-commits at redhat.com Tue Feb 6 11:18:28 2007 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Tue, 6 Feb 2007 06:18:28 -0500 Subject: rpms/yum-utils/devel yum-utils.spec,1.15,1.16 Message-ID: <200702061118.l16BISHP016800@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yum-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16765/devel Modified Files: yum-utils.spec Log Message: Added dist tag and bumped release Index: yum-utils.spec =================================================================== RCS file: /cvs/extras/rpms/yum-utils/devel/yum-utils.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- yum-utils.spec 6 Feb 2007 11:06:53 -0000 1.15 +++ yum-utils.spec 6 Feb 2007 11:17:56 -0000 1.16 @@ -1,7 +1,7 @@ Summary: Utilities based around the yum package manager Name: yum-utils Version: 1.0.2 -Release: 1 +Release: 2%{?dist} License: GPL Group: Development/Tools Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz @@ -240,6 +240,10 @@ %changelog + +* Tue Feb 6 2007 Tim Lauridsen +- bumped release and added %%{dist} tag + * Sun Dec 31 2006 Tim Lauridsen - mark it as 1.0.2 From fedora-extras-commits at redhat.com Tue Feb 6 11:49:08 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos)) Date: Tue, 6 Feb 2007 06:49:08 -0500 Subject: rpms/tellico/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 tellico.spec, 1.6, 1.7 Message-ID: <200702061149.l16Bn8TJ017147@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/tellico/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17123 Modified Files: .cvsignore sources tellico.spec Log Message: * Tue Feb 6 2007 Jos?? Matos - 1.2.8-1 - New upstream version. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tellico/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 30 Jan 2007 17:51:41 -0000 1.4 +++ .cvsignore 6 Feb 2007 11:48:35 -0000 1.5 @@ -1 +1 @@ -tellico-1.2.7.tar.gz +tellico-1.2.8.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tellico/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 30 Jan 2007 17:51:41 -0000 1.4 +++ sources 6 Feb 2007 11:48:36 -0000 1.5 @@ -1 +1 @@ -51635d215ac43d8c90125cc24a28fe46 tellico-1.2.7.tar.gz +ac9be76e26edaf9f75cddb03ee4ed73b tellico-1.2.8.tar.gz Index: tellico.spec =================================================================== RCS file: /cvs/extras/rpms/tellico/devel/tellico.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- tellico.spec 5 Feb 2007 11:37:40 -0000 1.6 +++ tellico.spec 6 Feb 2007 11:48:36 -0000 1.7 @@ -1,6 +1,6 @@ Name: tellico -Version: 1.2.7 -Release: 3%{?dist} +Version: 1.2.8 +Release: 1%{?dist} Summary: A collection manager Group: Applications/Multimedia @@ -104,6 +104,9 @@ %changelog +* Tue Feb 6 2007 Jos?? Matos - 1.2.8-1 +- New upstream version. + * Mon Feb 5 2007 Jos?? Matos - 1.2.7-3 - Condicionalize the BR for tcp_wrappers, it has a proper devel file for Fedora >= 7. From fedora-extras-commits at redhat.com Tue Feb 6 11:57:50 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos)) Date: Tue, 6 Feb 2007 06:57:50 -0500 Subject: rpms/tellico/FC-6 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 tellico.spec, 1.3, 1.4 Message-ID: <200702061157.l16BvogK017263@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/tellico/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17242 Modified Files: .cvsignore sources tellico.spec Log Message: * Tue Feb 6 2007 Jos?? Matos - 1.2.8-1 - New upstream version. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tellico/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 4 Dec 2006 09:55:14 -0000 1.3 +++ .cvsignore 6 Feb 2007 11:57:18 -0000 1.4 @@ -1 +1 @@ -tellico-1.2.6.tar.gz +tellico-1.2.8.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tellico/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 4 Dec 2006 09:55:14 -0000 1.3 +++ sources 6 Feb 2007 11:57:18 -0000 1.4 @@ -1 +1 @@ -4cf5f6a1032a083a68635c819405884b tellico-1.2.6.tar.gz +ac9be76e26edaf9f75cddb03ee4ed73b tellico-1.2.8.tar.gz Index: tellico.spec =================================================================== RCS file: /cvs/extras/rpms/tellico/FC-6/tellico.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tellico.spec 4 Dec 2006 09:55:14 -0000 1.3 +++ tellico.spec 6 Feb 2007 11:57:18 -0000 1.4 @@ -1,5 +1,5 @@ Name: tellico -Version: 1.2.6 +Version: 1.2.8 Release: 1%{?dist} Summary: A collection manager @@ -24,6 +24,13 @@ BuildRequires: libart_lgpl-devel BuildRequires: taglib-devel BuildRequires: libyaz-devel + +%if "%fedora" < "7" +BuildRequires: tcp_wrappers +%else +BuildRequires: tcp_wrappers-devel +%endif + Requires: python %description @@ -97,6 +104,19 @@ %changelog +* Tue Feb 6 2007 Jos?? Matos - 1.2.8-1 +- New upstream version. + +* Mon Feb 5 2007 Jos?? Matos - 1.2.7-3 +- Condicionalize the BR for tcp_wrappers, it has a proper devel file + for Fedora >= 7. + +* Tue Jan 30 2007 Jos?? Matos - 1.2.7-2 +- BR tcp_wrappers. + +* Tue Jan 30 2007 Jos?? Matos - 1.2.7-1 +- New upstream version. + * Mon Dec 4 2006 Jos?? Matos - 1.2.6-1 - New upstream version. From fedora-extras-commits at redhat.com Tue Feb 6 11:59:07 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos)) Date: Tue, 6 Feb 2007 06:59:07 -0500 Subject: rpms/tellico/FC-5 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 tellico.spec, 1.2, 1.3 Message-ID: <200702061159.l16Bx7aD017346@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/tellico/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17316 Modified Files: .cvsignore sources tellico.spec Log Message: * Tue Feb 6 2007 Jos?? Matos - 1.2.8-1 - New upstream version. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tellico/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 4 Dec 2006 09:57:01 -0000 1.3 +++ .cvsignore 6 Feb 2007 11:58:35 -0000 1.4 @@ -1 +1 @@ -tellico-1.2.6.tar.gz +tellico-1.2.8.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tellico/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 4 Dec 2006 09:57:01 -0000 1.3 +++ sources 6 Feb 2007 11:58:35 -0000 1.4 @@ -1 +1 @@ -4cf5f6a1032a083a68635c819405884b tellico-1.2.6.tar.gz +ac9be76e26edaf9f75cddb03ee4ed73b tellico-1.2.8.tar.gz Index: tellico.spec =================================================================== RCS file: /cvs/extras/rpms/tellico/FC-5/tellico.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tellico.spec 4 Dec 2006 09:57:01 -0000 1.2 +++ tellico.spec 6 Feb 2007 11:58:35 -0000 1.3 @@ -1,5 +1,5 @@ Name: tellico -Version: 1.2.6 +Version: 1.2.8 Release: 1%{?dist} Summary: A collection manager @@ -24,6 +24,13 @@ BuildRequires: libart_lgpl-devel BuildRequires: taglib-devel BuildRequires: libyaz-devel + +%if "%fedora" < "7" +BuildRequires: tcp_wrappers +%else +BuildRequires: tcp_wrappers-devel +%endif + Requires: python %description @@ -97,6 +104,19 @@ %changelog +* Tue Feb 6 2007 Jos?? Matos - 1.2.8-1 +- New upstream version. + +* Mon Feb 5 2007 Jos?? Matos - 1.2.7-3 +- Condicionalize the BR for tcp_wrappers, it has a proper devel file + for Fedora >= 7. + +* Tue Jan 30 2007 Jos?? Matos - 1.2.7-2 +- BR tcp_wrappers. + +* Tue Jan 30 2007 Jos?? Matos - 1.2.7-1 +- New upstream version. + * Mon Dec 4 2006 Jos?? Matos - 1.2.6-1 - New upstream version. From fedora-extras-commits at redhat.com Tue Feb 6 12:03:36 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos)) Date: Tue, 6 Feb 2007 07:03:36 -0500 Subject: rpms/PyRTF/FC-5 PyRTF.spec,1.1,1.2 Message-ID: <200702061203.l16C3aub020748@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/PyRTF/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20729 Modified Files: PyRTF.spec Log Message: * Wed Sep 20 2006 Jos?? Matos - 0.45-2 - Rebuild for FC-6. - Unghost .pyo files. Index: PyRTF.spec =================================================================== RCS file: /cvs/extras/rpms/PyRTF/FC-5/PyRTF.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- PyRTF.spec 14 Jun 2005 01:33:51 -0000 1.1 +++ PyRTF.spec 6 Feb 2007 12:03:03 -0000 1.2 @@ -2,7 +2,7 @@ Name: PyRTF Version: 0.45 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Rich Text Format (RTF) Document Generation in Python Group: Development/Languages @@ -14,7 +14,6 @@ BuildRequires: python BuildRequires: sed >= 3.95 -Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") %description PyRTF is a pure python module for the efficient generation of rich text form @@ -46,9 +45,12 @@ %doc PKG-INFO %dir %{python_sitelib}/PyRTF %{python_sitelib}/PyRTF/*.py -%{python_sitelib}/PyRTF/*.pyc -%ghost %{python_sitelib}/PyRTF/*.pyo +%{python_sitelib}/PyRTF/*.py[co] %changelog +* Wed Sep 20 2006 Jos?? Matos - 0.45-2 +- Rebuild for FC-6. +- Unghost .pyo files. + * Mon Jun 13 2005 Michael A. Peters - 0.45-1 - uploaded package to cvs From fedora-extras-commits at redhat.com Tue Feb 6 13:20:52 2007 From: fedora-extras-commits at redhat.com (Robert Marcano (robmv)) Date: Tue, 6 Feb 2007 08:20:52 -0500 Subject: rpms/shorewall/devel .cvsignore, 1.23, 1.24 shorewall.spec, 1.30, 1.31 sources, 1.23, 1.24 Message-ID: <200702061320.l16DKqsp024840@cvs-int.fedora.redhat.com> Author: robmv Update of /cvs/extras/rpms/shorewall/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24814 Modified Files: .cvsignore shorewall.spec sources Log Message: Update to upstream 3.2.8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/shorewall/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 21 Dec 2006 11:19:47 -0000 1.23 +++ .cvsignore 6 Feb 2007 13:20:20 -0000 1.24 @@ -1 +1 @@ -shorewall-3.2.7.tar.bz2 +shorewall-3.2.8.tar.bz2 Index: shorewall.spec =================================================================== RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- shorewall.spec 21 Dec 2006 11:19:47 -0000 1.30 +++ shorewall.spec 6 Feb 2007 13:20:20 -0000 1.31 @@ -1,5 +1,5 @@ Name: shorewall -Version: 3.2.7 +Version: 3.2.8 Release: 1%{?dist} Summary: Iptables-based firewall for Linux systems @@ -84,6 +84,9 @@ %doc COPYING INSTALL changelog.txt releasenotes.txt README.txt Samples %changelog +* Tue Feb 06 2007 Robert Marcano - 3.2.8-1 +- Update to upstream 3.2.8 + * Thu Dec 21 2006 Robert Marcano - 3.2.7-1 - Update to upstream 3.2.7 Index: sources =================================================================== RCS file: /cvs/extras/rpms/shorewall/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 21 Dec 2006 11:19:47 -0000 1.23 +++ sources 6 Feb 2007 13:20:20 -0000 1.24 @@ -1 +1 @@ -c3800363e6cbf634794efedfa4aba35f shorewall-3.2.7.tar.bz2 +d9e354b3f2670ceb021eea51419ff0e9 shorewall-3.2.8.tar.bz2 From fedora-extras-commits at redhat.com Tue Feb 6 13:32:24 2007 From: fedora-extras-commits at redhat.com (Robert Marcano (robmv)) Date: Tue, 6 Feb 2007 08:32:24 -0500 Subject: rpms/shorewall/FC-6 .cvsignore, 1.23, 1.24 shorewall.spec, 1.30, 1.31 sources, 1.23, 1.24 Message-ID: <200702061332.l16DWOKV025032@cvs-int.fedora.redhat.com> Author: robmv Update of /cvs/extras/rpms/shorewall/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25005 Modified Files: .cvsignore shorewall.spec sources Log Message: Update to upstream 3.2.8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-6/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 21 Dec 2006 11:32:42 -0000 1.23 +++ .cvsignore 6 Feb 2007 13:31:52 -0000 1.24 @@ -1 +1 @@ -shorewall-3.2.7.tar.bz2 +shorewall-3.2.8.tar.bz2 Index: shorewall.spec =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-6/shorewall.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- shorewall.spec 21 Dec 2006 11:32:42 -0000 1.30 +++ shorewall.spec 6 Feb 2007 13:31:52 -0000 1.31 @@ -1,5 +1,5 @@ Name: shorewall -Version: 3.2.7 +Version: 3.2.8 Release: 1%{?dist} Summary: Iptables-based firewall for Linux systems @@ -84,6 +84,9 @@ %doc COPYING INSTALL changelog.txt releasenotes.txt README.txt Samples %changelog +* Tue Feb 06 2007 Robert Marcano - 3.2.8-1 +- Update to upstream 3.2.8 + * Thu Dec 21 2006 Robert Marcano - 3.2.7-1 - Update to upstream 3.2.7 Index: sources =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-6/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 21 Dec 2006 11:32:42 -0000 1.23 +++ sources 6 Feb 2007 13:31:52 -0000 1.24 @@ -1 +1 @@ -c3800363e6cbf634794efedfa4aba35f shorewall-3.2.7.tar.bz2 +d9e354b3f2670ceb021eea51419ff0e9 shorewall-3.2.8.tar.bz2 From fedora-extras-commits at redhat.com Tue Feb 6 13:41:43 2007 From: fedora-extras-commits at redhat.com (Robert Marcano (robmv)) Date: Tue, 6 Feb 2007 08:41:43 -0500 Subject: rpms/shorewall/FC-5 .cvsignore, 1.21, 1.22 shorewall.spec, 1.28, 1.29 sources, 1.21, 1.22 Message-ID: <200702061341.l16DfhNA025198@cvs-int.fedora.redhat.com> Author: robmv Update of /cvs/extras/rpms/shorewall/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25167 Modified Files: .cvsignore shorewall.spec sources Log Message: Update to upstream 3.2.8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-5/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 21 Dec 2006 11:34:27 -0000 1.21 +++ .cvsignore 6 Feb 2007 13:41:11 -0000 1.22 @@ -1 +1 @@ -shorewall-3.2.7.tar.bz2 +shorewall-3.2.8.tar.bz2 Index: shorewall.spec =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-5/shorewall.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- shorewall.spec 21 Dec 2006 11:34:27 -0000 1.28 +++ shorewall.spec 6 Feb 2007 13:41:11 -0000 1.29 @@ -1,5 +1,5 @@ Name: shorewall -Version: 3.2.7 +Version: 3.2.8 Release: 1%{?dist} Summary: Iptables-based firewall for Linux systems @@ -84,6 +84,9 @@ %doc COPYING INSTALL changelog.txt releasenotes.txt README.txt Samples %changelog +* Tue Feb 06 2007 Robert Marcano - 3.2.8-1 +- Update to upstream 3.2.8 + * Thu Dec 21 2006 Robert Marcano - 3.2.7-1 - Update to upstream 3.2.7 Index: sources =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-5/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 21 Dec 2006 11:34:27 -0000 1.21 +++ sources 6 Feb 2007 13:41:11 -0000 1.22 @@ -1 +1 @@ -c3800363e6cbf634794efedfa4aba35f shorewall-3.2.7.tar.bz2 +d9e354b3f2670ceb021eea51419ff0e9 shorewall-3.2.8.tar.bz2 From fedora-extras-commits at redhat.com Tue Feb 6 14:46:46 2007 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Tue, 6 Feb 2007 09:46:46 -0500 Subject: rpms/ladspa-swh-plugins/devel ladspa-swh-plugins.spec,1.3,1.4 Message-ID: <200702061446.l16Ekkpi029171@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/ladspa-swh-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29151 Modified Files: ladspa-swh-plugins.spec Log Message: BuildRequire libtool Index: ladspa-swh-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/ladspa-swh-plugins/devel/ladspa-swh-plugins.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ladspa-swh-plugins.spec 3 Feb 2007 21:46:14 -0000 1.3 +++ ladspa-swh-plugins.spec 6 Feb 2007 14:46:14 -0000 1.4 @@ -3,7 +3,7 @@ Summary: A set of audio plugins for LADSPA Name: ladspa-%{pkgname} Version: 0.4.15 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: Applications/Multimedia Source: http://plugin.org.uk/releases/0.4.15/swh-plugins-0.4.15.tar.gz @@ -12,7 +12,7 @@ URL: http://plugin.org.uk/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: fftw3-devel ladspa-devel libxml2-devel pkgconfig +BuildRequires: fftw3-devel ladspa-devel libxml2-devel pkgconfig libtool Obsoletes: %{pkgname} < 0.4.15-5 Provides: %{pkgname} = %{version}-%{release} @@ -45,6 +45,9 @@ %{_datadir}/ladspa/rdf/* %changelog +* Sat Feb 03 2007 Anthony Green 0.4.15-8 +- BuildRequire libtool. + * Sat Feb 03 2007 Anthony Green 0.4.15-7 - Remove SELinux bits and compile with fPIC instead. See bugzilla 225060 and %%patch1. From fedora-extras-commits at redhat.com Tue Feb 6 15:00:05 2007 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Tue, 6 Feb 2007 10:00:05 -0500 Subject: rpms/ladspa-swh-plugins/FC-6 ladspa-swh-plugins.spec,1.3,1.4 Message-ID: <200702061500.l16F05nY029292@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/ladspa-swh-plugins/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29272 Modified Files: ladspa-swh-plugins.spec Log Message: BuildRequire libtool. Index: ladspa-swh-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/ladspa-swh-plugins/FC-6/ladspa-swh-plugins.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ladspa-swh-plugins.spec 3 Feb 2007 21:47:50 -0000 1.3 +++ ladspa-swh-plugins.spec 6 Feb 2007 14:59:33 -0000 1.4 @@ -3,7 +3,7 @@ Summary: A set of audio plugins for LADSPA Name: ladspa-%{pkgname} Version: 0.4.15 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: Applications/Multimedia Source: http://plugin.org.uk/releases/0.4.15/swh-plugins-0.4.15.tar.gz @@ -12,7 +12,7 @@ URL: http://plugin.org.uk/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: fftw3-devel ladspa-devel libxml2-devel pkgconfig +BuildRequires: fftw3-devel ladspa-devel libxml2-devel pkgconfig libtool Obsoletes: %{pkgname} < 0.4.15-5 Provides: %{pkgname} = %{version}-%{release} @@ -45,6 +45,9 @@ %{_datadir}/ladspa/rdf/* %changelog +* Sat Feb 03 2007 Anthony Green 0.4.15-8 +- BuildRequire libtool. + * Sat Feb 03 2007 Anthony Green 0.4.15-7 - Remove SELinux bits and compile with fPIC instead. See bugzilla 225060 and %%patch1. From fedora-extras-commits at redhat.com Tue Feb 6 15:58:24 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Tue, 6 Feb 2007 10:58:24 -0500 Subject: rpms/beryl-manager/devel beryl-manager.spec, 1.8, 1.9 beryl-manager.desktop, 1.2, NONE Message-ID: <200702061558.l16FwOmM000876@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/beryl-manager/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv857 Modified Files: beryl-manager.spec Removed Files: beryl-manager.desktop Log Message: remove duplicate desktop file Index: beryl-manager.spec =================================================================== RCS file: /cvs/extras/rpms/beryl-manager/devel/beryl-manager.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- beryl-manager.spec 5 Feb 2007 15:10:11 -0000 1.8 +++ beryl-manager.spec 6 Feb 2007 15:57:51 -0000 1.9 @@ -3,12 +3,11 @@ License: GPL Group: User Interface/Desktops Version: 0.1.9999.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Beryl window decorator and theme management utility BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://releases.beryl-project.org/%{version}/%{name}-%{version}.tar.bz2 -Source1: beryl-manager.desktop Patch0: beryl-manager-0.1.4-pidof.patch # libdrm is not available on these arches @@ -46,9 +45,10 @@ %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -desktop-file-install --vendor fedora \ +desktop-file-install --vendor fedora --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category X-Fedora %{SOURCE1} + --add-category X-Fedora \ + $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop # Fix up xy_XY to just xy for lang in ar_AR gl_GL my_MY sk_SK tr_TR do @@ -85,6 +85,9 @@ %changelog +* Tue Feb 06 2007 Jarod Wilson 0.1.9999.1-2 +- Remove duplicate desktop file + * Mon Feb 05 2007 Jarod Wilson 0.1.9999.1-1 - beryl 0.1.9999.1 (aka 0.2.0-rc1) --- beryl-manager.desktop DELETED --- From fedora-extras-commits at redhat.com Tue Feb 6 15:59:48 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Tue, 6 Feb 2007 10:59:48 -0500 Subject: rpms/beryl-manager/FC-6 beryl-manager.spec, 1.8, 1.9 beryl-manager.desktop, 1.2, NONE Message-ID: <200702061559.l16FxmHR000951@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/beryl-manager/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv934 Modified Files: beryl-manager.spec Removed Files: beryl-manager.desktop Log Message: remove duplicate desktop file Index: beryl-manager.spec =================================================================== RCS file: /cvs/extras/rpms/beryl-manager/FC-6/beryl-manager.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- beryl-manager.spec 5 Feb 2007 16:17:46 -0000 1.8 +++ beryl-manager.spec 6 Feb 2007 15:59:16 -0000 1.9 @@ -3,12 +3,11 @@ License: GPL Group: User Interface/Desktops Version: 0.1.9999.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Beryl window decorator and theme management utility BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://releases.beryl-project.org/%{version}/%{name}-%{version}.tar.bz2 -Source1: beryl-manager.desktop Patch0: beryl-manager-0.1.4-pidof.patch # libdrm is not available on these arches @@ -46,9 +45,10 @@ %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -desktop-file-install --vendor fedora \ +desktop-file-install --vendor fedora --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category X-Fedora %{SOURCE1} + --add-category X-Fedora \ + $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop # Fix up xy_XY to just xy for lang in ar_AR gl_GL my_MY sk_SK tr_TR do @@ -85,6 +85,9 @@ %changelog +* Tue Feb 06 2007 Jarod Wilson 0.1.9999.1-2 +- Remove duplicate desktop file + * Mon Feb 05 2007 Jarod Wilson 0.1.9999.1-1 - beryl 0.1.9999.1 (aka 0.2.0-rc1) --- beryl-manager.desktop DELETED --- From fedora-extras-commits at redhat.com Tue Feb 6 16:11:01 2007 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Tue, 6 Feb 2007 11:11:01 -0500 Subject: rpms/nagios/devel nagios.spec,1.26,1.27 sources,1.10,1.11 Message-ID: <200702061611.l16GB1j4004435@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4410 Modified Files: nagios.spec sources Log Message: Upstream released new version Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- nagios.spec 30 Nov 2006 15:17:44 -0000 1.26 +++ nagios.spec 6 Feb 2007 16:10:29 -0000 1.27 @@ -1,5 +1,5 @@ Name: nagios -Version: 2.6 +Version: 2.7 Release: 1%{?dist} Summary: Host/service/network monitoring program @@ -161,6 +161,9 @@ %{_includedir}/%{name} %changelog +* Tue Feb 06 2007 Mike McGrath 2.7-1 +- Upstream released 2.7 + * Thu Nov 30 2006 Mike McGrath 2.6-1 - Upstream released 2.6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/nagios/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 30 Nov 2006 15:17:44 -0000 1.10 +++ sources 6 Feb 2007 16:10:29 -0000 1.11 @@ -1 +1 @@ -a032edba07bf389b803ce817e9406c02 nagios-2.6.tar.gz +d664d2785cdca3c5c8a3e84c033e8e6e nagios-2.7.tar.gz From fedora-extras-commits at redhat.com Tue Feb 6 16:19:49 2007 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Tue, 6 Feb 2007 11:19:49 -0500 Subject: rpms/highlight/devel highlight.spec,1.17,1.18 Message-ID: <200702061619.l16GJn91004518@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4499 Modified Files: highlight.spec Log Message: Fix rpmopt bug Index: highlight.spec =================================================================== RCS file: /cvs/extras/rpms/highlight/devel/highlight.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- highlight.spec 24 Oct 2006 17:29:10 -0000 1.17 +++ highlight.spec 6 Feb 2007 16:19:17 -0000 1.18 @@ -1,7 +1,7 @@ Name: highlight Summary: Universal source code to formatted text converter Version: 2.4.8 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Tools License: GPL @@ -9,7 +9,7 @@ URL: http://www.andre-simon.de/ Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz Patch1: highlight-2.4-makefile.patch -# Patch2: highlight-2.4-rpmoptflags.patch +Patch2: highlight-2.4-rpmoptflags.patch Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -24,7 +24,7 @@ %prep %setup -q %patch1 -p1 -# %patch2 -p1 +%patch2 -p1 -b .bak %build make %{?_smp_mflags} LDFLAGS= @@ -49,6 +49,9 @@ %doc ChangeLog AUTHORS README* COPYING TODO examples/ %changelog +* Tue Feb 6 2007 Jochen Schmitt 2.4.8-2 +- fir rpmopt bug (#227292) + * Mon Oct 23 2006 Jochen Schmitt 2.4.8-1 - New upstream release From fedora-extras-commits at redhat.com Tue Feb 6 16:30:10 2007 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Tue, 6 Feb 2007 11:30:10 -0500 Subject: rpms/highlight/FC-6 highlight.spec,1.18,1.19 Message-ID: <200702061630.l16GUAdw004642@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4606 Modified Files: highlight.spec Log Message: Fix rpmopt bug Index: highlight.spec =================================================================== RCS file: /cvs/extras/rpms/highlight/FC-6/highlight.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- highlight.spec 25 Oct 2006 14:40:13 -0000 1.18 +++ highlight.spec 6 Feb 2007 16:29:38 -0000 1.19 @@ -1,7 +1,7 @@ Name: highlight Summary: Universal source code to formatted text converter Version: 2.4.8 -Release: 1%{?dist}.1 +Release: 2%{?dist} Group: Development/Tools License: GPL @@ -9,7 +9,7 @@ URL: http://www.andre-simon.de/ Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz Patch1: highlight-2.4-makefile.patch -# Patch2: highlight-2.4-rpmoptflags.patch +Patch2: highlight-2.4-rpmoptflags.patch Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -24,7 +24,7 @@ %prep %setup -q %patch1 -p1 -# %patch2 -p1 +%patch2 -p1 -b .bak %build make %{?_smp_mflags} LDFLAGS= @@ -49,8 +49,8 @@ %doc ChangeLog AUTHORS README* COPYING TODO examples/ %changelog -* Wed Oct 25 2006 Jochen Schmitt 2.4.8-1.1 -- Rebuilt +* Tue Feb 6 2007 Jochen Schmitt 2.4.8-2 +- fir rpmopt bug (#227292) * Mon Oct 23 2006 Jochen Schmitt 2.4.8-1 - New upstream release From fedora-extras-commits at redhat.com Tue Feb 6 16:31:22 2007 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Tue, 6 Feb 2007 11:31:22 -0500 Subject: rpms/highlight/FC-5 highlight.spec,1.17,1.18 Message-ID: <200702061631.l16GVMkg004713@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4694 Modified Files: highlight.spec Log Message: Fix rpmopt bug Index: highlight.spec =================================================================== RCS file: /cvs/extras/rpms/highlight/FC-5/highlight.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- highlight.spec 25 Oct 2006 14:53:31 -0000 1.17 +++ highlight.spec 6 Feb 2007 16:30:50 -0000 1.18 @@ -1,7 +1,7 @@ Name: highlight Summary: Universal source code to formatted text converter Version: 2.4.8 -Release: 1%{?dist}.1 +Release: 2%{?dist} Group: Development/Tools License: GPL @@ -9,7 +9,7 @@ URL: http://www.andre-simon.de/ Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz Patch1: highlight-2.4-makefile.patch -# Patch2: highlight-2.4-rpmoptflags.patch +Patch2: highlight-2.4-rpmoptflags.patch Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -24,7 +24,7 @@ %prep %setup -q %patch1 -p1 -# %patch2 -p1 +%patch2 -p1 -b .bak %build make %{?_smp_mflags} LDFLAGS= @@ -49,8 +49,8 @@ %doc ChangeLog AUTHORS README* COPYING TODO examples/ %changelog -* Wed Oct 25 2006 Jochen Schmitt 2.4.8-1.1 -- Rebuilt +* Tue Feb 6 2007 Jochen Schmitt 2.4.8-2 +- fir rpmopt bug (#227292) * Mon Oct 23 2006 Jochen Schmitt 2.4.8-1 - New upstream release From fedora-extras-commits at redhat.com Tue Feb 6 16:42:47 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Tue, 6 Feb 2007 11:42:47 -0500 Subject: rpms/beryl-settings/devel beryl-settings.spec,1.7,1.8 Message-ID: <200702061642.l16GglhP004925@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/beryl-settings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4908 Modified Files: beryl-settings.spec Log Message: Get rid of duplicate desktop entries Index: beryl-settings.spec =================================================================== RCS file: /cvs/extras/rpms/beryl-settings/devel/beryl-settings.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- beryl-settings.spec 5 Feb 2007 16:47:03 -0000 1.7 +++ beryl-settings.spec 6 Feb 2007 16:42:14 -0000 1.8 @@ -3,7 +3,7 @@ License: GPL Group: User Interface/Desktops Version: 0.1.9999.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Beryl OpenGL window and compositing manager GUI config utility BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -76,13 +76,15 @@ make DESTDIR=$RPM_BUILD_ROOT install desktop-file-install --vendor fedora --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category X-Fedora %{name}.desktop + --add-category X-Fedora \ + $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop # beryl-settings-simple pushd beryl-settings-simple-%{version} make DESTDIR=$RPM_BUILD_ROOT install desktop-file-install --vendor fedora --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category X-Fedora %{name}-simple.desktop + --add-category X-Fedora \ + $RPM_BUILD_ROOT%{_datadir}/applications/%{name}-simple.desktop popd find $RPM_BUILD_ROOT -type f -name "*.a" -o -name "*.la" | xargs rm -f %find_lang %{name} @@ -129,6 +131,9 @@ %changelog +* Tue Feb 06 2007 Jarod Wilson 0.1.9999.1-3 +- Get rid of duplicate desktop entries + * Mon Feb 05 2007 Jarod Wilson 0.1.9999.1-2 - Fix pkg-config path so this actually builds - Reshuffle build section a bit From fedora-extras-commits at redhat.com Tue Feb 6 16:44:33 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Tue, 6 Feb 2007 11:44:33 -0500 Subject: rpms/beryl-settings/FC-6 beryl-settings.spec,1.7,1.8 Message-ID: <200702061644.l16GiXVG005004@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/beryl-settings/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4984 Modified Files: beryl-settings.spec Log Message: Get rid of duplicate desktop entries Index: beryl-settings.spec =================================================================== RCS file: /cvs/extras/rpms/beryl-settings/FC-6/beryl-settings.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- beryl-settings.spec 5 Feb 2007 16:48:44 -0000 1.7 +++ beryl-settings.spec 6 Feb 2007 16:44:00 -0000 1.8 @@ -3,7 +3,7 @@ License: GPL Group: User Interface/Desktops Version: 0.1.9999.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Beryl OpenGL window and compositing manager GUI config utility BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -76,13 +76,15 @@ make DESTDIR=$RPM_BUILD_ROOT install desktop-file-install --vendor fedora --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category X-Fedora %{name}.desktop + --add-category X-Fedora \ + $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop # beryl-settings-simple pushd beryl-settings-simple-%{version} make DESTDIR=$RPM_BUILD_ROOT install desktop-file-install --vendor fedora --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category X-Fedora %{name}-simple.desktop + --add-category X-Fedora \ + $RPM_BUILD_ROOT%{_datadir}/applications/%{name}-simple.desktop popd find $RPM_BUILD_ROOT -type f -name "*.a" -o -name "*.la" | xargs rm -f %find_lang %{name} @@ -129,6 +131,9 @@ %changelog +* Tue Feb 06 2007 Jarod Wilson 0.1.9999.1-3 +- Get rid of duplicate desktop entries + * Mon Feb 05 2007 Jarod Wilson 0.1.9999.1-2 - Fix pkg-config path so this actually builds - Reshuffle build section a bit From fedora-extras-commits at redhat.com Tue Feb 6 17:19:02 2007 From: fedora-extras-commits at redhat.com (Till Maas (till)) Date: Tue, 6 Feb 2007 12:19:02 -0500 Subject: rpms/optipng/devel .cvsignore, 1.2, 1.3 optipng.spec, 1.4, 1.5 sources, 1.2, 1.3 optipng-0.5.4-makefile-destdir.patch, 1.1, NONE optipngr.txt, 1.1, NONE Message-ID: <200702061719.l16HJ2XP008971@cvs-int.fedora.redhat.com> Author: till Update of /cvs/extras/rpms/optipng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8918 Modified Files: .cvsignore optipng.spec sources Removed Files: optipng-0.5.4-makefile-destdir.patch optipngr.txt Log Message: version bump Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/optipng/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Oct 2006 20:33:03 -0000 1.2 +++ .cvsignore 6 Feb 2007 17:18:30 -0000 1.3 @@ -1 +1 @@ -optipng-0.5.4.tar.gz +optipng-0.5.5.tar.gz Index: optipng.spec =================================================================== RCS file: /cvs/extras/rpms/optipng/devel/optipng.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- optipng.spec 29 Nov 2006 12:29:04 -0000 1.4 +++ optipng.spec 6 Feb 2007 17:18:30 -0000 1.5 @@ -1,15 +1,13 @@ Name: optipng -Version: 0.5.4 -Release: 4%{?dist} +Version: 0.5.5 +Release: 1%{?dist} Summary: A PNG optimizer and converter Group: Applications/Multimedia License: zlib/libpng URL: http://optipng.sourceforge.net/ Source0: http://surfnet.dl.sourceforge.net/sourceforge/optipng/optipng-%{version}.tar.gz -Patch0: optipng-0.5.4-makefile-destdir.patch Patch1: optipng-0.5.4-makefile-externlibs.patch -Patch2: http://www.icmc.usp.br/~naoliv/optipngr.txt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel libpng-devel @@ -23,9 +21,7 @@ %prep %setup -q -%patch0 -p1 %patch1 -p1 -%patch2 -p1 %define makefile gcc.mak @@ -55,31 +51,34 @@ %changelog -* Wed Nov 29 2006 Till Maas - 0.5.4-4 +* Tue Feb 06 2007 Till Maas - 0.5.5-1 +- Version bump + +* Wed Nov 29 2006 Till Maas - 0.5.4-4 - splitting makefile patches - make LDFLAGS=$RPM_OPT_FLAGS - Use own makefile define - Fixing 216784 with upstream patch -* Wed Oct 11 2006 Till Maas - 0.5.4-3 +* Wed Oct 11 2006 Till Maas - 0.5.4-3 - bumping release because of errors while importing to extras -* Tue Oct 10 2006 Till Maas - 0.5.4-2 +* Tue Oct 10 2006 Till Maas - 0.5.4-2 - shortening Summary -* Thu Sep 14 2006 Till Maas - 0.5.4-1 +* Thu Sep 14 2006 Till Maas - 0.5.4-1 - version bump - use system zlib and libpng - link without "-s" flag for non-empty debuginfo - use DESTDIR -* Fri Jul 28 2006 Till Maas - 0.5.3-1 +* Fri Jul 28 2006 Till Maas - 0.5.3-1 - version bump - Changed license tag back to zlib/libpng (#198616 rpmlint) - use $RPM_OPT_FLAGS instead of %%{optflags} -* Thu Jul 06 2006 Till Maas - 0.5.2-2 +* Thu Jul 06 2006 Till Maas - 0.5.2-2 - Changed license tag from zlib/libpng to zlib -* Tue Jul 04 2006 Till Maas - 0.5.2-1 +* Tue Jul 04 2006 Till Maas - 0.5.2-1 - Created from scratch for fedora extras Index: sources =================================================================== RCS file: /cvs/extras/rpms/optipng/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Oct 2006 20:33:03 -0000 1.2 +++ sources 6 Feb 2007 17:18:30 -0000 1.3 @@ -1 +1 @@ -8d989971e674a06b55e17fc5b70c41aa optipng-0.5.4.tar.gz +9dbc2bb39e39b6ab4ed0c705d8035bdf optipng-0.5.5.tar.gz --- optipng-0.5.4-makefile-destdir.patch DELETED --- --- optipngr.txt DELETED --- From fedora-extras-commits at redhat.com Tue Feb 6 17:19:12 2007 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Tue, 6 Feb 2007 12:19:12 -0500 Subject: rpms/nagios/devel nagios.spec,1.27,1.28 Message-ID: <200702061719.l16HJCuR008974@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8947 Modified Files: nagios.spec Log Message: release bump - something got borked Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- nagios.spec 6 Feb 2007 16:10:29 -0000 1.27 +++ nagios.spec 6 Feb 2007 17:18:40 -0000 1.28 @@ -1,6 +1,6 @@ Name: nagios Version: 2.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Host/service/network monitoring program Group: Applications/System @@ -161,7 +161,7 @@ %{_includedir}/%{name} %changelog -* Tue Feb 06 2007 Mike McGrath 2.7-1 +* Tue Feb 06 2007 Mike McGrath 2.7-2 - Upstream released 2.7 * Thu Nov 30 2006 Mike McGrath 2.6-1 From fedora-extras-commits at redhat.com Tue Feb 6 17:23:23 2007 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 6 Feb 2007 12:23:23 -0500 Subject: rpms/qemu/devel .cvsignore, 1.7, 1.8 qemu.spec, 1.23, 1.24 sources, 1.7, 1.8 qemu-0.8.2-kernheaders.patch, 1.1, NONE qemu-0.8.2-mb-nops.diff, 1.1, NONE qemu-0.8.2-target-sparc.patch, 1.1, NONE Message-ID: <200702061723.l16HNNUG009070@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9040 Modified Files: .cvsignore qemu.spec sources Removed Files: qemu-0.8.2-kernheaders.patch qemu-0.8.2-mb-nops.diff qemu-0.8.2-target-sparc.patch Log Message: 0.9.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qemu/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 23 Aug 2006 16:22:50 -0000 1.7 +++ .cvsignore 6 Feb 2007 17:22:51 -0000 1.8 @@ -1 +1 @@ -qemu-0.8.2.tar.gz +qemu-0.9.0.tar.gz Index: qemu.spec =================================================================== RCS file: /cvs/extras/rpms/qemu/devel/qemu.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- qemu.spec 31 Jan 2007 09:34:16 -0000 1.23 +++ qemu.spec 6 Feb 2007 17:22:51 -0000 1.24 @@ -7,8 +7,8 @@ Summary: QEMU is a FAST! processor emulator Name: qemu -Version: 0.8.2 -Release: 5%{?dist} +Version: 0.9.0 +Release: 1%{?dist} License: GPL/LGPL Group: Development/Tools URL: http://www.qemu.org/ @@ -16,9 +16,6 @@ Source1: qemu.init Patch0: qemu-0.7.0-build.patch Patch1: qemu-0.8.0-sdata.patch -Patch2: qemu-0.8.2-kernheaders.patch -Patch3: qemu-0.8.2-target-sparc.patch -Patch4: qemu-0.8.2-mb-nops.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel compat-gcc-%{gccver} zlib-devel which texi2html Requires(post): /sbin/chkconfig @@ -43,9 +40,6 @@ %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 %build ./configure \ @@ -86,7 +80,7 @@ %files %defattr(-,root,root) -%doc Changelog README README.distrib TODO +%doc Changelog README TODO %doc qemu-doc.html qemu-tech.html %doc COPYING COPYING.LIB LICENSE %config %{_sysconfdir}/rc.d/init.d/qemu @@ -95,6 +89,9 @@ %{_mandir}/man1/* %changelog +* Tue Feb 6 2007 David Woodhouse 0.9.0-1 +- Update to 0.9.0 + * Wed Jan 31 2007 David Woodhouse 0.8.2-5 - Include licences Index: sources =================================================================== RCS file: /cvs/extras/rpms/qemu/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 23 Aug 2006 16:22:50 -0000 1.7 +++ sources 6 Feb 2007 17:22:51 -0000 1.8 @@ -1 +1 @@ -5b3a89eb2f256a8a6f3bb07f7b3f1b07 qemu-0.8.2.tar.gz +ab11a03ba30cf4a70641f0f170473d69 qemu-0.9.0.tar.gz --- qemu-0.8.2-kernheaders.patch DELETED --- --- qemu-0.8.2-mb-nops.diff DELETED --- --- qemu-0.8.2-target-sparc.patch DELETED --- From fedora-extras-commits at redhat.com Tue Feb 6 17:25:02 2007 From: fedora-extras-commits at redhat.com (Till Maas (till)) Date: Tue, 6 Feb 2007 12:25:02 -0500 Subject: rpms/optipng/FC-6 .cvsignore, 1.2, 1.3 optipng.spec, 1.4, 1.5 sources, 1.2, 1.3 optipng-0.5.4-makefile-destdir.patch, 1.1, NONE optipngr.txt, 1.1, NONE Message-ID: <200702061725.l16HP2WI009126@cvs-int.fedora.redhat.com> Author: till Update of /cvs/extras/rpms/optipng/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9096 Modified Files: .cvsignore optipng.spec sources Removed Files: optipng-0.5.4-makefile-destdir.patch optipngr.txt Log Message: sync to devel Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/optipng/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Oct 2006 20:33:03 -0000 1.2 +++ .cvsignore 6 Feb 2007 17:24:30 -0000 1.3 @@ -1 +1 @@ -optipng-0.5.4.tar.gz +optipng-0.5.5.tar.gz Index: optipng.spec =================================================================== RCS file: /cvs/extras/rpms/optipng/FC-6/optipng.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- optipng.spec 29 Nov 2006 12:29:03 -0000 1.4 +++ optipng.spec 6 Feb 2007 17:24:30 -0000 1.5 @@ -1,15 +1,13 @@ Name: optipng -Version: 0.5.4 -Release: 4%{?dist} +Version: 0.5.5 +Release: 1%{?dist} Summary: A PNG optimizer and converter Group: Applications/Multimedia License: zlib/libpng URL: http://optipng.sourceforge.net/ Source0: http://surfnet.dl.sourceforge.net/sourceforge/optipng/optipng-%{version}.tar.gz -Patch0: optipng-0.5.4-makefile-destdir.patch Patch1: optipng-0.5.4-makefile-externlibs.patch -Patch2: http://www.icmc.usp.br/~naoliv/optipngr.txt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel libpng-devel @@ -23,9 +21,7 @@ %prep %setup -q -%patch0 -p1 %patch1 -p1 -%patch2 -p1 %define makefile gcc.mak @@ -55,31 +51,34 @@ %changelog -* Wed Nov 29 2006 Till Maas - 0.5.4-4 +* Tue Feb 06 2007 Till Maas - 0.5.5-1 +- Version bump + +* Wed Nov 29 2006 Till Maas - 0.5.4-4 - splitting makefile patches - make LDFLAGS=$RPM_OPT_FLAGS - Use own makefile define - Fixing 216784 with upstream patch -* Wed Oct 11 2006 Till Maas - 0.5.4-3 +* Wed Oct 11 2006 Till Maas - 0.5.4-3 - bumping release because of errors while importing to extras -* Tue Oct 10 2006 Till Maas - 0.5.4-2 +* Tue Oct 10 2006 Till Maas - 0.5.4-2 - shortening Summary -* Thu Sep 14 2006 Till Maas - 0.5.4-1 +* Thu Sep 14 2006 Till Maas - 0.5.4-1 - version bump - use system zlib and libpng - link without "-s" flag for non-empty debuginfo - use DESTDIR -* Fri Jul 28 2006 Till Maas - 0.5.3-1 +* Fri Jul 28 2006 Till Maas - 0.5.3-1 - version bump - Changed license tag back to zlib/libpng (#198616 rpmlint) - use $RPM_OPT_FLAGS instead of %%{optflags} -* Thu Jul 06 2006 Till Maas - 0.5.2-2 +* Thu Jul 06 2006 Till Maas - 0.5.2-2 - Changed license tag from zlib/libpng to zlib -* Tue Jul 04 2006 Till Maas - 0.5.2-1 +* Tue Jul 04 2006 Till Maas - 0.5.2-1 - Created from scratch for fedora extras Index: sources =================================================================== RCS file: /cvs/extras/rpms/optipng/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Oct 2006 20:33:03 -0000 1.2 +++ sources 6 Feb 2007 17:24:30 -0000 1.3 @@ -1 +1 @@ -8d989971e674a06b55e17fc5b70c41aa optipng-0.5.4.tar.gz +9dbc2bb39e39b6ab4ed0c705d8035bdf optipng-0.5.5.tar.gz --- optipng-0.5.4-makefile-destdir.patch DELETED --- --- optipngr.txt DELETED --- From fedora-extras-commits at redhat.com Tue Feb 6 17:33:04 2007 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Tue, 6 Feb 2007 12:33:04 -0500 Subject: rpms/nagios/EL-4 nagios.spec,1.12,1.13 sources,1.7,1.8 Message-ID: <200702061733.l16HX4ZK009366@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9296/EL-4 Modified Files: nagios.spec sources Log Message: Upstream released a different version Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/EL-4/nagios.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- nagios.spec 30 Nov 2006 15:17:38 -0000 1.12 +++ nagios.spec 6 Feb 2007 17:32:32 -0000 1.13 @@ -1,6 +1,6 @@ Name: nagios -Version: 2.6 -Release: 1%{?dist} +Version: 2.7 +Release: 2%{?dist} Summary: Host/service/network monitoring program Group: Applications/System @@ -161,6 +161,9 @@ %{_includedir}/%{name} %changelog +* Tue Feb 06 2007 Mike McGrath 2.7-2 +- Upstream released 2.7 + * Thu Nov 30 2006 Mike McGrath 2.6-1 - Upstream released 2.6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/nagios/EL-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 30 Nov 2006 15:17:38 -0000 1.7 +++ sources 6 Feb 2007 17:32:32 -0000 1.8 @@ -1 +1 @@ -a032edba07bf389b803ce817e9406c02 nagios-2.6.tar.gz +d664d2785cdca3c5c8a3e84c033e8e6e nagios-2.7.tar.gz From fedora-extras-commits at redhat.com Tue Feb 6 17:33:06 2007 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Tue, 6 Feb 2007 12:33:06 -0500 Subject: rpms/nagios/EL-5 nagios.spec,1.26,1.27 sources,1.10,1.11 Message-ID: <200702061733.l16HX6eR009370@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9296/EL-5 Modified Files: nagios.spec sources Log Message: Upstream released a different version Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/EL-5/nagios.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- nagios.spec 30 Nov 2006 15:17:44 -0000 1.26 +++ nagios.spec 6 Feb 2007 17:32:34 -0000 1.27 @@ -1,6 +1,6 @@ Name: nagios -Version: 2.6 -Release: 1%{?dist} +Version: 2.7 +Release: 2%{?dist} Summary: Host/service/network monitoring program Group: Applications/System @@ -161,6 +161,9 @@ %{_includedir}/%{name} %changelog +* Tue Feb 06 2007 Mike McGrath 2.7-2 +- Upstream released 2.7 + * Thu Nov 30 2006 Mike McGrath 2.6-1 - Upstream released 2.6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/nagios/EL-5/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 30 Nov 2006 15:17:44 -0000 1.10 +++ sources 6 Feb 2007 17:32:34 -0000 1.11 @@ -1 +1 @@ -a032edba07bf389b803ce817e9406c02 nagios-2.6.tar.gz +d664d2785cdca3c5c8a3e84c033e8e6e nagios-2.7.tar.gz From fedora-extras-commits at redhat.com Tue Feb 6 17:33:09 2007 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Tue, 6 Feb 2007 12:33:09 -0500 Subject: rpms/nagios/FC-5 nagios.spec,1.19,1.20 sources,1.9,1.10 Message-ID: <200702061733.l16HX9rX009374@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9296/FC-5 Modified Files: nagios.spec sources Log Message: Upstream released a different version Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-5/nagios.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- nagios.spec 30 Nov 2006 15:17:43 -0000 1.19 +++ nagios.spec 6 Feb 2007 17:32:36 -0000 1.20 @@ -1,6 +1,6 @@ Name: nagios -Version: 2.6 -Release: 1%{?dist} +Version: 2.7 +Release: 2%{?dist} Summary: Host/service/network monitoring program Group: Applications/System @@ -161,6 +161,9 @@ %{_includedir}/%{name} %changelog +* Tue Feb 06 2007 Mike McGrath 2.7-2 +- Upstream released 2.7 + * Thu Nov 30 2006 Mike McGrath 2.6-1 - Upstream released 2.6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-5/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 30 Nov 2006 15:17:43 -0000 1.9 +++ sources 6 Feb 2007 17:32:36 -0000 1.10 @@ -1 +1 @@ -a032edba07bf389b803ce817e9406c02 nagios-2.6.tar.gz +d664d2785cdca3c5c8a3e84c033e8e6e nagios-2.7.tar.gz From fedora-extras-commits at redhat.com Tue Feb 6 17:33:11 2007 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Tue, 6 Feb 2007 12:33:11 -0500 Subject: rpms/nagios/FC-6 nagios.spec,1.26,1.27 sources,1.10,1.11 Message-ID: <200702061733.l16HXBZr009378@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9296/FC-6 Modified Files: nagios.spec sources Log Message: Upstream released a different version Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-6/nagios.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- nagios.spec 30 Nov 2006 15:17:44 -0000 1.26 +++ nagios.spec 6 Feb 2007 17:32:39 -0000 1.27 @@ -1,6 +1,6 @@ Name: nagios -Version: 2.6 -Release: 1%{?dist} +Version: 2.7 +Release: 2%{?dist} Summary: Host/service/network monitoring program Group: Applications/System @@ -161,6 +161,9 @@ %{_includedir}/%{name} %changelog +* Tue Feb 06 2007 Mike McGrath 2.7-2 +- Upstream released 2.7 + * Thu Nov 30 2006 Mike McGrath 2.6-1 - Upstream released 2.6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-6/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 30 Nov 2006 15:17:44 -0000 1.10 +++ sources 6 Feb 2007 17:32:39 -0000 1.11 @@ -1 +1 @@ -a032edba07bf389b803ce817e9406c02 nagios-2.6.tar.gz +d664d2785cdca3c5c8a3e84c033e8e6e nagios-2.7.tar.gz From fedora-extras-commits at redhat.com Tue Feb 6 17:37:25 2007 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 6 Feb 2007 12:37:25 -0500 Subject: rpms/em8300-kmod/devel em8300-0.16.0-2.6.20.patch, NONE, 1.1 em8300-kmod.spec, 1.13, 1.14 Message-ID: <200702061737.l16HbPcc009476@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/em8300-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9450 Modified Files: em8300-kmod.spec Added Files: em8300-0.16.0-2.6.20.patch Log Message: * Tue Feb 6 2007 Ville Skytt?? - 0.16.0-6 - Patch for kernel 2.6.20 (David van Vyfeyken), build for 2.6.20-1.2922.fc7. em8300-0.16.0-2.6.20.patch: --- NEW FILE em8300-0.16.0-2.6.20.patch --- http://thread.gmane.org/gmane.linux.drivers.dxr3.devel/1817 diff -urN em8300-CVS-orig/modules/em8300_i2c.c em8300-CVS/modules/em8300_i2c.c --- em8300-CVS-orig/modules/em8300_i2c.c 2007-02-04 23:47:33.000000000 +0100 +++ em8300-CVS/modules/em8300_i2c.c 2007-02-04 23:48:31.000000000 +0100 @@ -245,8 +245,13 @@ /* unregister i2c_bus */ kfree(em->i2c_data_1.data); kfree(em->i2c_data_2.data); - i2c_bit_del_bus(&em->i2c_ops_1); - i2c_bit_del_bus(&em->i2c_ops_2); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) + i2c_del_adapter(&em->i2c_ops_1); + i2c_del_adapter(&em->i2c_ops_2); +#else + i2c_bit_del_bus(&em->i2c_ops_1); + i2c_bit_del_bus(&em->i2c_ops_2); +#endif } void em8300_clockgen_write(struct em8300_s *em, int abyte) Index: em8300-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/em8300-kmod/devel/em8300-kmod.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- em8300-kmod.spec 18 Dec 2006 22:11:01 -0000 1.13 +++ em8300-kmod.spec 6 Feb 2007 17:36:53 -0000 1.14 @@ -4,7 +4,7 @@ # end stuff to be ... # hardcode for now: -%{!?kversion: %define kversion 2.6.18-1.2868.fc6} +%{!?kversion: %define kversion 2.6.20-1.2922.fc7} %define kmod_name em8300 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null) @@ -27,7 +27,7 @@ Name: %{kmod_name}-kmod Summary: Kernel modules for DXR3/Hollywood Plus MPEG decoder cards Version: 0.16.0 -Release: 5.%(echo %{kverrel} | tr - _) +Release: 6.%(echo %{kverrel} | tr - _) Group: System Environment/Kernel License: GPL @@ -35,6 +35,7 @@ Source0: http://downloads.sourceforge.net/dxr3/%{kmod_name}-nofirmware-%{version}.tar.gz Patch0: http://cachalot.mine.nu/src/dxr3/em8300-adv7170-wss.patch Patch1: http://cachalot.mine.nu/src/dxr3/em8300-oss-default.patch +Patch2: em8300-0.16.0-2.6.20.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: i586 i686 x86_64 ppc @@ -49,6 +50,7 @@ cd %{kmod_name}-%{version} %patch0 -p0 %patch1 -p0 +%patch2 -p1 cd .. for kvariant in %{kvariants} ; do cp -a %{kmod_name}-%{version} _kmod_build_$kvariant @@ -80,6 +82,9 @@ %changelog +* Tue Feb 6 2007 Ville Skytt?? - 0.16.0-6 +- Patch for kernel 2.6.20 (David van Vyfeyken), build for 2.6.20-1.2922.fc7. + * Mon Dec 18 2006 Ville Skytt?? - 0.16.0-5 - 0.16.0, build for kernel 2.6.18-1.2868.fc6. From fedora-extras-commits at redhat.com Tue Feb 6 18:05:45 2007 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 6 Feb 2007 13:05:45 -0500 Subject: rpms/em8300-kmod/devel em8300-kmod.spec,1.14,1.15 Message-ID: <200702061805.l16I5jEL013348@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/em8300-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13324 Modified Files: em8300-kmod.spec Log Message: * Tue Feb 6 2007 Ville Skytt?? - 0.16.0-10 - Adjust to current Rawhide arch-variant combos (kdump, xen, debug). Index: em8300-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/em8300-kmod/devel/em8300-kmod.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- em8300-kmod.spec 6 Feb 2007 17:36:53 -0000 1.14 +++ em8300-kmod.spec 6 Feb 2007 18:05:13 -0000 1.15 @@ -16,18 +16,21 @@ %define smp smp %endif %ifarch i686 x86_64 ia64 -%define xen xen +#define xen xen %endif -%ifarch i686 x86_64 ppc64 ppc64iseries +%ifarch x86_64 ppc64 %define kdump kdump %endif -%{!?kvariants: %define kvariants "" %{?pae} %{?smp} %{?xen} %{?kdump}} +%ifarch i686 x86_64 +%defing debug debug +%endif +%{!?kvariants: %define kvariants "" %{?pae} %{?smp} %{?xen} %{?kdump} %{?debug}} Name: %{kmod_name}-kmod Summary: Kernel modules for DXR3/Hollywood Plus MPEG decoder cards Version: 0.16.0 -Release: 6.%(echo %{kverrel} | tr - _) +Release: 10.%(echo %{kverrel} | tr - _) Group: System Environment/Kernel License: GPL @@ -82,6 +85,9 @@ %changelog +* Tue Feb 6 2007 Ville Skytt?? - 0.16.0-10 +- Adjust to current Rawhide arch-variant combos (kdump, xen, debug). + * Tue Feb 6 2007 Ville Skytt?? - 0.16.0-6 - Patch for kernel 2.6.20 (David van Vyfeyken), build for 2.6.20-1.2922.fc7. From fedora-extras-commits at redhat.com Tue Feb 6 18:09:28 2007 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 6 Feb 2007 13:09:28 -0500 Subject: rpms/exim/devel exim-4.50-config.patch, 1.5, 1.6 exim-4.62-dlopen-localscan.patch, 1.1, 1.2 exim.init, 1.1, 1.2 exim.spec, 1.34, 1.35 Message-ID: <200702061809.l16I9S38013449@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13420 Modified Files: exim-4.50-config.patch exim-4.62-dlopen-localscan.patch exim.init exim.spec Log Message: 4.66 exim-4.50-config.patch: Index: exim-4.50-config.patch =================================================================== RCS file: /cvs/extras/rpms/exim/devel/exim-4.50-config.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- exim-4.50-config.patch 21 Mar 2006 10:29:09 -0000 1.5 +++ exim-4.50-config.patch 6 Feb 2007 18:08:56 -0000 1.6 @@ -115,16 +115,18 @@ #------------------------------------------------------------------------------ # Compiling Exim with experimental features. These are documented in -@@ -464,10 +466,10 @@ +@@ -464,11 +466,11 @@ # included in the Exim binary. You will then need to set up the run time # configuration to make use of the mechanism(s) selected. -# AUTH_CRAM_MD5=yes -# AUTH_CYRUS_SASL=yes +-# AUTH_DOVECOT=yes -# AUTH_PLAINTEXT=yes -# AUTH_SPA=yes +AUTH_CRAM_MD5=yes +AUTH_CYRUS_SASL=yes ++AUTH_DOVECOT=yes +AUTH_PLAINTEXT=yes +AUTH_SPA=yes @@ -207,6 +209,15 @@ #------------------------------------------------------------------------------ +@@ -691,7 +696,7 @@ EXIM_PERL=perl.o + # that the local_scan API is made available by the linker. You may also need + # to add -ldl to EXTRALIBS so that dlopen() is available to Exim. + +-# EXPAND_DLFUNC=yes ++EXPAND_DLFUNC=yes + + + #------------------------------------------------------------------------------ @@ -696,7 +699,7 @@ # support, which is intended for use in conjunction with the SMTP AUTH # facilities, is included only when requested by the following setting: @@ -245,7 +256,7 @@ -# USE_READLINE=yes +USE_READLINE=yes - # You may need to add -ldl to EXTRA_LIBS when you set USE_READLINE=yes. + # You may need to add -ldl to EXTRALIBS when you set USE_READLINE=yes. # Note that this option adds to the size of the Exim binary, because the # dynamic loading library is not otherwise included. exim-4.62-dlopen-localscan.patch: Index: exim-4.62-dlopen-localscan.patch =================================================================== RCS file: /cvs/extras/rpms/exim/devel/exim-4.62-dlopen-localscan.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- exim-4.62-dlopen-localscan.patch 26 Aug 2006 09:30:05 -0000 1.1 +++ exim-4.62-dlopen-localscan.patch 6 Feb 2007 18:08:56 -0000 1.2 @@ -10,8 +10,8 @@ Marc MERLIN diff -urN exim-4.14-0/src/EDITME exim-4.14-1/src/EDITME ---- exim-4.14-0/src/EDITME Tue Mar 11 04:20:18 2003 -+++ exim-4.14-1/src/EDITME Sun Mar 23 15:34:15 2003 +--- exim-4.14-0/Local/Makefile Tue Mar 11 04:20:18 2003 ++++ exim-4.14-1/Local/Makefile Sun Mar 23 15:34:15 2003 @@ -388,6 +388,20 @@ Index: exim.init =================================================================== RCS file: /cvs/extras/rpms/exim/devel/exim.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- exim.init 19 Apr 2005 04:06:04 -0000 1.1 +++ exim.init 6 Feb 2007 18:08:56 -0000 1.2 @@ -73,14 +73,21 @@ restart) restart ;; + reload) + if [ -f /var/lock/subsys/exim ]; then + echo -n $"Reloading exim:" + killproc exim -HUP + echo + fi + ;; condrestart) - [ -f /var/lock/subsys/exim ] && restart || : + [ -f /var/lock/subsys/exim ] && restart || : ;; status) status exim ;; *) - echo $"Usage: $0 {start|stop|restart|status|condrestart}" + echo $"Usage: $0 {start|stop|restart|reload|status|condrestart}" exit 1 esac Index: exim.spec =================================================================== RCS file: /cvs/extras/rpms/exim/devel/exim.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- exim.spec 9 Dec 2006 21:27:45 -0000 1.34 +++ exim.spec 6 Feb 2007 18:08:56 -0000 1.35 @@ -11,8 +11,8 @@ Summary: The exim mail transfer agent Name: exim -Version: 4.63 -Release: 6%{?dist} +Version: 4.66 +Release: 1%{?dist} License: GPL Url: http://www.exim.org/ Group: System Environment/Daemons @@ -395,6 +395,11 @@ %endif %changelog +* Tue Feb 6 2007 David Woodhouse 4.66-1 +- Update to 4.66 +- Add dovecot authenticator +- Add 'reload' in init script (#219174) + * Tue Oct 17 2006 Christian Iseli 4.63-6 - Own /etc/exim directory From fedora-extras-commits at redhat.com Tue Feb 6 18:15:09 2007 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 6 Feb 2007 13:15:09 -0500 Subject: rpms/em8300-kmod/devel em8300-kmod.spec,1.15,1.16 Message-ID: <200702061815.l16IF9aX013550@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/em8300-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13526 Modified Files: em8300-kmod.spec Log Message: Typo fix, sigh. Index: em8300-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/em8300-kmod/devel/em8300-kmod.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- em8300-kmod.spec 6 Feb 2007 18:05:13 -0000 1.15 +++ em8300-kmod.spec 6 Feb 2007 18:14:36 -0000 1.16 @@ -22,7 +22,7 @@ %define kdump kdump %endif %ifarch i686 x86_64 -%defing debug debug +%define debug debug %endif %{!?kvariants: %define kvariants "" %{?pae} %{?smp} %{?xen} %{?kdump} %{?debug}} From fedora-extras-commits at redhat.com Tue Feb 6 18:32:07 2007 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 6 Feb 2007 13:32:07 -0500 Subject: rpms/em8300-kmod/devel em8300-kmod.spec,1.16,1.17 Message-ID: <200702061832.l16IW79l013784@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/em8300-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13764 Modified Files: em8300-kmod.spec Log Message: -debug(-devel) is incompatibly packaged, #227533 Index: em8300-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/em8300-kmod/devel/em8300-kmod.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- em8300-kmod.spec 6 Feb 2007 18:14:36 -0000 1.16 +++ em8300-kmod.spec 6 Feb 2007 18:31:35 -0000 1.17 @@ -22,7 +22,7 @@ %define kdump kdump %endif %ifarch i686 x86_64 -%define debug debug +#define debug debug %endif %{!?kvariants: %define kvariants "" %{?pae} %{?smp} %{?xen} %{?kdump} %{?debug}} From fedora-extras-commits at redhat.com Tue Feb 6 18:35:25 2007 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 6 Feb 2007 13:35:25 -0500 Subject: rpms/exim/devel sources,1.11,1.12 .cvsignore,1.11,1.12 Message-ID: <200702061835.l16IZPut013873@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13843 Modified Files: sources .cvsignore Log Message: oops, and the tarball too Index: sources =================================================================== RCS file: /cvs/extras/rpms/exim/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 26 Aug 2006 09:30:05 -0000 1.11 +++ sources 6 Feb 2007 18:34:52 -0000 1.12 @@ -1,3 +1,2 @@ ad76f73c6b3d01caa88078e3e622745a sa-exim-4.2.tar.gz -a8efc92427192fd3b7b5e71decc8cc31 exim-4.62.tar.bz2 -dde2d5f7106d51607409af94174db46c exim-4.63.tar.bz2 +01288e44919d8abdde5a7bd2c200449b exim-4.66.tar.bz2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/exim/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 26 Aug 2006 09:30:05 -0000 1.11 +++ .cvsignore 6 Feb 2007 18:34:52 -0000 1.12 @@ -1,3 +1,2 @@ sa-exim-4.2.tar.gz -exim-4.62.tar.bz2 -exim-4.63.tar.bz2 +exim-4.66.tar.bz2 From fedora-extras-commits at redhat.com Tue Feb 6 18:41:46 2007 From: fedora-extras-commits at redhat.com (Garrick Staples (garrick)) Date: Tue, 6 Feb 2007 13:41:46 -0500 Subject: rpms/torque/devel torque.spec, 1.20, 1.21 torque-2.1.6-show_buildindex_arg.patch, 1.1, NONE Message-ID: <200702061841.l16Ifk2Q014037@cvs-int.fedora.redhat.com> Author: garrick Update of /cvs/extras/rpms/torque/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14018 Modified Files: torque.spec Removed Files: torque-2.1.6-show_buildindex_arg.patch Log Message: * Tue Feb 6 2007 Garrick Staples 2.1.6-4 - rebuilding with new tcl Index: torque.spec =================================================================== RCS file: /cvs/extras/rpms/torque/devel/torque.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- torque.spec 4 Feb 2007 05:14:12 -0000 1.20 +++ torque.spec 6 Feb 2007 18:41:14 -0000 1.21 @@ -3,7 +3,7 @@ %define name torque %define version 2.1.6 #%%define snap 200604251602 -%define release 3 +%define release 4 # The following options are supported: # --with server_name=hostname @@ -92,7 +92,6 @@ Source5: xpbsmon.png Source6: README-localhost Patch1: torque-2.1.0-remove-rpath.path -Patch2: torque-2.1.6-show_buildindex_arg.patch License: Freely redistributable (See PBS_License.txt) Group: System Environment/Daemons URL: http://www.clusterresources.com/products/torque/ @@ -122,7 +121,6 @@ %prep %setup -q -n torque-%{version}%{?snap:-snap.%snap} %patch1 -p1 -%patch2 -p1 %__install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} . @@ -405,6 +403,9 @@ %changelog +* Tue Feb 6 2007 Garrick Staples 2.1.6-4 +- rebuilding with new tcl + * Sat Feb 3 2007 Garrick Staples 2.1.6-3 - trying to resolve tcl8.5 buildindex issue --- torque-2.1.6-show_buildindex_arg.patch DELETED --- From fedora-extras-commits at redhat.com Tue Feb 6 19:19:50 2007 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Tue, 6 Feb 2007 14:19:50 -0500 Subject: rpms/limph pkg.acl,1.1,1.2 Message-ID: <200702061919.l16JJoeW019258@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/extras/rpms/limph In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19204 Modified Files: pkg.acl Log Message: Added Orion, my sponsor. Index: pkg.acl =================================================================== RCS file: /cvs/extras/rpms/limph/pkg.acl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pkg.acl 31 Jan 2007 12:48:47 -0000 1.1 +++ pkg.acl 6 Feb 2007 19:19:18 -0000 1.2 @@ -0,0 +1,2 @@ +limb at jcomserv.net +orion at cora.nwra.com From fedora-extras-commits at redhat.com Tue Feb 6 19:57:04 2007 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Tue, 6 Feb 2007 14:57:04 -0500 Subject: rpms/dnsmasq/devel .cvsignore, 1.8, 1.9 dnsmasq.spec, 1.16, 1.17 sources, 1.8, 1.9 Message-ID: <200702061957.l16Jv4fG021181@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21125 Modified Files: .cvsignore dnsmasq.spec sources Log Message: * Tue Feb 06 2007 Patrick "Jima" Laughton 2.37-1 - New upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 24 Jan 2007 19:49:18 -0000 1.8 +++ .cvsignore 6 Feb 2007 19:56:31 -0000 1.9 @@ -1 +1 @@ -dnsmasq-2.36.tar.gz +dnsmasq-2.37.tar.gz Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/devel/dnsmasq.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- dnsmasq.spec 24 Jan 2007 19:49:18 -0000 1.16 +++ dnsmasq.spec 6 Feb 2007 19:56:31 -0000 1.17 @@ -1,5 +1,5 @@ Name: dnsmasq -Version: 2.36 +Version: 2.37 Release: 1%{?dist} Summary: A lightweight DHCP/caching DNS server @@ -92,6 +92,9 @@ %changelog +* Tue Feb 06 2007 Patrick "Jima" Laughton 2.37-1 +- New upstream version + * Wed Jan 24 2007 Patrick "Jima" Laughton 2.36-1 - New upstream version Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 24 Jan 2007 19:49:18 -0000 1.8 +++ sources 6 Feb 2007 19:56:31 -0000 1.9 @@ -1 +1 @@ -392bf22dbff84eae010e149f15cd4136 dnsmasq-2.36.tar.gz +e105a41cdf5adb8b615f0a06eb17ecb9 dnsmasq-2.37.tar.gz From fedora-extras-commits at redhat.com Tue Feb 6 20:50:05 2007 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 6 Feb 2007 15:50:05 -0500 Subject: rpms/syslog-ng/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 syslog-ng.spec, 1.16, 1.17 Message-ID: <200702062050.l16Ko5il025095@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/syslog-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25073 Modified Files: .cvsignore sources syslog-ng.spec Log Message: Update to 1.6.12. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 5 May 2006 18:07:18 -0000 1.6 +++ .cvsignore 6 Feb 2007 20:49:33 -0000 1.7 @@ -1 +1 @@ -syslog-ng-1.6.11.tar.gz +syslog-ng-1.6.12.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 5 May 2006 18:07:18 -0000 1.6 +++ sources 6 Feb 2007 20:49:33 -0000 1.7 @@ -1 +1 @@ -8f9ca6140f428dc9adec9fa1c270a2dd syslog-ng-1.6.11.tar.gz +a3cbfdb6e1e5beea181a7349749719f3 syslog-ng-1.6.12.tar.gz Index: syslog-ng.spec =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/devel/syslog-ng.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- syslog-ng.spec 10 Sep 2006 18:06:18 -0000 1.16 +++ syslog-ng.spec 6 Feb 2007 20:49:33 -0000 1.17 @@ -12,8 +12,8 @@ %{?_with_spoofing:%define spoofing 1} Name: syslog-ng -Version: 1.6.11 -Release: 3%{?dist} +Version: 1.6.12 +Release: 1%{?dist} Summary: Syslog replacement daemon Group: System Environment/Daemons @@ -27,7 +27,7 @@ BuildConflicts: libol-devel < %{libolver} BuildRequires: flex, which -BuildRequires: tcp_wrappers +BuildRequires: tcp_wrappers-devel %if %{spoofing} BuildRequires: libnet-devel >= 1.1 %endif @@ -159,6 +159,9 @@ %changelog +* Tue Feb 6 2007 Jose Pedro Oliveira - 1.6.12-1 +- Update to 1.6.12. + * Sun Sep 10 2006 Jose Pedro Oliveira - 1.6.11-3 - Rebuild for FC6. From fedora-extras-commits at redhat.com Tue Feb 6 21:08:06 2007 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 6 Feb 2007 16:08:06 -0500 Subject: rpms/syslog-ng/FC-5 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 syslog-ng.spec, 1.13, 1.14 Message-ID: <200702062108.l16L86nw028651@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/syslog-ng/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28611/FC-5 Modified Files: .cvsignore sources syslog-ng.spec Log Message: Update to 1.6.12. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 6 May 2006 12:52:49 -0000 1.6 +++ .cvsignore 6 Feb 2007 21:07:34 -0000 1.7 @@ -1 +1 @@ -syslog-ng-1.6.11.tar.gz +syslog-ng-1.6.12.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 6 May 2006 12:52:49 -0000 1.6 +++ sources 6 Feb 2007 21:07:34 -0000 1.7 @@ -1 +1 @@ -8f9ca6140f428dc9adec9fa1c270a2dd syslog-ng-1.6.11.tar.gz +a3cbfdb6e1e5beea181a7349749719f3 syslog-ng-1.6.12.tar.gz Index: syslog-ng.spec =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-5/syslog-ng.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- syslog-ng.spec 6 May 2006 12:52:49 -0000 1.13 +++ syslog-ng.spec 6 Feb 2007 21:07:34 -0000 1.14 @@ -12,7 +12,7 @@ %{?_with_spoofing:%define spoofing 1} Name: syslog-ng -Version: 1.6.11 +Version: 1.6.12 Release: 1%{?dist} Summary: Syslog replacement daemon @@ -86,6 +86,15 @@ install -p -m 644 %{SOURCE1} \ $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/syslog +# Vim syntax file +install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name} +install -p -m 644 contrib/syslog-ng.vim $RPM_BUILD_ROOT%{_datadir}/%{name}/ +for vimver in 63 64 70 ; do + install -dm 755 $RPM_BUILD_ROOT%{_datadir}/vim/vim$vimver/syntax + ln -s %{_datadir}/%{name}/syslog-ng.vim $RPM_BUILD_ROOT%{_datadir}/vim/vim$vimver/syntax +done + + %clean rm -rf $RPM_BUILD_ROOT @@ -111,6 +120,25 @@ fi +%triggerin -- vim-common +VIMVERNEW=`rpm -q --qf='%%{epoch}:%%{version}\n' vim-common | sort | tail -n 1 | sed -e 's/[0-9]*://' | sed -e 's/\.[0-9]*$//' | sed -e 's/\.//'` +[ -d %{_datadir}/vim/vim${VIMVERNEW}/syntax ] && \ + ln -sf %{_datadir}/%{name}/syslog-ng.vim %{_datadir}/vim/vim${VIMVERNEW}/syntax || : + +%triggerun -- vim-common +VIMVEROLD=`rpm -q --qf='%%{epoch}:%%{version}\n' vim-common | sort | head -n 1 | sed -e 's/[0-9]*://' | sed -e 's/\.[0-9]*$//' | sed -e 's/\.//'` +[ $2 = 0 ] && rm -f %{_datadir}/vim/vim${VIMVEROLD}/syntax/syslog-ng.vim || : + +%triggerpostun -- vim-common +VIMVEROLD=`rpm -q --qf='%%{epoch}:%%{version}\n' vim-common | sort | head -n 1 | sed -e 's/[0-9]*://' | sed -e 's/\.[0-9]*$//' | sed -e 's/\.//'` +VIMVERNEW=`rpm -q --qf='%%{epoch}:%%{version}\n' vim-common | sort | tail -n 1 | sed -e 's/[0-9]*://' | sed -e 's/\.[0-9]*$//' | sed -e 's/\.//'` +if [ $1 = 1 ]; then + rm -f %{_datadir}/vim/vim${VIMVEROLD}/syntax/syslog-ng.vim || : + [ -d %{_datadir}/vim/vim${VIMVERNEW}/syntax ] && \ + ln -sf %{_datadir}/%{name}/syslog-ng.vim %{_datadir}/vim/vim${VIMVERNEW}/syntax || : +fi + + %files %defattr(-,root,root,-) %doc AUTHORS COPYING README README.spoof ChangeLog INSTALL NEWS PORTS @@ -124,11 +152,22 @@ %config(noreplace) %{_sysconfdir}/%{name}/syslog-ng.conf %config(noreplace) %{_sysconfdir}/sysconfig/syslog-ng %config(noreplace) %{_sysconfdir}/logrotate.d/syslog +%{_datadir}/%{name}/ %{_mandir}/man5/*.5* %{_mandir}/man8/*.8* +%ghost %{_datadir}/vim/ %changelog +* Tue Feb 6 2007 Jose Pedro Oliveira - 1.6.12-1 +- Update to 1.6.12. + +* Sun Sep 10 2006 Jose Pedro Oliveira - 1.6.11-3 +- Rebuild for FC6. + +* Sun Jun 4 2006 Jose Pedro Oliveira - 1.6.11-2 +- Install the vim syntax file. + * Fri May 5 2006 Jose Pedro Oliveira - 1.6.11-1 - Update to 1.6.11. @@ -287,4 +326,4 @@ * Sun Dec 08 2002 Richard E. Perlotto II 1.5.23-1 - Updated file with notes and PGP signatures -# vim:set ai ts=4 sw=4 sts=4: +# vim:set ai ts=4 sw=4 sts=4 et: From fedora-extras-commits at redhat.com Tue Feb 6 21:08:09 2007 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 6 Feb 2007 16:08:09 -0500 Subject: rpms/syslog-ng/FC-6 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 syslog-ng.spec, 1.16, 1.17 Message-ID: <200702062108.l16L89u0028656@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/syslog-ng/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28611/FC-6 Modified Files: .cvsignore sources syslog-ng.spec Log Message: Update to 1.6.12. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-6/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 5 May 2006 18:07:18 -0000 1.6 +++ .cvsignore 6 Feb 2007 21:07:36 -0000 1.7 @@ -1 +1 @@ -syslog-ng-1.6.11.tar.gz +syslog-ng-1.6.12.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-6/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 5 May 2006 18:07:18 -0000 1.6 +++ sources 6 Feb 2007 21:07:36 -0000 1.7 @@ -1 +1 @@ -8f9ca6140f428dc9adec9fa1c270a2dd syslog-ng-1.6.11.tar.gz +a3cbfdb6e1e5beea181a7349749719f3 syslog-ng-1.6.12.tar.gz Index: syslog-ng.spec =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-6/syslog-ng.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- syslog-ng.spec 10 Sep 2006 18:06:18 -0000 1.16 +++ syslog-ng.spec 6 Feb 2007 21:07:36 -0000 1.17 @@ -12,8 +12,8 @@ %{?_with_spoofing:%define spoofing 1} Name: syslog-ng -Version: 1.6.11 -Release: 3%{?dist} +Version: 1.6.12 +Release: 1%{?dist} Summary: Syslog replacement daemon Group: System Environment/Daemons @@ -159,6 +159,9 @@ %changelog +* Tue Feb 6 2007 Jose Pedro Oliveira - 1.6.12-1 +- Update to 1.6.12. + * Sun Sep 10 2006 Jose Pedro Oliveira - 1.6.11-3 - Rebuild for FC6. From fedora-extras-commits at redhat.com Tue Feb 6 22:46:01 2007 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Tue, 6 Feb 2007 17:46:01 -0500 Subject: rpms/pungi import.log,1.8,1.9 Message-ID: <200702062246.l16Mk1XY000417@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/extras/rpms/pungi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv379 Modified Files: import.log Log Message: auto-import pungi-0.2.3-1 on branch devel from pungi-0.2.3-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pungi/import.log,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- import.log 29 Jan 2007 21:15:18 -0000 1.8 +++ import.log 6 Feb 2007 22:45:28 -0000 1.9 @@ -5,3 +5,4 @@ pungi-0_2_0-1:HEAD:pungi-0.2.0-1.src.rpm:1169681091 pungi-0_2_1-1:HEAD:pungi-0.2.1-1.src.rpm:1169748817 pungi-0_2_2-1:HEAD:pungi-0.2.2-1.src.rpm:1170105534 +pungi-0_2_3-1:HEAD:pungi-0.2.3-1.src.rpm:1170801926 From fedora-extras-commits at redhat.com Tue Feb 6 22:46:03 2007 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Tue, 6 Feb 2007 17:46:03 -0500 Subject: rpms/pungi/devel .cvsignore, 1.7, 1.8 pungi.spec, 1.7, 1.8 sources, 1.7, 1.8 Message-ID: <200702062246.l16Mk3fB000423@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/extras/rpms/pungi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv379/devel Modified Files: .cvsignore pungi.spec sources Log Message: auto-import pungi-0.2.3-1 on branch devel from pungi-0.2.3-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pungi/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 29 Jan 2007 21:15:18 -0000 1.7 +++ .cvsignore 6 Feb 2007 22:45:31 -0000 1.8 @@ -1 +1 @@ -pungi-0.2.2.tar.gz +pungi-0.2.3.tar.gz Index: pungi.spec =================================================================== RCS file: /cvs/extras/rpms/pungi/devel/pungi.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- pungi.spec 29 Jan 2007 21:15:18 -0000 1.7 +++ pungi.spec 6 Feb 2007 22:45:31 -0000 1.8 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: pungi -Version: 0.2.2 +Version: 0.2.3 Release: 1%{?dist} Summary: Distribution compose tool @@ -46,6 +46,12 @@ %changelog +* Tue Feb 06 2007 Jesse Keating - 0.2.3-1 +- Be able to opt-out of a bugurl since buildinstall supports this +- Make isodir an object of pungi (wwoods) +- yum bestPackagesFromList takes an arch argument. Fixes ppc64 bug +- Don't use 'returnSimple' anymore, deprecated in yum api + * Mon Jan 29 2007 Jesse Keating - 0.2.2-1 - Update the comps file again from F7 - Fix the ppc boot flags Index: sources =================================================================== RCS file: /cvs/extras/rpms/pungi/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 29 Jan 2007 21:15:18 -0000 1.7 +++ sources 6 Feb 2007 22:45:31 -0000 1.8 @@ -1 +1 @@ -f0d3d9365a00b713a35b7a4924c76c9c pungi-0.2.2.tar.gz +fc8d6c41fdd15061e94232f9993fce40 pungi-0.2.3.tar.gz From fedora-extras-commits at redhat.com Tue Feb 6 23:40:49 2007 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 6 Feb 2007 18:40:49 -0500 Subject: rpms/exim-doc/devel .cvsignore, 1.6, 1.7 exim-doc.spec, 1.7, 1.8 sources, 1.7, 1.8 Message-ID: <200702062340.l16NenGv004403@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim-doc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4378 Modified Files: .cvsignore exim-doc.spec sources Log Message: 4.66 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/exim-doc/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 4 Sep 2006 04:50:22 -0000 1.6 +++ .cvsignore 6 Feb 2007 23:40:17 -0000 1.7 @@ -1,6 +1,6 @@ +exim-html-4.66.tar.bz2 +exim-pdf-4.66.tar.bz2 +exim-postscript-4.66.tar.bz2 +exim-texinfo-4.66.tar.bz2 FAQ-html-20050415.tar.bz2 config.samples-20050415.tar.bz2 -exim-html-4.63.tar.bz2 -exim-pdf-4.63.tar.bz2 -exim-postscript-4.63.tar.bz2 -exim-texinfo-4.63.tar.bz2 Index: exim-doc.spec =================================================================== RCS file: /cvs/extras/rpms/exim-doc/devel/exim-doc.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- exim-doc.spec 4 Sep 2006 05:12:01 -0000 1.7 +++ exim-doc.spec 6 Feb 2007 23:40:17 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Documentation for the exim mail transfer agent Name: exim-doc -Version: 4.63 -Release: 2%{?dist} +Version: 4.66 +Release: 1%{?dist} License: GPL Url: http://www.exim.org/ Group: Documentation @@ -46,6 +46,9 @@ %doc faq html ps pdf texinfo config.samples %changelog +* Tue Feb 6 2007 David Woodhouse 4.66-1 +- Update to 4.66 + * Sun Sep 3 2006 David Woodhouse 4.63-2 - Merge twoerner's 4.62-3.el5 changes into Extras package Index: sources =================================================================== RCS file: /cvs/extras/rpms/exim-doc/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 4 Sep 2006 04:50:22 -0000 1.7 +++ sources 6 Feb 2007 23:40:17 -0000 1.8 @@ -1,6 +1,6 @@ +1c685396087f848212e5efa6aedba732 exim-html-4.66.tar.bz2 +e396f2bcf62d1c7e0af6e0e13d09e489 exim-pdf-4.66.tar.bz2 +8c763e6561a77c8df661d7586199cc2b exim-postscript-4.66.tar.bz2 +f45a204f3865afa2d72b0fbd3eff8bf8 exim-texinfo-4.66.tar.bz2 ecceef7c8d1a352caf6c2992a6f4cb69 FAQ-html-20050415.tar.bz2 4b93321938a800caa6127c48ad60a42b config.samples-20050415.tar.bz2 -4dd587a7b7fe0244c4dad58fbcb90c2c exim-html-4.63.tar.bz2 -fa3f970185fad32670ed4053c6442af6 exim-pdf-4.63.tar.bz2 -07b99c2fa841f9636644e0e2b31bb884 exim-postscript-4.63.tar.bz2 -1e14e90a4ecd8aadc4e6748e1726d6d5 exim-texinfo-4.63.tar.bz2 From fedora-extras-commits at redhat.com Wed Feb 7 02:32:39 2007 From: fedora-extras-commits at redhat.com (Kai Engert (kengert)) Date: Tue, 6 Feb 2007 21:32:39 -0500 Subject: rpms/seamonkey/FC-5 dead.package, 1.2, 1.3 .cvsignore, 1.7, NONE Makefile, 1.3, NONE find-external-requires, 1.3, NONE firefox-0.7.3-default-plugin-less-annoying.patch, 1.3, NONE firefox-0.7.3-psfonts.patch, 1.3, NONE firefox-1.0-prdtoa.patch, 1.3, NONE firefox-1.1-nss-system-nspr.patch, 1.3, NONE firefox-1.1-uriloader.patch, 1.3, NONE firefox-1.1-visibility.patch, 1.3, NONE firefox-1.5-with-system-nss.patch, 1.3, NONE firefox-1.5.0.1-dumpstack.patch, 1.3, NONE mozilla-1.4.1-ppc64.patch, 1.3, NONE mozilla-1.7.3-gnome-vfs-default-app.patch, 1.3, NONE mozilla-1.7.5-g-application-name.patch, 1.3, NONE mozilla-nspr-packages.patch, 1.3, NONE mozilla-psm-exclude-list, 1.3, NONE mozilla-xpcom-exclude-list, 1.3, NONE pango-cairo.patch, 1.3, NONE seamonkey-1.0.1-dumpstack.patch, 1.3, NONE seamonkey-cairo-bug5136.patch, 1.3, NONE seamonkey-configure.patch, 1.6, NONE seamonkey-disable-visibility.patch, 1.3, NONE seamonkey-fedora-default-bookmarks.html, 1.3, NONE seamonkey-fedora-default-prefs.js, 1.4, NONE seamonkey-fedora-home-page.patch, 1.3, NONE seamonkey-icon.png, 1.3, NONE seamonkey-mail-icon.png, 1.3, NONE seamonkey-mail.desktop, 1.3, NONE seamonkey-make-package.pl, 1.3, NONE seamonkey-mozconfig, 1.3, NONE seamonkey.desktop, 1.3, NONE seamonkey.sh.in, 1.3, NONE seamonkey.spec, 1.9, NONE sources, 1.8, NONE thunderbird-0.7.3-gnome-uriloader.patch, 1.3, NONE thunderbird-1.5-bug304720.patch, 1.3, NONE Message-ID: <200702070232.l172WdHE015488@cvs-int.fedora.redhat.com> Author: kengert Update of /cvs/extras/rpms/seamonkey/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15463 Added Files: dead.package Removed Files: .cvsignore Makefile find-external-requires firefox-0.7.3-default-plugin-less-annoying.patch firefox-0.7.3-psfonts.patch firefox-1.0-prdtoa.patch firefox-1.1-nss-system-nspr.patch firefox-1.1-uriloader.patch firefox-1.1-visibility.patch firefox-1.5-with-system-nss.patch firefox-1.5.0.1-dumpstack.patch mozilla-1.4.1-ppc64.patch mozilla-1.7.3-gnome-vfs-default-app.patch mozilla-1.7.5-g-application-name.patch mozilla-nspr-packages.patch mozilla-psm-exclude-list mozilla-xpcom-exclude-list pango-cairo.patch seamonkey-1.0.1-dumpstack.patch seamonkey-cairo-bug5136.patch seamonkey-configure.patch seamonkey-disable-visibility.patch seamonkey-fedora-default-bookmarks.html seamonkey-fedora-default-prefs.js seamonkey-fedora-home-page.patch seamonkey-icon.png seamonkey-mail-icon.png seamonkey-mail.desktop seamonkey-make-package.pl seamonkey-mozconfig seamonkey.desktop seamonkey.sh.in seamonkey.spec sources thunderbird-0.7.3-gnome-uriloader.patch thunderbird-1.5-bug304720.patch Log Message: FC-5 only: Package is now in Core updates, obsoleting Mozilla Index: dead.package =================================================================== RCS file: dead.package diff -N dead.package --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ dead.package 7 Feb 2007 02:32:07 -0000 1.3 @@ -0,0 +1 @@ +FC-5 only: Package is now in Core updates, obsoleting Mozilla --- .cvsignore DELETED --- --- Makefile DELETED --- --- find-external-requires DELETED --- --- firefox-0.7.3-default-plugin-less-annoying.patch DELETED --- --- firefox-0.7.3-psfonts.patch DELETED --- --- firefox-1.0-prdtoa.patch DELETED --- --- firefox-1.1-nss-system-nspr.patch DELETED --- --- firefox-1.1-uriloader.patch DELETED --- --- firefox-1.1-visibility.patch DELETED --- --- firefox-1.5-with-system-nss.patch DELETED --- --- firefox-1.5.0.1-dumpstack.patch DELETED --- --- mozilla-1.4.1-ppc64.patch DELETED --- --- mozilla-1.7.3-gnome-vfs-default-app.patch DELETED --- --- mozilla-1.7.5-g-application-name.patch DELETED --- --- mozilla-nspr-packages.patch DELETED --- --- mozilla-psm-exclude-list DELETED --- --- mozilla-xpcom-exclude-list DELETED --- --- pango-cairo.patch DELETED --- --- seamonkey-1.0.1-dumpstack.patch DELETED --- --- seamonkey-cairo-bug5136.patch DELETED --- --- seamonkey-configure.patch DELETED --- --- seamonkey-disable-visibility.patch DELETED --- --- seamonkey-fedora-default-bookmarks.html DELETED --- --- seamonkey-fedora-default-prefs.js DELETED --- --- seamonkey-fedora-home-page.patch DELETED --- --- seamonkey-mail.desktop DELETED --- --- seamonkey-make-package.pl DELETED --- --- seamonkey-mozconfig DELETED --- --- seamonkey.desktop DELETED --- --- seamonkey.sh.in DELETED --- --- seamonkey.spec DELETED --- --- sources DELETED --- --- thunderbird-0.7.3-gnome-uriloader.patch DELETED --- --- thunderbird-1.5-bug304720.patch DELETED --- From fedora-extras-commits at redhat.com Wed Feb 7 04:56:50 2007 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Tue, 6 Feb 2007 23:56:50 -0500 Subject: rpms/mew/devel .cvsignore,1.4,1.5 mew.spec,1.7,1.8 sources,1.4,1.5 Message-ID: <200702070456.l174uoHh022885@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/mew/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22861 Modified Files: .cvsignore mew.spec sources Log Message: * Wed Feb 7 2007 Akira TAGOH - 5.2-1 - New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mew/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 19 Jul 2006 04:29:44 -0000 1.4 +++ .cvsignore 7 Feb 2007 04:56:17 -0000 1.5 @@ -4,3 +4,4 @@ mew-4.1.tar.gz mew-4.2.tar.gz mew-5.1.tar.gz +mew-5.2.tar.gz Index: mew.spec =================================================================== RCS file: /cvs/extras/rpms/mew/devel/mew.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mew.spec 19 Dec 2006 08:50:48 -0000 1.7 +++ mew.spec 7 Feb 2007 04:56:17 -0000 1.8 @@ -4,8 +4,8 @@ %define xemacsver 21.4.11 Name: mew -Version: 5.1 -Release: 3%{?dist} +Version: 5.2 +Release: 1%{?dist} License: BSD-like URL: http://www.mew.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -177,6 +177,9 @@ %changelog +* Wed Feb 7 2007 Akira TAGOH - 5.2-1 +- New upstream release. + * Tue Dec 19 2006 Akira TAGOh - 5.1-3 - makes it failsafe to run install-info. (#219402) Index: sources =================================================================== RCS file: /cvs/extras/rpms/mew/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 19 Jul 2006 04:29:44 -0000 1.4 +++ sources 7 Feb 2007 04:56:18 -0000 1.5 @@ -1 +1 @@ -0c913a789142f98623180eb111e28b07 mew-5.1.tar.gz +be0ac05179daed9b7c1329c9264d0f17 mew-5.2.tar.gz From fedora-extras-commits at redhat.com Wed Feb 7 05:04:18 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Wed, 7 Feb 2007 00:04:18 -0500 Subject: common cvs-import.sh,1.14,1.15 Message-ID: <200702070504.l1754ILL026284@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26261 Modified Files: cvs-import.sh Log Message: re-add Makefile if necessary () Index: cvs-import.sh =================================================================== RCS file: /cvs/extras/common/cvs-import.sh,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- cvs-import.sh 3 Feb 2007 16:42:42 -0000 1.14 +++ cvs-import.sh 7 Feb 2007 05:03:48 -0000 1.15 @@ -167,6 +167,32 @@ fi fi +CreateBranchMakefile() { + cat >Makefile <&2 +endef + +MAKEFILE_COMMON := \$(shell \$(checkout-makefile-common)) +endif + +include \$(MAKEFILE_COMMON) +EOF +} + # Figure out if we need to import a new module if [ -z "$(grep ""^$NAME[[:space:]]"" modules 2>/dev/null)" ] ; then # This is a new module, it does not exist @@ -205,29 +231,7 @@ # handle the module build cd devel touch sources .cvsignore - cat >Makefile <&2 -endef - -MAKEFILE_COMMON := \$(shell \$(checkout-makefile-common)) -endif - -include \$(MAKEFILE_COMMON) -EOF + CreateBranchMakefile cvs -Q add Makefile sources .cvsignore # commit all the added stuff cd .. && cvs -Q commit -m "Setup of module $NAME" >/dev/null @@ -339,6 +343,11 @@ done # upload the tarballs pushd ${BRANCH} >/dev/null +# Re-add the branch Makefile (during resurrection of dead packages). +if [ ! -f Makefile ] ; then + CreateBranchMakefile + cvs -Q add Makefile +fi rm -f sources && mv sources.new sources rm -f .cvsignore && mv .cvsignore.new .cvsignore if [ -n "$UPLOADFILES" ] ; then From fedora-extras-commits at redhat.com Wed Feb 7 05:23:07 2007 From: fedora-extras-commits at redhat.com (Kai Engert (kengert)) Date: Wed, 7 Feb 2007 00:23:07 -0500 Subject: rpms/seamonkey/FC-6 firefox-1.5-dnd-nograb.patch, NONE, 1.1 seamonkey.spec, 1.15, 1.16 Message-ID: <200702070523.l175N71V026390@cvs-int.fedora.redhat.com> Author: kengert Update of /cvs/extras/rpms/seamonkey/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26368 Modified Files: seamonkey.spec Added Files: firefox-1.5-dnd-nograb.patch Log Message: * Wed Feb 07 2007 Kai Engert 1.0.7-0.6.1 - Fix the DND implementation to not grab, so it works with new GTK+. - Fix upgrade path from FC-5 by obsoleting the seamonkey subset packages which recently obsoleted mozilla in FC-5. firefox-1.5-dnd-nograb.patch: --- NEW FILE firefox-1.5-dnd-nograb.patch --- See https://bugzilla.mozilla.org/show_bug.cgi?id=367203 Index: mozilla/widget/src/gtk2/nsDragService.cpp =================================================================== RCS file: /cvsroot/mozilla/widget/src/gtk2/nsDragService.cpp,v retrieving revision 1.9.10.1 diff -d -u -p -r1.9.10.1 nsDragService.cpp --- mozilla/widget/src/gtk2/nsDragService.cpp 22 Jun 2006 21:37:45 -0000 1.9.10.1 +++ mozilla/widget/src/gtk2/nsDragService.cpp 31 Jan 2007 04:27:43 -0000 @@ -799,7 +799,6 @@ nsDragService::IsTargetContextList(void) void nsDragService::GetTargetDragData(GdkAtom aFlavor) { - gtk_grab_add(mHiddenWidget); PR_LOG(sDragLm, PR_LOG_DEBUG, ("getting data flavor %d\n", aFlavor)); PR_LOG(sDragLm, PR_LOG_DEBUG, ("mLastWidget is %p and mLastContext is %p\n", mTargetWidget, mTargetDragContext)); @@ -817,7 +816,6 @@ nsDragService::GetTargetDragData(GdkAtom gtk_main_iteration(); } PR_LOG(sDragLm, PR_LOG_DEBUG, ("finished inner iteration\n")); - gtk_grab_remove(mHiddenWidget); } void Index: seamonkey.spec =================================================================== RCS file: /cvs/extras/rpms/seamonkey/FC-6/seamonkey.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- seamonkey.spec 23 Dec 2006 16:41:56 -0000 1.15 +++ seamonkey.spec 7 Feb 2007 05:22:35 -0000 1.16 @@ -11,7 +11,7 @@ Name: seamonkey Summary: Web browser, e-mail, news, IRC client, HTML editor Version: 1.0.7 -Release: 0.6%{?dist} +Release: 0.6.1%{?dist} URL: http://www.mozilla.org/projects/seamonkey/ License: MPL Group: Applications/Internet @@ -42,6 +42,7 @@ Patch82: firefox-1.5-pango-mathml.patch Patch91 : firefox-1.5-pango-ua.patch Patch101: thunderbird-0.7.3-gnome-uriloader.patch +Patch103: firefox-1.5-dnd-nograb.patch Patch220: seamonkey-fedora-home-page.patch Patch225: mozilla-nspr-packages.patch Patch227: mozilla-1.4.1-ppc64.patch @@ -71,6 +72,12 @@ BuildRequires: fileutils BuildRequires: perl +Obsoletes: seamonkey-chat +Obsoletes: seamonkey-devel +Obsoletes: seamonkey-dom-inspector +Obsoletes: seamonkey-js-debugger +Obsoletes: seamonkey-mail + PreReq: desktop-file-utils >= %{desktop_file_utils_version} %global nspr_build_time_version %(nspr-config --version) @@ -124,6 +131,7 @@ %patch82 -p1 %patch91 -p0 %patch101 -p1 -b .gnome-uriloader +%patch103 -p1 %patch220 -p1 %patch225 -p1 %patch227 -p1 @@ -427,6 +435,10 @@ %changelog +* Wed Feb 07 2007 Kai Engert 1.0.7-0.6.1 +- Fix the DND implementation to not grab, so it works with new GTK+. +- Fix upgrade path from FC-5 by obsoleting the seamonkey subset + packages which recently obsoleted mozilla in FC-5. * Sat Dec 23 2006 Kai Engert 1.0.7-0.6 - SeaMonkey 1.0.7 * Thu Nov 09 2006 Kai Engert 1.0.6-0.6.2 From fedora-extras-commits at redhat.com Wed Feb 7 06:38:52 2007 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 7 Feb 2007 01:38:52 -0500 Subject: rpms/scim-tomoe/devel scim-tomoe.spec,1.15,1.16 Message-ID: <200702070638.l176cqpT030057@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-tomoe/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30030 Modified Files: scim-tomoe.spec Log Message: - add scim-tomoe-libexecdir.patch to make scim-tomoe wrapper script run Resolves: #227626 - remove %%with_libstdc_preview Index: scim-tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/devel/scim-tomoe.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- scim-tomoe.spec 21 Jan 2007 07:28:05 -0000 1.15 +++ scim-tomoe.spec 7 Feb 2007 06:38:20 -0000 1.16 @@ -1,8 +1,6 @@ -%define with_libstdc_preview 0 - Name: scim-tomoe Version: 0.5.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tomoe module for SCIM for Japanese handwritten input Group: System Environment/Libraries @@ -11,41 +9,34 @@ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: scim-tomoe-moduledir.patch +Patch1: scim-tomoe-libexecdir.patch + BuildRequires: scim-devel, tomoe-devel, libtomoe-gtk-devel -%if %{with_libstdc_preview} -Buildrequires: libstdc++so7-devel -%endif +# patch1 touches configure.ac +BuildRequires: autoconf Requires: scim, tomoe >= %{version}, libtomoe-gtk >= %{version} -Patch0: scim-tomoe-moduledir.patch - %description Scim-tomoe allows Japanese handwritten input of characters using SCIM. %prep %setup -q -%patch0 -p0 +%patch0 -p0 -b .0-moduledir +%patch1 -p1 -b .1-libexec +# patch1 touches configure.ac +autoconf %build -%if %{with_libstdc_preview} -export CXX=%{_bindir}/g++-libstdc++-so_7 -%endif %configure --disable-static -%if %{with_libstdc_preview} -# tweak libtool for libstdc++-so7 -sed -i -e "s/4.1.0 /4.2.0-`grep datestamp= %{_bindir}/g++-libstdc++-so_7 | sed -e "s/datestamp=//"` /" libtool -%endif make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -%if %{with_libstdc_preview} -export CXX=%{_bindir}/g++-libstdc++-so_7 -%endif -make install DESTDIR=$RPM_BUILD_ROOT +rm -rf ${RPM_BUILD_ROOT} +make DESTDIR=${RPM_BUILD_ROOT} install rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/*/*.la @@ -53,7 +44,7 @@ %clean -rm -rf $RPM_BUILD_ROOT +rm -rf ${RPM_BUILD_ROOT} %files -f %{name}.lang @@ -65,6 +56,11 @@ %changelog +* Wed Feb 7 2007 Jens Petersen - 0.5.0-3 +- add scim-tomoe-libexecdir.patch to make scim-tomoe wrapper script run + (#227626) +- remove %%with_libstdc_preview + * Sun Jan 21 2007 Ryo Dairiki - 0.5.0-2 - fix the building dependency. From fedora-extras-commits at redhat.com Wed Feb 7 06:58:44 2007 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 7 Feb 2007 01:58:44 -0500 Subject: rpms/scim-tomoe/devel scim-tomoe-libexecdir.patch,NONE,1.1 Message-ID: <200702070658.l176wiQr030216@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-tomoe/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30205 Added Files: scim-tomoe-libexecdir.patch Log Message: remember to add scim-tomoe-libexecdir.patch scim-tomoe-libexecdir.patch: --- NEW FILE scim-tomoe-libexecdir.patch --- --- scim-tomoe-0.5.0/configure.ac~ 2006-12-18 17:39:43.000000000 +1000 +++ scim-tomoe-0.5.0/configure.ac 2007-02-07 15:30:49.000000000 +1000 @@ -101,7 +101,7 @@ SCIM_DATADIR=`$PKG_CONFIG --variable=scimdatadir scim` SCIM_ICONDIR=`$PKG_CONFIG --variable=icondir scim` SCIM_MODULEDIR=`$PKG_CONFIG --variable=moduledir scim` -SCIM_LIBEXECDIR=`$PKG_CONFIG --variable=moduledir scim` +SCIM_LIBEXECDIR=`$PKG_CONFIG --variable=moduledir scim`/.. if test "x$SCIM_DATADIR" = "x"; then SCIM_DATADIR=${datadir}/scim From fedora-extras-commits at redhat.com Wed Feb 7 07:53:28 2007 From: fedora-extras-commits at redhat.com (Kai Engert (kengert)) Date: Wed, 7 Feb 2007 02:53:28 -0500 Subject: rpms/seamonkey/devel firefox-1.5-dnd-nograb.patch, NONE, 1.1 firefox-1.5-embedwindow-visibility.patch, NONE, 1.1 firefox-1.5-pango-cursor-position.patch, NONE, 1.1 firefox-1.5-theme-change.patch, NONE, 1.1 firefox-2.0-link-layout.patch, NONE, 1.1 firefox-2.0-pango-printing.patch, NONE, 1.1 mozilla-nspr-packages.patch, 1.1, 1.2 seamonkey-fedora-home-page.patch, 1.1, 1.2 seamonkey.spec, 1.15, 1.16 Message-ID: <200702070753.l177rSxQ001467@cvs-int.fedora.redhat.com> Author: kengert Update of /cvs/extras/rpms/seamonkey/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1422 Modified Files: mozilla-nspr-packages.patch seamonkey-fedora-home-page.patch seamonkey.spec Added Files: firefox-1.5-dnd-nograb.patch firefox-1.5-embedwindow-visibility.patch firefox-1.5-pango-cursor-position.patch firefox-1.5-theme-change.patch firefox-2.0-link-layout.patch firefox-2.0-pango-printing.patch Log Message: * Wed Feb 07 2007 Kai Engert 1.1-1 - Update to SeaMonkey 1.1 - Pull in patches used by Firefox Fedora RPM package. - Fix the DND implementation to not grab, so it works with new GTK+. - Fix upgrade path from FC-5 by obsoleting the seamonkey subset packages which recently obsoleted mozilla in FC-5. firefox-1.5-dnd-nograb.patch: --- NEW FILE firefox-1.5-dnd-nograb.patch --- See https://bugzilla.mozilla.org/show_bug.cgi?id=367203 Index: mozilla/widget/src/gtk2/nsDragService.cpp =================================================================== RCS file: /cvsroot/mozilla/widget/src/gtk2/nsDragService.cpp,v retrieving revision 1.9.10.1 diff -d -u -p -r1.9.10.1 nsDragService.cpp --- mozilla/widget/src/gtk2/nsDragService.cpp 22 Jun 2006 21:37:45 -0000 1.9.10.1 +++ mozilla/widget/src/gtk2/nsDragService.cpp 31 Jan 2007 04:27:43 -0000 @@ -799,7 +799,6 @@ nsDragService::IsTargetContextList(void) void nsDragService::GetTargetDragData(GdkAtom aFlavor) { - gtk_grab_add(mHiddenWidget); PR_LOG(sDragLm, PR_LOG_DEBUG, ("getting data flavor %d\n", aFlavor)); PR_LOG(sDragLm, PR_LOG_DEBUG, ("mLastWidget is %p and mLastContext is %p\n", mTargetWidget, mTargetDragContext)); @@ -817,7 +816,6 @@ nsDragService::GetTargetDragData(GdkAtom gtk_main_iteration(); } PR_LOG(sDragLm, PR_LOG_DEBUG, ("finished inner iteration\n")); - gtk_grab_remove(mHiddenWidget); } void firefox-1.5-embedwindow-visibility.patch: --- NEW FILE firefox-1.5-embedwindow-visibility.patch --- Index: embedding/browser/gtk/src/EmbedWindow.cpp =================================================================== RCS file: /cvsroot/mozilla/embedding/browser/gtk/src/EmbedWindow.cpp,v retrieving revision 1.31 diff -d -u -p -r1.31 EmbedWindow.cpp --- embedding/browser/gtk/src/EmbedWindow.cpp 17 Jan 2005 17:19:39 -0000 1.31 +++ embedding/browser/gtk/src/EmbedWindow.cpp 27 Sep 2006 00:41:38 -0000 @@ -359,7 +359,14 @@ EmbedWindow::GetSiteWindow(void **aSiteW NS_IMETHODIMP EmbedWindow::GetVisibility(PRBool *aVisibility) { - *aVisibility = mVisibility; + // XXX See bug 312998 + // Work around the problem that sometimes the window + // is already visible even though mVisibility isn't true + // yet. + *aVisibility = mVisibility || + (!mOwner->mIsChrome && + mOwner->mOwningWidget && + GTK_WIDGET_MAPPED(mOwner->mOwningWidget)); return NS_OK; } firefox-1.5-pango-cursor-position.patch: --- NEW FILE firefox-1.5-pango-cursor-position.patch --- Index: mozilla/gfx/src/gtk/nsFontMetricsPango.cpp =================================================================== RCS file: /cvsroot/mozilla/gfx/src/gtk/nsFontMetricsPango.cpp,v retrieving revision 1.24 diff -d -u -p -6 -r1.24 nsFontMetricsPango.cpp --- mozilla/gfx/src/gtk/nsFontMetricsPango.cpp 25 Aug 2006 01:02:34 -0000 1.24 +++ mozilla/gfx/src/gtk/nsFontMetricsPango.cpp 6 Sep 2006 07:01:49 -0000 @@ -948,13 +948,12 @@ nsFontMetricsPango::GetClusterInfo(const PRInt32 nsFontMetricsPango::GetPosition(const PRUnichar *aText, PRUint32 aLength, nsPoint aPt) { int trailing = 0; int inx = 0; - gboolean found = FALSE; const gchar *curChar; PRInt32 retval = 0; float f = mDeviceContext->AppUnitsToDevUnits(); PangoLayout *layout = pango_layout_new(mPangoContext); @@ -974,28 +973,18 @@ nsFontMetricsPango::GetPosition(const PR } // Set up the pango layout pango_layout_set_text(layout, text, strlen(text)); FixupSpaceWidths(layout, text); - found = pango_layout_xy_to_index(layout, localX, localY, - &inx, &trailing); + pango_layout_xy_to_index(layout, localX, localY, + &inx, &trailing); // Convert the index back to the utf-16 index curChar = text; - // Jump to the end if it's not found. - if (!found) { - if (inx == 0) - retval = 0; - else if (trailing) - retval = aLength; - - goto loser; - } - for (PRUint32 curOffset=0; curOffset < aLength; curOffset++, curChar = g_utf8_find_next_char(curChar, NULL)) { // Check for a match before checking for a surrogate pair if (curChar - text == inx) { retval = curOffset; firefox-1.5-theme-change.patch: --- NEW FILE firefox-1.5-theme-change.patch --- Index: layout/base/nsPresContext.cpp =================================================================== RCS file: /cvsroot/mozilla/layout/base/nsPresContext.cpp,v retrieving revision 3.288.12.2.4.1 diff -d -u -p -r3.288.12.2.4.1 nsPresContext.cpp --- layout/base/nsPresContext.cpp 21 Apr 2006 23:30:50 -0000 3.288.12.2.4.1 +++ layout/base/nsPresContext.cpp 26 Sep 2006 19:26:40 -0000 @@ -73,6 +73,9 @@ #include "nsIDOMDocument.h" #include "nsAutoPtr.h" #include "nsEventStateManager.h" +#include "nsIEventQueue.h" +#include "nsIEventQueueService.h" + #ifdef IBMBIDI #include "nsBidiPresUtils.h" #endif // IBMBIDI @@ -267,6 +270,7 @@ nsPresContext::~nsPresContext() NS_IF_RELEASE(mDeviceContext); NS_IF_RELEASE(mLookAndFeel); NS_IF_RELEASE(mLangGroup); + NS_IF_RELEASE(mEventQueueService); } NS_IMPL_ISUPPORTS2(nsPresContext, nsPresContext, nsIObserver) @@ -285,6 +289,17 @@ static const char* const kGenericFont[] ".fantasy." }; +// Set to true when LookAndFeelChanged needs to be called. This is used +// because the look and feel is a service, so there's no need to notify it from +// more than one prescontext. +static PRBool sLookAndFeelChanged; + +// Set to true when ThemeChanged needs to be called on mTheme. This is used +// because mTheme is a service, so there's no need to notify it from more than +// one prescontext. +static PRBool sThemeChanged; + + void nsPresContext::GetFontPreferences() { @@ -709,6 +724,9 @@ nsPresContext::Init(nsIDeviceContext* aD this); #endif + rv = CallGetService(NS_EVENTQUEUESERVICE_CONTRACTID, &mEventQueueService); + NS_ENSURE_SUCCESS(rv, rv); + // Initialize our state from the user preferences GetUserPreferences(); @@ -1180,33 +1198,126 @@ nsPresContext::GetTheme() void nsPresContext::ThemeChanged() { + if (!mPendingThemeChanged) { + sLookAndFeelChanged = PR_TRUE; + sThemeChanged = PR_TRUE; + + nsCOMPtr eventQ; + mEventQueueService-> + GetSpecialEventQueue(nsIEventQueueService::UI_THREAD_EVENT_QUEUE, + getter_AddRefs(eventQ)); + if (!eventQ) { + return; + } + + PLEvent* evt = new PLEvent(); + if (!evt) { + return; + } + + PL_InitEvent(evt, this, nsPresContext::ThemeChangedInternal, + nsPresContext::DestroyThemeChangeEvt); + + // After this point, event destruction will release |this| + NS_ADDREF_THIS(); + + nsresult rv = eventQ->PostEvent(evt); + if (NS_FAILED(rv)) { + PL_DestroyEvent(evt); + } else { + mPendingThemeChanged = PR_TRUE; + } + } +} + +void* PR_CALLBACK +nsPresContext::ThemeChangedInternal(PLEvent *aEvent) +{ + nsPresContext* pc = NS_STATIC_CAST(nsPresContext*, aEvent->owner); + + pc->mPendingThemeChanged = PR_FALSE; + // Tell the theme that it changed, so it can flush any handles to stale theme // data. - if (mTheme) - mTheme->ThemeChanged(); + if (pc->mTheme && sThemeChanged) { + pc->mTheme->ThemeChanged(); + sThemeChanged = PR_FALSE; + } // Clear all cached nsILookAndFeel colors. - if (mLookAndFeel) - mLookAndFeel->LookAndFeelChanged(); + if (pc->mLookAndFeel && sLookAndFeelChanged) { + pc->mLookAndFeel->LookAndFeelChanged(); + sLookAndFeelChanged = PR_FALSE; + } // We have to clear style data because the assumption of style rule // immutability has been violated since any style rule that uses // system colors or fonts (and probably -moz-appearance as well) has // changed. - nsPresContext::ClearStyleDataAndReflow(); + pc->ClearStyleDataAndReflow(); + + return nsnull; +} + + +void PR_CALLBACK +nsPresContext::DestroyThemeChangeEvt(PLEvent* aEvent) +{ + nsPresContext* pc = NS_STATIC_CAST(nsPresContext*, aEvent->owner); + NS_RELEASE(pc); + delete aEvent; } void nsPresContext::SysColorChanged() { - if (mLookAndFeel) { + if (!mPendingSysColorChanged) { + sLookAndFeelChanged = PR_TRUE; + + nsCOMPtr eventQ; + mEventQueueService-> + GetSpecialEventQueue(nsIEventQueueService::UI_THREAD_EVENT_QUEUE, + getter_AddRefs(eventQ)); + if (!eventQ) { + return; + } + + PLEvent* evt = new PLEvent(); + if (!evt) { + return; + } + + PL_InitEvent(evt, this, nsPresContext::SysColorChangedInternal, + nsPresContext::DestroySysColorChangeEvt); + + // After this point, event destruction will release |this| + NS_ADDREF_THIS(); + + nsresult rv = eventQ->PostEvent(evt); + if (NS_FAILED(rv)) { + PL_DestroyEvent(evt); + } else { + mPendingSysColorChanged = PR_TRUE; + } + } +} + +void* PR_CALLBACK +nsPresContext::SysColorChangedInternal(PLEvent *aEvent) +{ + nsPresContext* pc = NS_STATIC_CAST(nsPresContext*, aEvent->owner); + + pc->mPendingSysColorChanged = PR_FALSE; + + if (pc->mLookAndFeel && sLookAndFeelChanged) { // Don't use the cached values for the system colors - mLookAndFeel->LookAndFeelChanged(); + pc->mLookAndFeel->LookAndFeelChanged(); + sLookAndFeelChanged = PR_FALSE; } - + // Reset default background and foreground colors for the document since // they may be using system colors - GetDocumentColorPreferences(); + pc->GetDocumentColorPreferences(); // Clear out all of the style data since it may contain RGB values // which originated from system colors. @@ -1222,7 +1333,17 @@ nsPresContext::SysColorChanged() // data without reflowing/updating views will lead to incorrect change hints // later, because when generating change hints, any style structs which have // been cleared and not reread are assumed to not be used at all. - ClearStyleDataAndReflow(); + pc->ClearStyleDataAndReflow(); + + return nsnull; +} + +void PR_CALLBACK +nsPresContext::DestroySysColorChangeEvt(PLEvent* aEvent) +{ + nsPresContext* pc = NS_STATIC_CAST(nsPresContext*, aEvent->owner); + NS_RELEASE(pc); + delete aEvent; } void Index: layout/base/nsPresContext.h =================================================================== RCS file: /cvsroot/mozilla/layout/base/nsPresContext.h,v retrieving revision 3.150.4.2 diff -d -u -p -r3.150.4.2 nsPresContext.h --- layout/base/nsPresContext.h 29 Aug 2005 16:15:39 -0000 3.150.4.2 +++ layout/base/nsPresContext.h 26 Sep 2006 19:26:40 -0000 @@ -56,6 +56,7 @@ #include "nsCRT.h" #include "nsIPrintSettings.h" #include "nsPropertyTable.h" +#include "plevent.h" #ifdef IBMBIDI class nsBidiPresUtils; #endif // IBMBIDI @@ -76,6 +77,7 @@ class nsIAtom; class nsIEventStateManager; class nsIURI; class nsILookAndFeel; +class nsIEventQueueService; class nsICSSPseudoComparator; class nsIAtom; struct nsStyleStruct; @@ -627,6 +629,14 @@ public: const nscoord* GetBorderWidthTable() { return mBorderWidthTable; } protected: + static NS_HIDDEN_(void*) PR_CALLBACK ThemeChangedInternal(PLEvent* aEvent); + static NS_HIDDEN_(void*) PR_CALLBACK SysColorChangedInternal(PLEvent* aEvent); + static NS_HIDDEN_(void) PR_CALLBACK DestroyThemeChangeEvt(PLEvent* aEvent); + static NS_HIDDEN_(void) PR_CALLBACK DestroySysColorChangeEvt(PLEvent* aEvent); + + friend void* PR_CALLBACK ThemeChangedInternal(PLEvent* aEvent); + friend void* PR_CALLBACK SysColorChangedInternal(PLEvent* aEvent); + NS_HIDDEN_(void) SetImgAnimations(nsIContent *aParent, PRUint16 aMode); NS_HIDDEN_(void) GetDocumentColorPreferences(); @@ -654,6 +664,7 @@ protected: // from gfx back to layout. nsIEventStateManager* mEventManager; // [STRONG] nsILookAndFeel* mLookAndFeel; // [STRONG] + nsIEventQueueService *mEventQueueService; // [STRONG] nsIAtom* mMedium; // initialized by subclass ctors; // weak pointer to static atom @@ -724,6 +735,8 @@ protected: unsigned mCanPaginatedScroll : 1; unsigned mDoScaledTwips : 1; unsigned mEnableJapaneseTransform : 1; + unsigned mPendingSysColorChanged : 1; + unsigned mPendingThemeChanged : 1; #ifdef IBMBIDI unsigned mIsVisual : 1; unsigned mIsBidiSystem : 1; firefox-2.0-link-layout.patch: --- NEW FILE firefox-2.0-link-layout.patch --- Index: mozilla/layout/build/Makefile.in =================================================================== RCS file: /cvsroot/mozilla/layout/build/Makefile.in,v retrieving revision 1.127.8.7 diff -d -u -p -r1.127.8.7 Makefile.in --- mozilla/layout/build/Makefile.in 17 Jul 2006 19:05:13 -0000 1.127.8.7 +++ mozilla/layout/build/Makefile.in 10 Oct 2006 04:29:16 -0000 @@ -240,6 +240,11 @@ EXTRA_DSO_LDOPTS += \ $(NULL) endif +# Add explicit X11 dependency when building against X11 toolkits +ifneq (,$(filter gtk gtk2 qt xlib,$(MOZ_WIDGET_TOOLKIT))) +EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) -lXrender +endif + include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES += -I$(srcdir)/../base \ firefox-2.0-pango-printing.patch: --- NEW FILE firefox-2.0-pango-printing.patch --- Patch for Firefox 1.5.0.7 to add support for printing via Pango. This also implements printing MathML via Pango, and prints bitmap fonts too. Authors: Behdad Esfahbod Chris Blizzard Akira TAGOH Index: gfx/src/freetype/nsFreeType.cpp =================================================================== RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.cpp,v retrieving revision 1.28 diff -u -p -d -r1.28 nsFreeType.cpp --- gfx/src/freetype/nsFreeType.cpp 13 Jul 2005 18:21:10 -0000 1.28 +++ gfx/src/freetype/nsFreeType.cpp 23 Oct 2006 17:37:09 -0000 @@ -123,6 +123,8 @@ FtFuncList nsFreeType2::FtFuncs [] = { // #endif {"FT_Get_First_Char", NS_FT2_OFFSET(nsFT_Get_First_Char), PR_FALSE}, {"FT_Get_Next_Char", NS_FT2_OFFSET(nsFT_Get_Next_Char), PR_FALSE}, + {"FT_Has_PS_Glyph_Names", NS_FT2_OFFSET(nsFT_Has_PS_Glyph_Names), PR_FALSE}, + {"FT_Get_Glyph_Name", NS_FT2_OFFSET(nsFT_Get_Glyph_Name), PR_TRUE}, {nsnull, 0, 0} }; @@ -388,6 +390,22 @@ nsFreeType2::GetNextChar(FT_Face face, F } NS_IMETHODIMP +nsFreeType2::HasPSGlyphNames(FT_Face face, FT_Int *result) +{ + // call the FreeType2 function via the function pointer + *result = nsFT_Has_PS_Glyph_Names(face); + return NS_OK; +} + +NS_IMETHODIMP +nsFreeType2::GetGlyphName(FT_Face face, FT_UInt glyph_index, FT_Pointer buffer, FT_UInt buffer_max) +{ + // call the FreeType2 function via the function pointer + FT_Error error = nsFT_Get_Glyph_Name(face, glyph_index, buffer, buffer_max); + return error ? NS_ERROR_FAILURE : NS_OK; +} + +NS_IMETHODIMP nsFreeType2::SupportsExtFunc(PRBool *res) { *res = gHasExtFunc; Index: gfx/src/freetype/nsFreeType.h =================================================================== RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.h,v retrieving revision 1.18 diff -u -p -d -r1.18 nsFreeType.h --- gfx/src/freetype/nsFreeType.h 1 May 2005 17:36:19 -0000 1.18 +++ gfx/src/freetype/nsFreeType.h 23 Oct 2006 17:37:09 -0000 @@ -52,6 +52,7 @@ #include FT_CACHE_H #include FT_CACHE_IMAGE_H #include FT_TRUETYPE_TABLES_H +#include FT_TYPE1_TABLES_H #include "nsIFreeType2.h" typedef struct FT_FaceRec_* FT_Face; @@ -138,6 +139,8 @@ typedef FT_Error (*FT_Glyph_To_Bitmap_t) typedef FT_ULong (*FT_Get_First_Char_t)(FT_Face, FT_UInt*); typedef FT_ULong (*FT_Get_Next_Char_t)(FT_Face, FT_ULong, FT_UInt*); +typedef FT_Int (*FT_Has_PS_Glyph_Names_t)(FT_Face); +typedef FT_Error (*FT_Get_Glyph_Name_t)(FT_Face, FT_UInt, FT_Pointer, FT_UInt); class nsFreeTypeFace; @@ -193,11 +196,13 @@ protected: // #endif FT_Get_First_Char_t nsFT_Get_First_Char; FT_Get_Next_Char_t nsFT_Get_Next_Char; + FT_Has_PS_Glyph_Names_t nsFT_Has_PS_Glyph_Names; + FT_Get_Glyph_Name_t nsFT_Get_Glyph_Name; // this array needs to be big enough to hold all the function pointers // plus one extra for the null at the end // #ifdef MOZ_SVG - static FtFuncList FtFuncs[24]; + static FtFuncList FtFuncs[28]; // #else // static FtFuncList FtFuncs[20]; // #endif Index: gfx/src/ps/Makefile.in =================================================================== RCS file: /cvsroot/mozilla/gfx/src/ps/Makefile.in,v retrieving revision 1.57.8.1 diff -d -u -p -r1.57.8.1 Makefile.in --- gfx/src/ps/Makefile.in 17 Jun 2006 15:16:14 -0000 1.57.8.1 +++ gfx/src/ps/Makefile.in 24 Oct 2006 18:36:45 -0000 @@ -98,6 +98,15 @@ EXTRA_DSO_LDOPTS = \ $(MOZ_UNICHARUTIL_LIBS) \ $(NULL) +ifdef MOZ_ENABLE_PANGO +CPPSRCS += \ + nsFontMetricsPSPango.cpp \ + mozilla-ps-decoder.cpp +EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS) +CXXFLAGS += $(MOZ_PANGO_CFLAGS) +CFLAGS += $(MOZ_PANGO_CFLAGS) +endif + ifdef MOZ_ENABLE_XFT EXTRA_DSO_LDOPTS += \ $(MOZ_XFT_LIBS) \ @@ -105,7 +114,7 @@ EXTRA_DSO_LDOPTS += \ $(NULL) endif -ifneq (,$(MOZ_ENABLE_FREETYPE2)$(MOZ_ENABLE_XFT)) +ifneq (,$(MOZ_ENABLE_FREETYPE2)$(MOZ_ENABLE_XFT)$(MOZ_ENABLE_PANGO)) CPPSRCS += \ nsType1.cpp \ $(NULL) Index: gfx/src/ps/mozilla-ps-decoder.cpp =================================================================== RCS file: gfx/src/ps/mozilla-ps-decoder.cpp diff -N gfx/src/ps/mozilla-ps-decoder.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gfx/src/ps/mozilla-ps-decoder.cpp 23 Oct 2006 17:37:10 -0000 @@ -0,0 +1,376 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: + */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is mozilla.org code. + * + * The Initial Developer of the Original Code is Christopher Blizzard + * . Portions created by the Initial Developer + * are Copyright (C) 2004 the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#define PANGO_ENABLE_BACKEND +#define PANGO_ENABLE_ENGINE + +#include "mozilla-ps-decoder.h" +#include +#include + +#include "nsString.h" +#include "nsIPersistentProperties2.h" +#include "nsNetUtil.h" +#include "nsReadableUtils.h" +#include "nsICharsetConverterManager.h" +#include "nsICharRepresentable.h" +#include "nsCompressedCharMap.h" + +#undef DEBUG_CUSTOM_ENCODER + +G_DEFINE_TYPE (MozillaPSDecoder, mozilla_ps_decoder, PANGO_TYPE_FC_DECODER) + +MozillaPSDecoder *mozilla_ps_decoder_new (void); + +static FcCharSet *mozilla_ps_decoder_get_charset (PangoFcDecoder *decoder, + PangoFcFont *fcfont); +static PangoGlyph mozilla_ps_decoder_get_glyph (PangoFcDecoder *decoder, + PangoFcFont *fcfont, + guint32 wc); + +static PangoFcDecoder *mozilla_find_ps_decoder (FcPattern *pattern, + gpointer user_data); + +typedef struct _MozillaPSDecoderPrivate MozillaPSDecoderPrivate; + +#define MOZILLA_PS_DECODER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), MOZILLA_TYPE_DECODER, MozillaPSDecoderPrivate)) + +struct _MozillaPSDecoderPrivate { [...4195 lines suppressed...] + + PRUint32 len = aLen; + PRUint32 i; + if (len < 10) { // Add a small set of characters to the subset of the user // defined font to produce to make sure the font ends up @@ -584,25 +682,47 @@ outputType1SubFont(nsIFreeType2 *aFt2, F // XXX : need to check if this is true of type 1 fonts as well. // I suspect it's only the case of CID-keyed fonts (type 9) we used to // generate. - charIDstr.AppendLiteral("1234567890"); + for (i = 1; i <= 10; i++) { + glyphs.AppendValue(i); + } len += 10; } - const PRUnichar *charIDs = charIDstr.get(); - - PRUint32 i; + FT_Int has_glyph_name; +#if defined (MOZ_ENABLE_XFT) || defined (MOZ_ENABLE_PANGO) + has_glyph_name = FT_Has_PS_Glyph_Names(aFace); +#else + has_glyph_name = aFt2->hasPSGlyphNames(aFace); +#endif // construct an Encoding vector : the 0th element // is /.notdef - fputs("/Encoding [\n/.notdef\n", aFile); - for (i = 0; i < len; ++i) { - fprintf(aFile, "/uni%04X", charIDs[i]); - if (i % 8 == 7) fputc('\n', aFile); + fputs("/Encoding [\n/.notdef", aFile); + for (i = aOffset; i < aOffset + aLen; ++i) { + nsCString name; + char buffer[256]; + + if (glyphs.ValueAt(i) == 0) { + name = "/.notdef"; + } else if (!has_glyph_name || +#if defined (MOZ_ENABLE_XFT) || defined (MOZ_ENABLE_PANGO) + FT_Get_Glyph_Name(aFace, glyphs.ValueAt(i), buffer, 255) != FT_Err_Ok +#else + NS_FAILED(aFt2->getGlyphName(aFace, glyphs.ValueAt(i), buffer, 255)) +#endif + ) { + name = nsPrintfCString(256, "/idx%04X", glyphs.ValueAt(i)); + } else { + name = nsPrintfCString(256, "/%s", buffer); + } + glyphnames.AppendCString(name); + fprintf(aFile, name.get()); + if ((i-aOffset) % 8 == 6) fputc('\n', aFile); } - for (i = len; i < 255; ++i) { + for (i = PR_MAX (0, 255 - int(aLen)); i; --i) { fputs("/.notdef", aFile); - if (i % 8 == 7) fputc('\n', aFile); + if (i % 8 == 1) fputc('\n', aFile); } fputs("] def\n", aFile); @@ -630,23 +750,21 @@ outputType1SubFont(nsIFreeType2 *aFt2, F // get the maximum charstring length without actually filling up the buffer PRInt32 charStringLen; PRInt32 maxCharStringLen = -#ifdef MOZ_ENABLE_XFT +#if defined(MOZ_ENABLE_XFT) || defined(MOZ_ENABLE_PANGO) FT2GlyphToType1CharString(aFace, 0, aWmode, aLenIV, nsnull); #else FT2GlyphToType1CharString(aFt2, aFace, 0, aWmode, aLenIV, nsnull); #endif - PRUint32 glyphID; - - for (i = 0; i < len; i++) { -#ifdef MOZ_ENABLE_XFT - glyphID = FT_Get_Char_Index(aFace, charIDs[i]); + for (i = aOffset; i < aOffset + aLen; i++) { +#if defined(MOZ_ENABLE_XFT) || defined(MOZ_ENABLE_PANGO) charStringLen = - FT2GlyphToType1CharString(aFace, glyphID, aWmode, aLenIV, nsnull); + FT2GlyphToType1CharString(aFace, glyphs.ValueAt(i), aWmode, aLenIV, + nsnull); #else - aFt2->GetCharIndex(aFace, charIDs[i], &glyphID); charStringLen = - FT2GlyphToType1CharString(aFt2, aFace, glyphID, aWmode, aLenIV, nsnull); + FT2GlyphToType1CharString(aFt2, aFace, glyphs.ValueAt(i), aWmode, aLenIV, + nsnull); #endif if (charStringLen > maxCharStringLen) @@ -666,7 +784,7 @@ outputType1SubFont(nsIFreeType2 *aFt2, F len + 1).get()); // output the notdef glyph -#ifdef MOZ_ENABLE_XFT +#if defined(MOZ_ENABLE_XFT) || defined(MOZ_ENABLE_PANGO) charStringLen = FT2GlyphToType1CharString(aFace, 0, aWmode, aLenIV, charString.get()); #else @@ -676,22 +794,20 @@ outputType1SubFont(nsIFreeType2 *aFt2, F // enclose charString with "/.notdef RD ..... ND" charStringOut(aFile, &pos, &key, NS_REINTERPRET_CAST(const char*, charString.get()), - charStringLen, 0); + charStringLen, "/.notdef"); // output the charstrings for each glyph in this sub font - for (i = 0; i < len; i++) { -#ifdef MOZ_ENABLE_XFT - glyphID = FT_Get_Char_Index(aFace, charIDs[i]); - charStringLen = FT2GlyphToType1CharString(aFace, glyphID, aWmode, + for (i = aOffset; i < aOffset + aLen; i++) { +#if defined(MOZ_ENABLE_XFT) || defined(MOZ_ENABLE_PANGO) + charStringLen = FT2GlyphToType1CharString(aFace, glyphs.ValueAt(i), aWmode, aLenIV, charString.get()); #else - aFt2->GetCharIndex(aFace, charIDs[i], &glyphID); - charStringLen = FT2GlyphToType1CharString(aFt2, aFace, glyphID, aWmode, - aLenIV, charString.get()); + charStringLen = FT2GlyphToType1CharString(aFt2, aFace, glyphs.ValueAt(i), + aWmode, aLenIV, charString.get()); #endif charStringOut(aFile, &pos, &key, NS_REINTERPRET_CAST(const char*, charString.get()), - charStringLen, charIDs[i]); + charStringLen, glyphnames.CStringAt(i - aOffset)->get()); } // wrap up the encrypted part of the font definition @@ -753,15 +869,12 @@ void encryptAndHexOut(FILE *aFile, PRUin /* static */ void charStringOut(FILE* aFile, PRUint32* aPos, PRUint16* aKey, - const char *aStr, PRUint32 aLen, PRUnichar aId) + const char *aStr, PRUint32 aLen, const char *aGlyphName) { // use a local buffer instead of nsPrintfCString to avoid alloc. char buf[30]; int oLen; - if (aId == 0) - oLen = PR_snprintf(buf, 30, "/.notdef %d RD ", aLen); - else - oLen = PR_snprintf(buf, 30, "/uni%04X %d RD ", aId, aLen); + oLen = PR_snprintf(buf, 30, "%s %d RD ", aGlyphName, aLen); if (oLen >= 30) { NS_WARNING("buffer size exceeded. charstring will be truncated"); Index: gfx/src/ps/nsType1.h =================================================================== RCS file: /cvsroot/mozilla/gfx/src/ps/nsType1.h,v retrieving revision 1.5 diff -u -p -d -r1.5 nsType1.h --- gfx/src/ps/nsType1.h 4 Mar 2005 07:39:27 -0000 1.5 +++ gfx/src/ps/nsType1.h 23 Oct 2006 17:37:39 -0000 @@ -122,8 +122,9 @@ FT_Error FT2GlyphToType1CharString(nsIFr class nsString; class nsCString; +class nsValueArray; -PRBool FT2SubsetToType1FontSet(FT_Face aFace, const nsString& aSubset, +PRBool FT2SubsetToType1FontSet(FT_Face aFace, nsValueArray *aGlyphSubset, int aWmode, FILE *aFile); nsresult FT2ToType1FontName(FT_Face aFace, int aWmode, nsCString& aFontName); Index: config/system-headers =================================================================== --- config/system-headers 2006-10-26 12:21:39.000000000 -0400 +++ config/system-headers 2006-10-26 12:23:29.000000000 -0400 @@ -199,6 +199,7 @@ freetype/ftoutln.h freetype/ttnameid.h freetype/tttables.h +freetype/t1tables.h fribidi/fribidi.h FSp_fopen.h fstream.h @@ -208,6 +209,7 @@ gdk/gdkevents.h gdk/gdk.h gdk/gdkkeysyms.h +gdk/gdkpango.h gdk/gdkprivate.h gdk/gdkregion.h gdk/gdkwindow.h @@ -501,6 +503,7 @@ pango/pangofc-fontmap.h pango/pango-fontmap.h pango/pango.h +pango/pangoft2.h pango/pangoxft.h pango/pangox.h pango-types.h mozilla-nspr-packages.patch: Index: mozilla-nspr-packages.patch =================================================================== RCS file: /cvs/extras/rpms/seamonkey/devel/mozilla-nspr-packages.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mozilla-nspr-packages.patch 10 Apr 2006 21:58:25 -0000 1.1 +++ mozilla-nspr-packages.patch 7 Feb 2007 07:52:56 -0000 1.2 @@ -1,7 +1,10 @@ ---- mozilla/xpinstall/packager/packages-unix.smp5 2005-12-22 16:29:39.000000000 +0100 -+++ mozilla/xpinstall/packager/packages-unix 2006-01-21 09:03:04.000000000 +0100 -@@ -45,9 +45,6 @@ +--- mozilla/xpinstall/packager/packages-unix.nsprpack 2007-02-07 04:21:44.000000000 +0100 ++++ mozilla/xpinstall/packager/packages-unix 2007-02-07 04:29:55.000000000 +0100 +@@ -42,12 +42,8 @@ + bin/defaults/messenger/SpamCatcher.sfd + bin/defaults/messenger/SpamPal.sfd +- [xpcom] bin/libmozjs.so -bin/libnspr4.so @@ -10,7 +13,19 @@ bin/cpu/sparcv8plus/libnspr_flt4.so bin/libxpcom.so bin/libxpcom_core.so -@@ -463,18 +460,13 @@ +@@ -58,6 +54,11 @@ + bin/libxpcom_compat.so + bin/components/libxpcom_compat_c.so + ++[nspr] ++bin/libnspr4.so ++bin/libplc4.so ++bin/libplds4.so ++ + [browser] + bin/seamonkey + bin/seamonkey-bin +@@ -469,13 +470,17 @@ bin/components/talkback/* [psm] @@ -21,29 +36,20 @@ bin/components/pipnss.xpt bin/components/libpippki.so bin/components/pippki.xpt --bin/libnss3.so --bin/libsmime3.so - bin/libsoftokn3.chk --bin/libsoftokn3.so --bin/libssl3.so - bin/chrome/pipnss.jar - bin/chrome/pippki.jar - ; These are required for solaris 32-bit builds -@@ -499,5 +491,17 @@ - bin/components/spellchecker.xpt - bin/components/myspell/* - -+[nspr] -+bin/libnspr4.so -+bin/libplc4.so -+bin/libplds4.so ++bin/chrome/pipnss.jar ++bin/chrome/pippki.jar + +[nss] +bin/libnssckbi.so -+bin/libnss3.so -+bin/libsmime3.so -+bin/libsoftokn3.so -+bin/libssl3.so -+ - [reporter] - bin/chrome/reporter.jar + bin/libnss3.so + bin/libsmime3.so + bin/libsoftokn3.chk +@@ -493,8 +498,6 @@ + bin/libfreebl_64int_3.chk + bin/libfreebl_64int_3.so + bin/libssl3.so +-bin/chrome/pipnss.jar +-bin/chrome/pippki.jar + + [inspector] + bin/components/inspector-cmdline.js seamonkey-fedora-home-page.patch: Index: seamonkey-fedora-home-page.patch =================================================================== RCS file: /cvs/extras/rpms/seamonkey/devel/seamonkey-fedora-home-page.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- seamonkey-fedora-home-page.patch 10 Apr 2006 21:58:25 -0000 1.1 +++ seamonkey-fedora-home-page.patch 7 Feb 2007 07:52:56 -0000 1.2 @@ -1,13 +1,13 @@ ---- mozilla/xpfe/browser/resources/locale/en-US/region.properties.smp4 2005-12-05 13:43:59.000000000 +0100 -+++ mozilla/xpfe/browser/resources/locale/en-US/region.properties 2006-01-21 08:58:49.000000000 +0100 +--- mozilla/xpfe/browser/resources/locale/en-US/region.properties.regprop 2007-02-07 04:51:18.000000000 +0100 ++++ mozilla/xpfe/browser/resources/locale/en-US/region.properties 2007-02-07 04:52:01.000000000 +0100 @@ -1,5 +1,5 @@ # navigator.properties -homePageDefault=http://www.mozilla.org/ +homePageDefault=file:///usr/share/doc/HTML/index.html - shopKeyword=keyword:shop [Product] - quoteKeyword=keyword:quote [Enter symbol here] - localKeyword=keyword:zip [Your zip code] -@@ -11,7 +11,7 @@ + keywordList=http://home.netscape.com/escapes/keywords + webmailKeyword=http://webmail.netscape.com + fallbackDefaultSearchURL=http://www.google.com/search?q= +@@ -7,7 +7,7 @@ # # all.js # @@ -16,7 +16,7 @@ browser.throbber.url=http://www.mozilla.org/projects/seamonkey/ browser.search.defaulturl=http://www.google.com/search?q= general.useragent.contentlocale=US -@@ -21,4 +21,4 @@ +@@ -17,4 +17,4 @@ #config.js # Index: seamonkey.spec =================================================================== RCS file: /cvs/extras/rpms/seamonkey/devel/seamonkey.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- seamonkey.spec 23 Dec 2006 15:50:50 -0000 1.15 +++ seamonkey.spec 7 Feb 2007 07:52:56 -0000 1.16 @@ -10,7 +10,7 @@ Name: seamonkey Summary: Web browser, e-mail, news, IRC client, HTML editor -Version: 1.0.7 +Version: 1.1 Release: 1%{?dist} URL: http://www.mozilla.org/projects/seamonkey/ License: MPL @@ -31,20 +31,19 @@ Source100: find-external-requires Patch1: firefox-1.0-prdtoa.patch -Patch3: firefox-1.1-nss-system-nspr.patch -Patch4: firefox-1.5-with-system-nss.patch -Patch5: firefox-1.1-visibility.patch -Patch6: seamonkey-1.0.1-dumpstack.patch +Patch2: firefox-2.0-link-layout.patch Patch21: firefox-0.7.3-default-plugin-less-annoying.patch Patch22: firefox-0.7.3-psfonts.patch Patch42: firefox-1.1-uriloader.patch Patch81: firefox-1.5-nopangoxft.patch -Patch82: firefox-1.5-pango-mathml.patch -Patch91 : firefox-1.5-pango-ua.patch -Patch101: thunderbird-0.7.3-gnome-uriloader.patch +Patch83: firefox-1.5-pango-cursor-position.patch +Patch84: firefox-2.0-pango-printing.patch +Patch91: thunderbird-0.7.3-gnome-uriloader.patch +Patch101: firefox-1.5-embedwindow-visibility.patch +Patch102: firefox-1.5-theme-change.patch +Patch103: firefox-1.5-dnd-nograb.patch Patch220: seamonkey-fedora-home-page.patch Patch225: mozilla-nspr-packages.patch -Patch227: mozilla-1.4.1-ppc64.patch Patch301: mozilla-1.7.3-gnome-vfs-default-app.patch Patch304: mozilla-1.7.5-g-application-name.patch @@ -71,6 +70,12 @@ BuildRequires: fileutils BuildRequires: perl +Obsoletes: seamonkey-chat +Obsoletes: seamonkey-devel +Obsoletes: seamonkey-dom-inspector +Obsoletes: seamonkey-js-debugger +Obsoletes: seamonkey-mail + PreReq: desktop-file-utils >= %{desktop_file_utils_version} %global nspr_build_time_version %(nspr-config --version) @@ -106,27 +111,19 @@ %setup -q -n mozilla %patch1 -p0 -%patch3 -p1 -%patch4 -p1 - -# Pragma visibility is broken on most platforms for some reason. -# It works on i386 so leave it alone there. Disable elsewhere. -# See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20297 -%ifnarch i386 -%patch5 -p0 -%endif - -%patch6 -p1 +%patch2 -p1 %patch21 -p1 %patch22 -p1 %patch42 -p0 %patch81 -p1 -%patch82 -p1 -%patch91 -p0 -%patch101 -p1 -b .gnome-uriloader +%patch83 -p1 +%patch84 -p0 +%patch91 -p1 -b .gnome-uriloader +%patch101 -p0 -b .embedwindow-visibility +%patch102 -p0 -b .theme-change +%patch103 -p1 -b .dnd-nograb %patch220 -p1 %patch225 -p1 -%patch227 -p1 %patch301 -p1 %patch304 -p0 @@ -427,6 +424,12 @@ %changelog +* Wed Feb 07 2007 Kai Engert 1.1-1 +- Update to SeaMonkey 1.1 +- Pull in patches used by Firefox Fedora RPM package. +- Fix the DND implementation to not grab, so it works with new GTK+. +- Fix upgrade path from FC-5 by obsoleting the seamonkey subset + packages which recently obsoleted mozilla in FC-5. * Sat Dec 23 2006 Kai Engert 1.0.7-1 - SeaMonkey 1.0.7 * Fri Nov 10 2006 Kai Engert 1.0.6-2 From fedora-extras-commits at redhat.com Wed Feb 7 08:02:31 2007 From: fedora-extras-commits at redhat.com (Kai Engert (kengert)) Date: Wed, 7 Feb 2007 03:02:31 -0500 Subject: rpms/seamonkey/devel .cvsignore, 1.8, 1.9 seamonkey.spec, 1.16, 1.17 sources, 1.8, 1.9 Message-ID: <200702070802.l1782Vks004916@cvs-int.fedora.redhat.com> Author: kengert Update of /cvs/extras/rpms/seamonkey/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1534 Modified Files: .cvsignore seamonkey.spec sources Log Message: forgot to change .cvsignore / sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/seamonkey/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 23 Dec 2006 15:50:50 -0000 1.8 +++ .cvsignore 7 Feb 2007 08:01:59 -0000 1.9 @@ -1 +1 @@ -seamonkey-1.0.7.source.tar.bz2 +seamonkey-1.1.source.tar.bz2 Index: seamonkey.spec =================================================================== RCS file: /cvs/extras/rpms/seamonkey/devel/seamonkey.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- seamonkey.spec 7 Feb 2007 07:52:56 -0000 1.16 +++ seamonkey.spec 7 Feb 2007 08:01:59 -0000 1.17 @@ -11,7 +11,7 @@ Name: seamonkey Summary: Web browser, e-mail, news, IRC client, HTML editor Version: 1.1 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.mozilla.org/projects/seamonkey/ License: MPL Group: Applications/Internet @@ -424,7 +424,7 @@ %changelog -* Wed Feb 07 2007 Kai Engert 1.1-1 +* Wed Feb 07 2007 Kai Engert 1.1-2 - Update to SeaMonkey 1.1 - Pull in patches used by Firefox Fedora RPM package. - Fix the DND implementation to not grab, so it works with new GTK+. Index: sources =================================================================== RCS file: /cvs/extras/rpms/seamonkey/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 23 Dec 2006 15:50:50 -0000 1.8 +++ sources 7 Feb 2007 08:01:59 -0000 1.9 @@ -1 +1 @@ -d0137029a8cc6d8f21de12b0cb5bfff8 seamonkey-1.0.7.source.tar.bz2 +2d78434affe9e4499e3cfceae2d8522f seamonkey-1.1.source.tar.bz2 From fedora-extras-commits at redhat.com Wed Feb 7 08:28:34 2007 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 7 Feb 2007 03:28:34 -0500 Subject: rpms/aterm/FC-6 aterm-debuginfo.patch, NONE, 1.1 aterm.spec, 1.15, 1.16 Message-ID: <200702070828.l178SYuE005238@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/aterm/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5198/FC-6 Modified Files: aterm.spec Added Files: aterm-debuginfo.patch Log Message: - fix #227377 (debuginfo package) aterm-debuginfo.patch: --- NEW FILE aterm-debuginfo.patch --- --- configure.orig 2007-02-07 09:21:40.000000000 +0100 +++ configure 2007-02-07 09:21:58.000000000 +0100 @@ -3945,12 +3945,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - - -if test -n "`echo $CFLAGS' ' | grep '\-g ' 2> /dev/null`" ; then - CFLAGS=`echo "$CFLAGS " | sed "s/-g / /"` -fi - if test "x$GCC" = "xyes"; then if test -z "`echo $CFLAGS | grep '\-Wall' 2> /dev/null`" ; then CFLAGS="$CFLAGS -Wall" Index: aterm.spec =================================================================== RCS file: /cvs/extras/rpms/aterm/FC-6/aterm.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- aterm.spec 12 Sep 2006 06:43:51 -0000 1.15 +++ aterm.spec 7 Feb 2007 08:28:02 -0000 1.16 @@ -1,6 +1,6 @@ Name: aterm Version: 1.0.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Afterstep XVT, VT102 emulator for the X Window system Group: User Interface/X @@ -8,6 +8,7 @@ URL: http://aterm.sourceforge.net Source0: ftp://ftp.afterstep.org/apps/aterm/aterm-1.0.0.tar.bz2 Source1: aterm.desktop +Patch0: aterm-debuginfo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: desktop-file-utils @@ -17,16 +18,16 @@ BuildRequires: mesa-libGL-devel %description -aterm, version 1.00 is a colour vt102 terminal emulator, based on -rxvt 2.4.8 with Alfredo Kojima??s additions of fast transparency, -intended as an xterm(1) replacement for users who do not require fea- -tures such as Tektronix 4014 emulation and toolkit-style configurabil- -ity. As a result, aterm uses much less swap space -- a significant +aterm, version 1.00 is a colour vt102 terminal emulator, based on +rxvt 2.4.8 with Alfredo Kojima??s additions of fast transparency, +intended as an xterm(1) replacement for users who do not require fea- +tures such as Tektronix 4014 emulation and toolkit-style configurabil- +ity. As a result, aterm uses much less swap space -- a significant advantage on a machine serving many X sessions. %prep %setup -q - +%patch0 %build %configure --enable-fading --enable-background-image \ @@ -35,7 +36,6 @@ --enable-big5 --enable-greek --enable-ttygid \ --enable-xgetdefault --with-term=rxvt \ --x-includes=%{_includedir} --x-libraries=%{_libdir} - make %{?_smp_mflags} @@ -65,6 +65,10 @@ %changelog +* Wed Feb 07 2007 Andreas Bierfert +1.0.0-7 +- fix #227377 (debuginfo package) + * Tue Sep 12 2006 Andreas Bierfert 1.0.0-6 - FE6 rebuild From fedora-extras-commits at redhat.com Wed Feb 7 08:28:36 2007 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 7 Feb 2007 03:28:36 -0500 Subject: rpms/aterm/devel aterm-debuginfo.patch, NONE, 1.1 aterm.spec, 1.15, 1.16 Message-ID: <200702070828.l178SaJZ005241@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/aterm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5198/devel Modified Files: aterm.spec Added Files: aterm-debuginfo.patch Log Message: - fix #227377 (debuginfo package) aterm-debuginfo.patch: --- NEW FILE aterm-debuginfo.patch --- --- configure.orig 2007-02-07 09:21:40.000000000 +0100 +++ configure 2007-02-07 09:21:58.000000000 +0100 @@ -3945,12 +3945,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - - -if test -n "`echo $CFLAGS' ' | grep '\-g ' 2> /dev/null`" ; then - CFLAGS=`echo "$CFLAGS " | sed "s/-g / /"` -fi - if test "x$GCC" = "xyes"; then if test -z "`echo $CFLAGS | grep '\-Wall' 2> /dev/null`" ; then CFLAGS="$CFLAGS -Wall" Index: aterm.spec =================================================================== RCS file: /cvs/extras/rpms/aterm/devel/aterm.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- aterm.spec 12 Sep 2006 06:43:51 -0000 1.15 +++ aterm.spec 7 Feb 2007 08:28:04 -0000 1.16 @@ -1,6 +1,6 @@ Name: aterm Version: 1.0.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Afterstep XVT, VT102 emulator for the X Window system Group: User Interface/X @@ -8,6 +8,7 @@ URL: http://aterm.sourceforge.net Source0: ftp://ftp.afterstep.org/apps/aterm/aterm-1.0.0.tar.bz2 Source1: aterm.desktop +Patch0: aterm-debuginfo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: desktop-file-utils @@ -17,16 +18,16 @@ BuildRequires: mesa-libGL-devel %description -aterm, version 1.00 is a colour vt102 terminal emulator, based on -rxvt 2.4.8 with Alfredo Kojima??s additions of fast transparency, -intended as an xterm(1) replacement for users who do not require fea- -tures such as Tektronix 4014 emulation and toolkit-style configurabil- -ity. As a result, aterm uses much less swap space -- a significant +aterm, version 1.00 is a colour vt102 terminal emulator, based on +rxvt 2.4.8 with Alfredo Kojima??s additions of fast transparency, +intended as an xterm(1) replacement for users who do not require fea- +tures such as Tektronix 4014 emulation and toolkit-style configurabil- +ity. As a result, aterm uses much less swap space -- a significant advantage on a machine serving many X sessions. %prep %setup -q - +%patch0 %build %configure --enable-fading --enable-background-image \ @@ -35,7 +36,6 @@ --enable-big5 --enable-greek --enable-ttygid \ --enable-xgetdefault --with-term=rxvt \ --x-includes=%{_includedir} --x-libraries=%{_libdir} - make %{?_smp_mflags} @@ -65,6 +65,10 @@ %changelog +* Wed Feb 07 2007 Andreas Bierfert +1.0.0-7 +- fix #227377 (debuginfo package) + * Tue Sep 12 2006 Andreas Bierfert 1.0.0-6 - FE6 rebuild From fedora-extras-commits at redhat.com Wed Feb 7 08:47:32 2007 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 7 Feb 2007 03:47:32 -0500 Subject: rpms/wine-docs/FC-5 .cvsignore, 1.20, 1.21 sources, 1.20, 1.21 wine-docs.spec, 1.20, 1.21 Message-ID: <200702070847.l178lWqg005489@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine-docs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5429/FC-5 Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-5/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 20 Dec 2006 11:34:56 -0000 1.20 +++ .cvsignore 7 Feb 2007 08:47:00 -0000 1.21 @@ -1 +1 @@ -wine-docs-0.9.27.tar.bz2 +wine-docs-0.9.30.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-5/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 20 Dec 2006 11:34:56 -0000 1.20 +++ sources 7 Feb 2007 08:47:00 -0000 1.21 @@ -1 +1 @@ -f29d16c05815b07784edec5270ac0f3a wine-docs-0.9.27.tar.bz2 +99ac7665f88e127b4da9ac1bda5d8688 wine-docs-0.9.30.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-5/wine-docs.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- wine-docs.spec 20 Dec 2006 11:34:56 -0000 1.20 +++ wine-docs.spec 7 Feb 2007 08:47:00 -0000 1.21 @@ -1,12 +1,12 @@ Name: wine-docs -Version: 0.9.27 +Version: 0.9.30 Release: 1%{?dist} Summary: Documentation for wine Group: Documentation License: LGPL URL: http://www.winehq.org -Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.27.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.30.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf @@ -37,6 +37,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Wed Feb 07 2007 Andreas Bierfert +0.9.30-1 +- version upgrade + * Wed Dec 20 2006 Andreas Bierfert 0.9.27-1 - version upgrade From fedora-extras-commits at redhat.com Wed Feb 7 08:47:37 2007 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 7 Feb 2007 03:47:37 -0500 Subject: rpms/wine-docs/devel .cvsignore, 1.20, 1.21 sources, 1.20, 1.21 wine-docs.spec, 1.20, 1.21 Message-ID: <200702070847.l178lbFv005499@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine-docs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5429/devel Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine-docs/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 20 Dec 2006 11:35:02 -0000 1.20 +++ .cvsignore 7 Feb 2007 08:47:05 -0000 1.21 @@ -1 +1 @@ -wine-docs-0.9.27.tar.bz2 +wine-docs-0.9.30.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine-docs/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 20 Dec 2006 11:35:02 -0000 1.20 +++ sources 7 Feb 2007 08:47:05 -0000 1.21 @@ -1 +1 @@ -f29d16c05815b07784edec5270ac0f3a wine-docs-0.9.27.tar.bz2 +99ac7665f88e127b4da9ac1bda5d8688 wine-docs-0.9.30.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/devel/wine-docs.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- wine-docs.spec 20 Dec 2006 11:35:02 -0000 1.20 +++ wine-docs.spec 7 Feb 2007 08:47:05 -0000 1.21 @@ -1,12 +1,12 @@ Name: wine-docs -Version: 0.9.27 +Version: 0.9.30 Release: 1%{?dist} Summary: Documentation for wine Group: Documentation License: LGPL URL: http://www.winehq.org -Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.27.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.30.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf @@ -37,6 +37,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Wed Feb 07 2007 Andreas Bierfert +0.9.30-1 +- version upgrade + * Wed Dec 20 2006 Andreas Bierfert 0.9.27-1 - version upgrade From fedora-extras-commits at redhat.com Wed Feb 7 08:47:35 2007 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 7 Feb 2007 03:47:35 -0500 Subject: rpms/wine-docs/FC-6 .cvsignore, 1.20, 1.21 sources, 1.20, 1.21 wine-docs.spec, 1.20, 1.21 Message-ID: <200702070847.l178lZRO005494@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine-docs/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5429/FC-6 Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-6/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 20 Dec 2006 11:34:56 -0000 1.20 +++ .cvsignore 7 Feb 2007 08:47:02 -0000 1.21 @@ -1 +1 @@ -wine-docs-0.9.27.tar.bz2 +wine-docs-0.9.30.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-6/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 20 Dec 2006 11:34:56 -0000 1.20 +++ sources 7 Feb 2007 08:47:02 -0000 1.21 @@ -1 +1 @@ -f29d16c05815b07784edec5270ac0f3a wine-docs-0.9.27.tar.bz2 +99ac7665f88e127b4da9ac1bda5d8688 wine-docs-0.9.30.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-6/wine-docs.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- wine-docs.spec 20 Dec 2006 11:34:56 -0000 1.20 +++ wine-docs.spec 7 Feb 2007 08:47:02 -0000 1.21 @@ -1,12 +1,12 @@ Name: wine-docs -Version: 0.9.27 +Version: 0.9.30 Release: 1%{?dist} Summary: Documentation for wine Group: Documentation License: LGPL URL: http://www.winehq.org -Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.27.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.30.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf @@ -37,6 +37,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Wed Feb 07 2007 Andreas Bierfert +0.9.30-1 +- version upgrade + * Wed Dec 20 2006 Andreas Bierfert 0.9.27-1 - version upgrade From fedora-extras-commits at redhat.com Wed Feb 7 08:49:40 2007 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 7 Feb 2007 03:49:40 -0500 Subject: rpms/claws-mail/FC-6 .cvsignore, 1.3, 1.4 claws-mail.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200702070849.l178neMt005653@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/claws-mail/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5513/FC-6 Modified Files: .cvsignore claws-mail.spec sources Log Message: - version upgrade - fix #223436 - another try on #221708 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/claws-mail/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 18 Jan 2007 09:30:26 -0000 1.3 +++ .cvsignore 7 Feb 2007 08:49:08 -0000 1.4 @@ -1 +1 @@ -claws-mail-2.7.1.tar.bz2 +claws-mail-2.7.2.tar.bz2 Index: claws-mail.spec =================================================================== RCS file: /cvs/extras/rpms/claws-mail/FC-6/claws-mail.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- claws-mail.spec 18 Jan 2007 10:12:11 -0000 1.3 +++ claws-mail.spec 7 Feb 2007 08:49:08 -0000 1.4 @@ -1,11 +1,11 @@ Name: claws-mail -Version: 2.7.1 +Version: 2.7.2 Release: 1%{?dist} Summary: The extended version of Sylpheed Group: Applications/Internet License: GPL URL: http://claws-mail.org -Source0: http://dl.sf.net/sylpheed-claws/claws-mail-2.7.1.tar.bz2 +Source0: http://dl.sf.net/sylpheed-claws/claws-mail-2.7.2.tar.bz2 Source1: claws-mail.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: flex, bison @@ -26,6 +26,7 @@ BuildRequires: gettext-devel BuildRequires: libetpan-devel >= 0.49 BuildRequires: libgnomeprintui22-devel +BuildRequires: compface-devel Obsoletes: sylpheed-claws <= 2.6.0 Provides: sylpheed-claws = %{version}-%{release} @@ -107,7 +108,7 @@ --disable-mathml-viewer-plugin \ --enable-aspell \ --disable-dependency-tracking \ - --disable-rpath\ + --disable-rpath \ --enable-compface %{__make} %{?_smp_mflags} @@ -139,6 +140,9 @@ # we include the manual in the doc section %{__rm} -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/claws-mail +# we have an desktop file already (#223436) +%{__rm} -rf ${RPM_BUILD_ROOT}%{_datadir}/applications/claws-mail.desktop + %clean %{__rm} -rf ${RPM_BUILD_ROOT} @@ -186,6 +190,12 @@ %changelog +* Wed Feb 07 2007 Andreas Bierfert +2.7.2-1 +- version upgrade +- fix #223436 +- another try on #221708 + * Wed Jan 17 2007 Andreas Bierfert 2.7.1-1 - version upgrade #222279 Index: sources =================================================================== RCS file: /cvs/extras/rpms/claws-mail/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 18 Jan 2007 09:30:26 -0000 1.3 +++ sources 7 Feb 2007 08:49:08 -0000 1.4 @@ -1 +1 @@ -cc88da5849fcdcde223f2dd0fa7dcba1 claws-mail-2.7.1.tar.bz2 +079f167fba6e17ae2c688a0dae858b0f claws-mail-2.7.2.tar.bz2 From fedora-extras-commits at redhat.com Wed Feb 7 08:49:37 2007 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 7 Feb 2007 03:49:37 -0500 Subject: rpms/claws-mail/FC-5 .cvsignore, 1.3, 1.4 claws-mail.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200702070849.l178nbqu005646@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/claws-mail/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5513/FC-5 Modified Files: .cvsignore claws-mail.spec sources Log Message: - version upgrade - fix #223436 - another try on #221708 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/claws-mail/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 18 Jan 2007 11:38:13 -0000 1.3 +++ .cvsignore 7 Feb 2007 08:49:05 -0000 1.4 @@ -1 +1 @@ -claws-mail-2.7.1.tar.bz2 +claws-mail-2.7.2.tar.bz2 Index: claws-mail.spec =================================================================== RCS file: /cvs/extras/rpms/claws-mail/FC-5/claws-mail.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- claws-mail.spec 18 Jan 2007 11:38:13 -0000 1.2 +++ claws-mail.spec 7 Feb 2007 08:49:05 -0000 1.3 @@ -1,11 +1,11 @@ Name: claws-mail -Version: 2.7.1 +Version: 2.7.2 Release: 1%{?dist} Summary: The extended version of Sylpheed Group: Applications/Internet License: GPL URL: http://claws-mail.org -Source0: http://dl.sf.net/sylpheed-claws/claws-mail-2.7.1.tar.bz2 +Source0: http://dl.sf.net/sylpheed-claws/claws-mail-2.7.2.tar.bz2 Source1: claws-mail.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: flex, bison @@ -26,6 +26,7 @@ BuildRequires: gettext-devel BuildRequires: libetpan-devel >= 0.49 BuildRequires: libgnomeprintui22-devel +BuildRequires: compface-devel Obsoletes: sylpheed-claws <= 2.6.0 Provides: sylpheed-claws = %{version}-%{release} @@ -107,7 +108,7 @@ --disable-mathml-viewer-plugin \ --enable-aspell \ --disable-dependency-tracking \ - --disable-rpath\ + --disable-rpath \ --enable-compface %{__make} %{?_smp_mflags} @@ -139,6 +140,9 @@ # we include the manual in the doc section %{__rm} -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/claws-mail +# we have an desktop file already (#223436) +%{__rm} -rf ${RPM_BUILD_ROOT}%{_datadir}/applications/claws-mail.desktop + %clean %{__rm} -rf ${RPM_BUILD_ROOT} @@ -186,6 +190,12 @@ %changelog +* Wed Feb 07 2007 Andreas Bierfert +2.7.2-1 +- version upgrade +- fix #223436 +- another try on #221708 + * Wed Jan 17 2007 Andreas Bierfert 2.7.1-1 - version upgrade #222279 Index: sources =================================================================== RCS file: /cvs/extras/rpms/claws-mail/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 18 Jan 2007 11:38:13 -0000 1.3 +++ sources 7 Feb 2007 08:49:05 -0000 1.4 @@ -1 +1 @@ -cc88da5849fcdcde223f2dd0fa7dcba1 claws-mail-2.7.1.tar.bz2 +079f167fba6e17ae2c688a0dae858b0f claws-mail-2.7.2.tar.bz2 From fedora-extras-commits at redhat.com Wed Feb 7 08:49:42 2007 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 7 Feb 2007 03:49:42 -0500 Subject: rpms/claws-mail/devel .cvsignore, 1.3, 1.4 claws-mail.spec, 1.5, 1.6 sources, 1.3, 1.4 claws-mail-2.6.1cvs15.patch, 1.1, NONE claws-mail-2.6.1cvs16.patch, 1.1, NONE Message-ID: <200702070849.l178ngFD005660@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/claws-mail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5513/devel Modified Files: .cvsignore claws-mail.spec sources Removed Files: claws-mail-2.6.1cvs15.patch claws-mail-2.6.1cvs16.patch Log Message: - version upgrade - fix #223436 - another try on #221708 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/claws-mail/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 18 Jan 2007 10:12:11 -0000 1.3 +++ .cvsignore 7 Feb 2007 08:49:10 -0000 1.4 @@ -1 +1 @@ -claws-mail-2.7.1.tar.bz2 +claws-mail-2.7.2.tar.bz2 Index: claws-mail.spec =================================================================== RCS file: /cvs/extras/rpms/claws-mail/devel/claws-mail.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- claws-mail.spec 18 Jan 2007 10:12:11 -0000 1.5 +++ claws-mail.spec 7 Feb 2007 08:49:10 -0000 1.6 @@ -1,11 +1,11 @@ Name: claws-mail -Version: 2.7.1 +Version: 2.7.2 Release: 1%{?dist} Summary: The extended version of Sylpheed Group: Applications/Internet License: GPL URL: http://claws-mail.org -Source0: http://dl.sf.net/sylpheed-claws/claws-mail-2.7.1.tar.bz2 +Source0: http://dl.sf.net/sylpheed-claws/claws-mail-2.7.2.tar.bz2 Source1: claws-mail.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: flex, bison @@ -26,6 +26,7 @@ BuildRequires: gettext-devel BuildRequires: libetpan-devel >= 0.49 BuildRequires: libgnomeprintui22-devel +BuildRequires: compface-devel Obsoletes: sylpheed-claws <= 2.6.0 Provides: sylpheed-claws = %{version}-%{release} @@ -107,7 +108,7 @@ --disable-mathml-viewer-plugin \ --enable-aspell \ --disable-dependency-tracking \ - --disable-rpath\ + --disable-rpath \ --enable-compface %{__make} %{?_smp_mflags} @@ -139,6 +140,9 @@ # we include the manual in the doc section %{__rm} -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/claws-mail +# we have an desktop file already (#223436) +%{__rm} -rf ${RPM_BUILD_ROOT}%{_datadir}/applications/claws-mail.desktop + %clean %{__rm} -rf ${RPM_BUILD_ROOT} @@ -186,6 +190,12 @@ %changelog +* Wed Feb 07 2007 Andreas Bierfert +2.7.2-1 +- version upgrade +- fix #223436 +- another try on #221708 + * Wed Jan 17 2007 Andreas Bierfert 2.7.1-1 - version upgrade #222279 Index: sources =================================================================== RCS file: /cvs/extras/rpms/claws-mail/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 18 Jan 2007 10:12:11 -0000 1.3 +++ sources 7 Feb 2007 08:49:10 -0000 1.4 @@ -1 +1 @@ -cc88da5849fcdcde223f2dd0fa7dcba1 claws-mail-2.7.1.tar.bz2 +079f167fba6e17ae2c688a0dae858b0f claws-mail-2.7.2.tar.bz2 --- claws-mail-2.6.1cvs15.patch DELETED --- --- claws-mail-2.6.1cvs16.patch DELETED --- From fedora-extras-commits at redhat.com Wed Feb 7 08:59:22 2007 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 7 Feb 2007 03:59:22 -0500 Subject: rpms/fuse import.log,1.13,1.14 Message-ID: <200702070859.l178xMlV005931@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5892 Modified Files: import.log Log Message: auto-import fuse-2.6.3-1 on branch devel from fuse-2.6.3-1.src.rpm Ver. 2.6.3 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fuse/import.log,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- import.log 26 Dec 2006 18:56:22 -0000 1.13 +++ import.log 7 Feb 2007 08:58:50 -0000 1.14 @@ -10,3 +10,4 @@ fuse-2_6_0-1:FC-5:fuse-2.6.0-1.src.rpm:1164224103 fuse-2_6_0-1:FC-4:fuse-2.6.0-1.src.rpm:1164224230 fuse-2_6_1-1:HEAD:fuse-2.6.1-1.src.rpm:1167159927 +fuse-2_6_3-1:HEAD:fuse-2.6.3-1.src.rpm:1170838707 From fedora-extras-commits at redhat.com Wed Feb 7 08:59:25 2007 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 7 Feb 2007 03:59:25 -0500 Subject: rpms/fuse/devel .cvsignore, 1.8, 1.9 fuse.spec, 1.16, 1.17 sources, 1.8, 1.9 Message-ID: <200702070859.l178xPXT005936@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5892/devel Modified Files: .cvsignore fuse.spec sources Log Message: auto-import fuse-2.6.3-1 on branch devel from fuse-2.6.3-1.src.rpm Ver. 2.6.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fuse/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 26 Dec 2006 18:56:22 -0000 1.8 +++ .cvsignore 7 Feb 2007 08:58:53 -0000 1.9 @@ -1 +1 @@ -fuse-2.6.1.tar.gz +fuse-2.6.3.tar.gz Index: fuse.spec =================================================================== RCS file: /cvs/extras/rpms/fuse/devel/fuse.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- fuse.spec 26 Dec 2006 18:56:22 -0000 1.16 +++ fuse.spec 7 Feb 2007 08:58:53 -0000 1.17 @@ -1,5 +1,5 @@ Name: fuse -Version: 2.6.1 +Version: 2.6.3 Release: 1%{?dist} Summary: File System in Userspace (FUSE) utilities @@ -123,6 +123,9 @@ %changelog +* Wed Feb 7 2007 Peter Lemenkov 2.6.3-1 +* Ver. 2.6.3 + * Tue Dec 26 2006 Peter Lemenkov 2.6.1-1 - Ver. 2.6.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/fuse/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 26 Dec 2006 18:56:22 -0000 1.8 +++ sources 7 Feb 2007 08:58:53 -0000 1.9 @@ -1 +1 @@ -13e1873086a1d7a95f470bbc7428c528 fuse-2.6.1.tar.gz +3f4f5d07d12dedc0a3fd23472171fe94 fuse-2.6.3.tar.gz From fedora-extras-commits at redhat.com Wed Feb 7 09:03:48 2007 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 7 Feb 2007 04:03:48 -0500 Subject: rpms/claws-mail-plugins/FC-5 claws-mail-plugins.spec,1.3,1.4 Message-ID: <200702070903.l1793mFK009468@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/claws-mail-plugins/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9421/FC-5 Modified Files: claws-mail-plugins.spec Log Message: - bump for new claws Index: claws-mail-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/claws-mail-plugins/FC-5/claws-mail-plugins.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- claws-mail-plugins.spec 18 Jan 2007 16:35:17 -0000 1.3 +++ claws-mail-plugins.spec 7 Feb 2007 09:03:16 -0000 1.4 @@ -17,7 +17,7 @@ %define vcalendar 1.93 Name: claws-mail-plugins Version: 2.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Additional plugins for claws-mail Group: Applications/Internet @@ -596,8 +596,12 @@ %exclude %{_includedir}/ical.h %changelog +* Wed Feb 07 2007 Andreas Bierfert +2.7.1-2 +- bump + * Thu Jan 18 2007 Andreas Bierfert -2.7.2-1 +2.7.1-1 - version upgrade * Fri Dec 22 2006 Andreas Bierfert From fedora-extras-commits at redhat.com Wed Feb 7 09:03:51 2007 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 7 Feb 2007 04:03:51 -0500 Subject: rpms/claws-mail-plugins/FC-6 claws-mail-plugins.spec,1.3,1.4 Message-ID: <200702070903.l1793paI009474@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/claws-mail-plugins/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9421/FC-6 Modified Files: claws-mail-plugins.spec Log Message: - bump for new claws Index: claws-mail-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/claws-mail-plugins/FC-6/claws-mail-plugins.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- claws-mail-plugins.spec 18 Jan 2007 16:35:18 -0000 1.3 +++ claws-mail-plugins.spec 7 Feb 2007 09:03:18 -0000 1.4 @@ -17,7 +17,7 @@ %define vcalendar 1.93 Name: claws-mail-plugins Version: 2.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Additional plugins for claws-mail Group: Applications/Internet @@ -596,8 +596,12 @@ %exclude %{_includedir}/ical.h %changelog +* Wed Feb 07 2007 Andreas Bierfert +2.7.1-2 +- bump + * Thu Jan 18 2007 Andreas Bierfert -2.7.2-1 +2.7.1-1 - version upgrade * Fri Dec 22 2006 Andreas Bierfert From fedora-extras-commits at redhat.com Wed Feb 7 09:03:53 2007 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 7 Feb 2007 04:03:53 -0500 Subject: rpms/claws-mail-plugins/devel claws-mail-plugins.spec,1.3,1.4 Message-ID: <200702070903.l1793r03009477@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/claws-mail-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9421/devel Modified Files: claws-mail-plugins.spec Log Message: - bump for new claws Index: claws-mail-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/claws-mail-plugins/devel/claws-mail-plugins.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- claws-mail-plugins.spec 18 Jan 2007 16:35:18 -0000 1.3 +++ claws-mail-plugins.spec 7 Feb 2007 09:03:21 -0000 1.4 @@ -17,7 +17,7 @@ %define vcalendar 1.93 Name: claws-mail-plugins Version: 2.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Additional plugins for claws-mail Group: Applications/Internet @@ -596,8 +596,12 @@ %exclude %{_includedir}/ical.h %changelog +* Wed Feb 07 2007 Andreas Bierfert +2.7.1-2 +- bump + * Thu Jan 18 2007 Andreas Bierfert -2.7.2-1 +2.7.1-1 - version upgrade * Fri Dec 22 2006 Andreas Bierfert From fedora-extras-commits at redhat.com Wed Feb 7 09:16:48 2007 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 7 Feb 2007 04:16:48 -0500 Subject: rpms/fuse/FC-6 .cvsignore, 1.8, 1.9 fuse.spec, 1.16, 1.17 sources, 1.8, 1.9 Message-ID: <200702070916.l179Gmnk009889@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9850/FC-6 Modified Files: .cvsignore fuse.spec sources Log Message: auto-import fuse-2.6.3-1 on branch FC-6 from fuse-2.6.3-1.src.rpm Ver. 2.6.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fuse/FC-6/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 26 Dec 2006 19:00:23 -0000 1.8 +++ .cvsignore 7 Feb 2007 09:16:16 -0000 1.9 @@ -1 +1 @@ -fuse-2.6.1.tar.gz +fuse-2.6.3.tar.gz Index: fuse.spec =================================================================== RCS file: /cvs/extras/rpms/fuse/FC-6/fuse.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- fuse.spec 26 Dec 2006 19:00:23 -0000 1.16 +++ fuse.spec 7 Feb 2007 09:16:16 -0000 1.17 @@ -1,5 +1,5 @@ Name: fuse -Version: 2.6.1 +Version: 2.6.3 Release: 1%{?dist} Summary: File System in Userspace (FUSE) utilities @@ -123,6 +123,9 @@ %changelog +* Wed Feb 7 2007 Peter Lemenkov 2.6.3-1 +* Ver. 2.6.3 + * Tue Dec 26 2006 Peter Lemenkov 2.6.1-1 - Ver. 2.6.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/fuse/FC-6/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 26 Dec 2006 19:00:23 -0000 1.8 +++ sources 7 Feb 2007 09:16:16 -0000 1.9 @@ -1 +1 @@ -13e1873086a1d7a95f470bbc7428c528 fuse-2.6.1.tar.gz +3f4f5d07d12dedc0a3fd23472171fe94 fuse-2.6.3.tar.gz From fedora-extras-commits at redhat.com Wed Feb 7 09:16:46 2007 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 7 Feb 2007 04:16:46 -0500 Subject: rpms/fuse import.log,1.14,1.15 Message-ID: <200702070916.l179Gkek009884@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9850 Modified Files: import.log Log Message: auto-import fuse-2.6.3-1 on branch FC-6 from fuse-2.6.3-1.src.rpm Ver. 2.6.3 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fuse/import.log,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- import.log 7 Feb 2007 08:58:50 -0000 1.14 +++ import.log 7 Feb 2007 09:16:13 -0000 1.15 @@ -11,3 +11,4 @@ fuse-2_6_0-1:FC-4:fuse-2.6.0-1.src.rpm:1164224230 fuse-2_6_1-1:HEAD:fuse-2.6.1-1.src.rpm:1167159927 fuse-2_6_3-1:HEAD:fuse-2.6.3-1.src.rpm:1170838707 +fuse-2_6_3-1:FC-6:fuse-2.6.3-1.src.rpm:1170839745 From fedora-extras-commits at redhat.com Wed Feb 7 09:26:15 2007 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 7 Feb 2007 04:26:15 -0500 Subject: rpms/fuse import.log,1.15,1.16 Message-ID: <200702070926.l179QFt0010142@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10106 Modified Files: import.log Log Message: auto-import fuse-2.6.3-1 on branch FC-5 from fuse-2.6.3-1.src.rpm Ver. 2.6.3 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fuse/import.log,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- import.log 7 Feb 2007 09:16:13 -0000 1.15 +++ import.log 7 Feb 2007 09:25:43 -0000 1.16 @@ -12,3 +12,4 @@ fuse-2_6_1-1:HEAD:fuse-2.6.1-1.src.rpm:1167159927 fuse-2_6_3-1:HEAD:fuse-2.6.3-1.src.rpm:1170838707 fuse-2_6_3-1:FC-6:fuse-2.6.3-1.src.rpm:1170839745 +fuse-2_6_3-1:FC-5:fuse-2.6.3-1.src.rpm:1170840323 From fedora-extras-commits at redhat.com Wed Feb 7 09:26:18 2007 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 7 Feb 2007 04:26:18 -0500 Subject: rpms/fuse/FC-5 .cvsignore, 1.8, 1.9 fuse.spec, 1.15, 1.16 sources, 1.8, 1.9 Message-ID: <200702070926.l179QIU0010147@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10106/FC-5 Modified Files: .cvsignore fuse.spec sources Log Message: auto-import fuse-2.6.3-1 on branch FC-5 from fuse-2.6.3-1.src.rpm Ver. 2.6.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fuse/FC-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 26 Dec 2006 19:00:23 -0000 1.8 +++ .cvsignore 7 Feb 2007 09:25:46 -0000 1.9 @@ -1 +1 @@ -fuse-2.6.1.tar.gz +fuse-2.6.3.tar.gz Index: fuse.spec =================================================================== RCS file: /cvs/extras/rpms/fuse/FC-5/fuse.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- fuse.spec 26 Dec 2006 19:00:23 -0000 1.15 +++ fuse.spec 7 Feb 2007 09:25:46 -0000 1.16 @@ -1,5 +1,5 @@ Name: fuse -Version: 2.6.1 +Version: 2.6.3 Release: 1%{?dist} Summary: File System in Userspace (FUSE) utilities @@ -123,6 +123,9 @@ %changelog +* Wed Feb 7 2007 Peter Lemenkov 2.6.3-1 +* Ver. 2.6.3 + * Tue Dec 26 2006 Peter Lemenkov 2.6.1-1 - Ver. 2.6.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/fuse/FC-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 26 Dec 2006 19:00:23 -0000 1.8 +++ sources 7 Feb 2007 09:25:46 -0000 1.9 @@ -1 +1 @@ -13e1873086a1d7a95f470bbc7428c528 fuse-2.6.1.tar.gz +3f4f5d07d12dedc0a3fd23472171fe94 fuse-2.6.3.tar.gz From fedora-extras-commits at redhat.com Wed Feb 7 09:33:34 2007 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 7 Feb 2007 04:33:34 -0500 Subject: rpms/wine/FC-5 .cvsignore, 1.27, 1.28 sources, 1.28, 1.29 wine.spec, 1.40, 1.41 Message-ID: <200702070933.l179XYBL010300@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10241/FC-5 Modified Files: .cvsignore sources wine.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine/FC-5/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 11 Jan 2007 14:41:22 -0000 1.27 +++ .cvsignore 7 Feb 2007 09:33:02 -0000 1.28 @@ -1 +1 @@ -wine-0.9.29-fe.tar.bz2 +wine-0.9.30-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine/FC-5/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 11 Jan 2007 14:41:22 -0000 1.28 +++ sources 7 Feb 2007 09:33:02 -0000 1.29 @@ -1 +1 @@ -88e9b0002fbe16fe7eefad8ac4c931ea wine-0.9.29-fe.tar.bz2 +9a6530d13d26dcb8fe5c0d0ca88e87e8 wine-0.9.30-fe.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/FC-5/wine.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- wine.spec 11 Jan 2007 14:41:22 -0000 1.40 +++ wine.spec 7 Feb 2007 09:33:02 -0000 1.41 @@ -1,7 +1,7 @@ %define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fno-stack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables Name: wine -Version: 0.9.29 +Version: 0.9.30 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator @@ -9,7 +9,7 @@ License: LGPL URL: http://www.winehq.org/ # special fedora tarball without winemp3 stuff -Source0: wine-0.9.29-fe.tar.bz2 +Source0: wine-0.9.30-fe.tar.bz2 Source1: wine.init Source3: wine-README-Fedora Source4: wine-32.conf @@ -51,7 +51,7 @@ BuildRequires: desktop-file-utils BuildRequires: fontforge BuildRequires: gphoto2 gphoto2-devel -# 217338 +#217338 BuildRequires: isdn4k-utils-devel # modular x BuildRequires: libX11-devel @@ -222,6 +222,7 @@ install -p -m 644 %{SOURCE201} \ %{buildroot}%{_datadir}/desktop-directories/wine.directory + # install desktop files desktop-file-install \ --vendor=fedora \ @@ -398,6 +399,7 @@ %{_libdir}/wine/commdlg.dll16 %{_libdir}/wine/compobj.dll16 %{_libdir}/wine/compstui.dll.so +%{_libdir}/wine/credui.dll.so %{_libdir}/wine/crtdll.dll.so %{_libdir}/wine/crypt32.dll.so %{_libdir}/wine/cryptdll.dll.so @@ -533,12 +535,12 @@ %{_libdir}/wine/rpcrt4.dll.so %{_libdir}/wine/rsabase.dll.so %{_libdir}/wine/rsaenh.dll.so -%{_libdir}/wine/sane.ds.so %{_libdir}/wine/secur32.dll.so %{_libdir}/wine/sensapi.dll.so %{_libdir}/wine/serialui.dll.so %{_libdir}/wine/setupapi.dll.so %{_libdir}/wine/setupx.dll16 +%{_libdir}/wine/sfc_os.dll.so %{_libdir}/wine/shdoclc.dll.so %{_libdir}/wine/shdocvw.dll.so %{_libdir}/wine/shell.dll16 @@ -676,6 +678,7 @@ %defattr(-,root,root,-) %{_libdir}/wine/twain.dll16 %{_libdir}/wine/twain_32.dll.so +%{_libdir}/wine/sane.ds.so %files capi %defattr(-,root,root,-) @@ -710,6 +713,10 @@ %{_libdir}/wine/*.def %changelog +* Wed Feb 07 2007 Andreas Bierfert +0.9.30-1 +- version upgrade + * Thu Jan 11 2007 Andreas Bierfert 0.9.29-1 - version upgrade @@ -719,6 +726,10 @@ - version upgrade (#220130) - fix submenus (#216076) - fix BR (#217338) + +* Thu Nov 16 2006 Andreas Bierfert +0.9.25-1 +- version upgrade - fix init script (#213230) - fix twain subpackage content (#213396) - create wine submenu (#205024) From fedora-extras-commits at redhat.com Wed Feb 7 09:33:39 2007 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 7 Feb 2007 04:33:39 -0500 Subject: rpms/wine/devel .cvsignore, 1.28, 1.29 sources, 1.29, 1.30 wine.spec, 1.41, 1.42 Message-ID: <200702070933.l179Xduf010314@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10241/devel Modified Files: .cvsignore sources wine.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine/devel/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 11 Jan 2007 14:41:27 -0000 1.28 +++ .cvsignore 7 Feb 2007 09:33:07 -0000 1.29 @@ -1 +1 @@ -wine-0.9.29-fe.tar.bz2 +wine-0.9.30-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine/devel/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 11 Jan 2007 14:41:27 -0000 1.29 +++ sources 7 Feb 2007 09:33:07 -0000 1.30 @@ -1 +1 @@ -88e9b0002fbe16fe7eefad8ac4c931ea wine-0.9.29-fe.tar.bz2 +9a6530d13d26dcb8fe5c0d0ca88e87e8 wine-0.9.30-fe.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- wine.spec 11 Jan 2007 14:41:27 -0000 1.41 +++ wine.spec 7 Feb 2007 09:33:07 -0000 1.42 @@ -1,7 +1,7 @@ %define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fno-stack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables Name: wine -Version: 0.9.29 +Version: 0.9.30 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator @@ -9,7 +9,7 @@ License: LGPL URL: http://www.winehq.org/ # special fedora tarball without winemp3 stuff -Source0: wine-0.9.29-fe.tar.bz2 +Source0: wine-0.9.30-fe.tar.bz2 Source1: wine.init Source3: wine-README-Fedora Source4: wine-32.conf @@ -399,6 +399,7 @@ %{_libdir}/wine/commdlg.dll16 %{_libdir}/wine/compobj.dll16 %{_libdir}/wine/compstui.dll.so +%{_libdir}/wine/credui.dll.so %{_libdir}/wine/crtdll.dll.so %{_libdir}/wine/crypt32.dll.so %{_libdir}/wine/cryptdll.dll.so @@ -539,6 +540,7 @@ %{_libdir}/wine/serialui.dll.so %{_libdir}/wine/setupapi.dll.so %{_libdir}/wine/setupx.dll16 +%{_libdir}/wine/sfc_os.dll.so %{_libdir}/wine/shdoclc.dll.so %{_libdir}/wine/shdocvw.dll.so %{_libdir}/wine/shell.dll16 @@ -711,6 +713,10 @@ %{_libdir}/wine/*.def %changelog +* Wed Feb 07 2007 Andreas Bierfert +0.9.30-1 +- version upgrade + * Thu Jan 11 2007 Andreas Bierfert 0.9.29-1 - version upgrade From fedora-extras-commits at redhat.com Wed Feb 7 09:33:36 2007 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 7 Feb 2007 04:33:36 -0500 Subject: rpms/wine/FC-6 .cvsignore, 1.28, 1.29 sources, 1.29, 1.30 wine.spec, 1.41, 1.42 Message-ID: <200702070933.l179XaR1010308@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10241/FC-6 Modified Files: .cvsignore sources wine.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine/FC-6/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 11 Jan 2007 14:41:22 -0000 1.28 +++ .cvsignore 7 Feb 2007 09:33:04 -0000 1.29 @@ -1 +1 @@ -wine-0.9.29-fe.tar.bz2 +wine-0.9.30-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine/FC-6/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 11 Jan 2007 14:41:22 -0000 1.29 +++ sources 7 Feb 2007 09:33:04 -0000 1.30 @@ -1 +1 @@ -88e9b0002fbe16fe7eefad8ac4c931ea wine-0.9.29-fe.tar.bz2 +9a6530d13d26dcb8fe5c0d0ca88e87e8 wine-0.9.30-fe.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/FC-6/wine.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- wine.spec 11 Jan 2007 14:41:22 -0000 1.41 +++ wine.spec 7 Feb 2007 09:33:04 -0000 1.42 @@ -1,7 +1,7 @@ %define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fno-stack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables Name: wine -Version: 0.9.29 +Version: 0.9.30 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator @@ -9,7 +9,7 @@ License: LGPL URL: http://www.winehq.org/ # special fedora tarball without winemp3 stuff -Source0: wine-0.9.29-fe.tar.bz2 +Source0: wine-0.9.30-fe.tar.bz2 Source1: wine.init Source3: wine-README-Fedora Source4: wine-32.conf @@ -399,6 +399,7 @@ %{_libdir}/wine/commdlg.dll16 %{_libdir}/wine/compobj.dll16 %{_libdir}/wine/compstui.dll.so +%{_libdir}/wine/credui.dll.so %{_libdir}/wine/crtdll.dll.so %{_libdir}/wine/crypt32.dll.so %{_libdir}/wine/cryptdll.dll.so @@ -539,6 +540,7 @@ %{_libdir}/wine/serialui.dll.so %{_libdir}/wine/setupapi.dll.so %{_libdir}/wine/setupx.dll16 +%{_libdir}/wine/sfc_os.dll.so %{_libdir}/wine/shdoclc.dll.so %{_libdir}/wine/shdocvw.dll.so %{_libdir}/wine/shell.dll16 @@ -711,6 +713,10 @@ %{_libdir}/wine/*.def %changelog +* Wed Feb 07 2007 Andreas Bierfert +0.9.30-1 +- version upgrade + * Thu Jan 11 2007 Andreas Bierfert 0.9.29-1 - version upgrade From fedora-extras-commits at redhat.com Wed Feb 7 09:34:45 2007 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Wed, 7 Feb 2007 04:34:45 -0500 Subject: rpms/libmtp/FC-6 .cvsignore, 1.3, 1.4 libmtp.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200702070934.l179YjcI010347@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/libmtp/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10320 Modified Files: .cvsignore libmtp.spec sources Log Message: Pushing update from devel down to FC6 for compatibilities. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libmtp/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 20 Oct 2006 18:56:49 -0000 1.3 +++ .cvsignore 7 Feb 2007 09:34:13 -0000 1.4 @@ -1 +1 @@ -libmtp-0.0.21.tar.gz +libmtp-0.1.3.tar.gz Index: libmtp.spec =================================================================== RCS file: /cvs/extras/rpms/libmtp/FC-6/libmtp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libmtp.spec 20 Oct 2006 18:56:49 -0000 1.2 +++ libmtp.spec 7 Feb 2007 09:34:13 -0000 1.3 @@ -11,7 +11,7 @@ # Name: libmtp -Version: 0.0.21 +Version: 0.1.3 Release: 1%{?dist} Summary: A software library for MTP media players URL: http://libmtp.sourceforge.net/ @@ -23,6 +23,7 @@ License: LGPL Requires: udev Requires: pam +Requires: hal BuildRequires: libusb-devel BuildRequires: doxygen @@ -69,6 +70,8 @@ # Install udev rules file. mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d install -p -m 644 libmtp.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-libmtp.rules +mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop +install -p -m 644 libmtp.fdi $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libmtp.fdi # Install device permissions mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/ install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/60-libmtp.perms @@ -87,6 +90,7 @@ %{_libdir}/*.so.* %config(noreplace) %{_sysconfdir}/udev/rules.d/* %config(noreplace) %{_sysconfdir}/security/console.perms.d/* +%config(noreplace) %{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libmtp.fdi %files examples %defattr(-,root,root,-) %{_bindir}/* @@ -101,6 +105,14 @@ %changelog +* Wed Jan 17 2007 Linus Walleij 0.1.3-1 +- New upstream release. +- Candidate for FC5, FC6 backport. + +* Thu Dec 7 2006 Linus Walleij 0.1.0-1 +- New upstream release. +- Start providing HAL rules. + * Fri Oct 20 2006 Linus Walleij 0.0.21-1 - New upstream release. Index: sources =================================================================== RCS file: /cvs/extras/rpms/libmtp/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 20 Oct 2006 18:56:49 -0000 1.3 +++ sources 7 Feb 2007 09:34:13 -0000 1.4 @@ -1 +1 @@ -621b4590c3c0d09f3546ad67f39ef80b libmtp-0.0.21.tar.gz +311b99c9d9a96efff6383f7466b2b229 libmtp-0.1.3.tar.gz From fedora-extras-commits at redhat.com Wed Feb 7 09:36:46 2007 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Wed, 7 Feb 2007 04:36:46 -0500 Subject: rpms/libmtp/FC-5 .cvsignore, 1.3, 1.4 libmtp.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200702070936.l179akdU010441@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/libmtp/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10415 Modified Files: .cvsignore libmtp.spec sources Log Message: Pushing devel version to FC-5 also. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libmtp/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 20 Oct 2006 18:58:53 -0000 1.3 +++ .cvsignore 7 Feb 2007 09:36:14 -0000 1.4 @@ -1 +1 @@ -libmtp-0.0.21.tar.gz +libmtp-0.1.3.tar.gz Index: libmtp.spec =================================================================== RCS file: /cvs/extras/rpms/libmtp/FC-5/libmtp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libmtp.spec 20 Oct 2006 18:58:53 -0000 1.2 +++ libmtp.spec 7 Feb 2007 09:36:14 -0000 1.3 @@ -11,7 +11,7 @@ # Name: libmtp -Version: 0.0.21 +Version: 0.1.3 Release: 1%{?dist} Summary: A software library for MTP media players URL: http://libmtp.sourceforge.net/ @@ -23,6 +23,7 @@ License: LGPL Requires: udev Requires: pam +Requires: hal BuildRequires: libusb-devel BuildRequires: doxygen @@ -69,6 +70,8 @@ # Install udev rules file. mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d install -p -m 644 libmtp.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-libmtp.rules +mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop +install -p -m 644 libmtp.fdi $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libmtp.fdi # Install device permissions mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/ install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/60-libmtp.perms @@ -87,6 +90,7 @@ %{_libdir}/*.so.* %config(noreplace) %{_sysconfdir}/udev/rules.d/* %config(noreplace) %{_sysconfdir}/security/console.perms.d/* +%config(noreplace) %{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libmtp.fdi %files examples %defattr(-,root,root,-) %{_bindir}/* @@ -101,6 +105,14 @@ %changelog +* Wed Jan 17 2007 Linus Walleij 0.1.3-1 +- New upstream release. +- Candidate for FC5, FC6 backport. + +* Thu Dec 7 2006 Linus Walleij 0.1.0-1 +- New upstream release. +- Start providing HAL rules. + * Fri Oct 20 2006 Linus Walleij 0.0.21-1 - New upstream release. Index: sources =================================================================== RCS file: /cvs/extras/rpms/libmtp/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 20 Oct 2006 18:58:53 -0000 1.3 +++ sources 7 Feb 2007 09:36:14 -0000 1.4 @@ -1 +1 @@ -621b4590c3c0d09f3546ad67f39ef80b libmtp-0.0.21.tar.gz +311b99c9d9a96efff6383f7466b2b229 libmtp-0.1.3.tar.gz From fedora-extras-commits at redhat.com Wed Feb 7 09:57:53 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Wed, 7 Feb 2007 04:57:53 -0500 Subject: rpms/sweep/FC-6 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 sweep.spec, 1.3, 1.4 Message-ID: <200702070957.l179vr1K010636@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/sweep/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10613 Modified Files: .cvsignore sources sweep.spec Log Message: new version 0.9.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sweep/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 29 Mar 2006 18:40:55 -0000 1.2 +++ .cvsignore 7 Feb 2007 09:57:20 -0000 1.3 @@ -1 +1 @@ -sweep-0.9.1.tar.bz2 +sweep-0.9.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sweep/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 29 Mar 2006 18:40:55 -0000 1.2 +++ sources 7 Feb 2007 09:57:21 -0000 1.3 @@ -1 +1 @@ -7c346e28ff09c4a4f529a607ffd165f9 sweep-0.9.1.tar.bz2 +285e04b950dda85639f13aaac86153a0 sweep-0.9.2.tar.bz2 Index: sweep.spec =================================================================== RCS file: /cvs/extras/rpms/sweep/FC-6/sweep.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sweep.spec 28 Aug 2006 09:20:50 -0000 1.3 +++ sweep.spec 7 Feb 2007 09:57:21 -0000 1.4 @@ -1,12 +1,12 @@ Name: sweep -Version: 0.9.1 -Release: 5%{?dist} +Version: 0.9.2 +Release: 1%{?dist} Summary: An audio editor and live playback tool Group: Applications/Multimedia License: GPL URL: http://www.metadecks.org/software/sweep/index.html -Source: http://www.metadecks.org/software/sweep/download/sweep-0.9.1.tar.bz2 +Source: http://www.metadecks.org/software/sweep/download/sweep-0.9.2.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel BuildRequires: libogg-devel @@ -116,6 +116,9 @@ %changelog +* Wed Feb 7 2007 Gerard Milmeister - 0.9.2-1 +- new version 0.9.2 + * Mon Aug 28 2006 Gerard Milmeister - 0.9.1-5 - Rebuild for FE6 From fedora-extras-commits at redhat.com Wed Feb 7 10:03:01 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Wed, 7 Feb 2007 05:03:01 -0500 Subject: rpms/sweep/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 sweep.spec, 1.2, 1.3 Message-ID: <200702071003.l17A31Q9014150@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/sweep/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14086 Modified Files: .cvsignore sources sweep.spec Log Message: new version 0.9.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sweep/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 29 Mar 2006 18:40:55 -0000 1.2 +++ .cvsignore 7 Feb 2007 10:02:29 -0000 1.3 @@ -1 +1 @@ -sweep-0.9.1.tar.bz2 +sweep-0.9.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sweep/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 29 Mar 2006 18:40:55 -0000 1.2 +++ sources 7 Feb 2007 10:02:29 -0000 1.3 @@ -1 +1 @@ -7c346e28ff09c4a4f529a607ffd165f9 sweep-0.9.1.tar.bz2 +285e04b950dda85639f13aaac86153a0 sweep-0.9.2.tar.bz2 Index: sweep.spec =================================================================== RCS file: /cvs/extras/rpms/sweep/FC-5/sweep.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sweep.spec 30 Mar 2006 09:29:33 -0000 1.2 +++ sweep.spec 7 Feb 2007 10:02:29 -0000 1.3 @@ -1,12 +1,12 @@ Name: sweep -Version: 0.9.1 -Release: 4%{?dist} +Version: 0.9.2 +Release: 1%{?dist} Summary: An audio editor and live playback tool Group: Applications/Multimedia License: GPL URL: http://www.metadecks.org/software/sweep/index.html -Source: http://www.metadecks.org/software/sweep/download/sweep-0.9.1.tar.bz2 +Source: http://www.metadecks.org/software/sweep/download/sweep-0.9.2.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel BuildRequires: libogg-devel @@ -116,6 +116,12 @@ %changelog +* Wed Feb 7 2007 Gerard Milmeister - 0.9.2-1 +- new version 0.9.2 + +* Mon Aug 28 2006 Gerard Milmeister - 0.9.1-5 +- Rebuild for FE6 + * Sun Mar 26 2006 Gerard Milmeister - 0.9.1-3 - do not compile in experimental features From fedora-extras-commits at redhat.com Wed Feb 7 10:04:27 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Wed, 7 Feb 2007 05:04:27 -0500 Subject: rpms/sweep/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 sweep.spec, 1.3, 1.4 Message-ID: <200702071004.l17A4Rqm014228@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/sweep/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14207 Modified Files: .cvsignore sources sweep.spec Log Message: new version 0.9.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sweep/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 29 Mar 2006 18:40:55 -0000 1.2 +++ .cvsignore 7 Feb 2007 10:03:55 -0000 1.3 @@ -1 +1 @@ -sweep-0.9.1.tar.bz2 +sweep-0.9.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sweep/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 29 Mar 2006 18:40:55 -0000 1.2 +++ sources 7 Feb 2007 10:03:55 -0000 1.3 @@ -1 +1 @@ -7c346e28ff09c4a4f529a607ffd165f9 sweep-0.9.1.tar.bz2 +285e04b950dda85639f13aaac86153a0 sweep-0.9.2.tar.bz2 Index: sweep.spec =================================================================== RCS file: /cvs/extras/rpms/sweep/devel/sweep.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sweep.spec 28 Aug 2006 09:20:50 -0000 1.3 +++ sweep.spec 7 Feb 2007 10:03:55 -0000 1.4 @@ -1,12 +1,12 @@ Name: sweep -Version: 0.9.1 -Release: 5%{?dist} +Version: 0.9.2 +Release: 1%{?dist} Summary: An audio editor and live playback tool Group: Applications/Multimedia License: GPL URL: http://www.metadecks.org/software/sweep/index.html -Source: http://www.metadecks.org/software/sweep/download/sweep-0.9.1.tar.bz2 +Source: http://www.metadecks.org/software/sweep/download/sweep-0.9.2.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel BuildRequires: libogg-devel @@ -116,6 +116,9 @@ %changelog +* Wed Feb 7 2007 Gerard Milmeister - 0.9.2-1 +- new version 0.9.2 + * Mon Aug 28 2006 Gerard Milmeister - 0.9.1-5 - Rebuild for FE6 From fedora-extras-commits at redhat.com Wed Feb 7 10:07:42 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 7 Feb 2007 05:07:42 -0500 Subject: rpms/duel3 import.log,1.1,1.2 Message-ID: <200702071007.l17A7g2F014435@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/duel3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14388 Modified Files: import.log Log Message: auto-import duel3-0.1-0.2.20060225.fc7 on branch devel from duel3-0.1-0.2.20060225.fc7.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/duel3/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 5 Feb 2007 22:02:42 -0000 1.1 +++ import.log 7 Feb 2007 10:07:09 -0000 1.2 @@ -0,0 +1 @@ +duel3-0_1-0_2_20060225_fc7:HEAD:duel3-0.1-0.2.20060225.fc7.src.rpm:1170842912 From fedora-extras-commits at redhat.com Wed Feb 7 10:07:44 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 7 Feb 2007 05:07:44 -0500 Subject: rpms/duel3/devel Duel3_20060225-fixes.patch, NONE, 1.1 duel3.desktop, NONE, 1.1 duel3.png, NONE, 1.1 duel3.spec, NONE, 1.1 music-credits.txt, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702071007.l17A7iuP014439@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/duel3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14388/devel Modified Files: .cvsignore sources Added Files: Duel3_20060225-fixes.patch duel3.desktop duel3.png duel3.spec music-credits.txt Log Message: auto-import duel3-0.1-0.2.20060225.fc7 on branch devel from duel3-0.1-0.2.20060225.fc7.src.rpm Duel3_20060225-fixes.patch: --- NEW FILE Duel3_20060225-fixes.patch --- --- Duel3_20060225_src/Source/PObject.h.fixes 2006-02-18 01:17:42.000000000 +0100 +++ Duel3_20060225_src/Source/PObject.h 2007-01-31 21:07:51.000000000 +0100 @@ -14,8 +14,8 @@ #include "CVector2.h" #include "Object.h" -#include "ParticleSystem.h" -#include "ParticleGenerator.h" +#include "particlesystem.h" +#include "particlegenerator.h" #include "BRect.h" #include "SObject.h" --- Duel3_20060225_src/Source/Button.h.fixes 2006-02-15 22:41:00.000000000 +0100 +++ Duel3_20060225_src/Source/Button.h 2007-01-31 21:07:51.000000000 +0100 @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include "Standards.h" --- Duel3_20060225_src/Source/CServer.h.fixes 2003-06-06 15:30:42.000000000 +0200 +++ Duel3_20060225_src/Source/CServer.h 2007-01-31 21:07:51.000000000 +0100 @@ -7,9 +7,9 @@ #include #include #include -#include +#include #include -#include "standards.h" +#include "Standards.h" #include "CNetwork.h" #include "CPacket.h" --- Duel3_20060225_src/Source/Player.cpp.fixes 2006-02-19 01:16:26.000000000 +0100 +++ Duel3_20060225_src/Source/Player.cpp 2007-01-31 21:07:51.000000000 +0100 @@ -19,9 +19,9 @@ if(hudl.retExist()==false) - hudl.setPict(400,70,"images/hudl_closed.bmp",false); + hudl.setPict(400,70,DATADIR "images/hudl_closed.bmp",false); if(hudr.retExist()==false) - hudr.setPict(400,70,"images/hudr_3.bmp",false); + hudr.setPict(400,70,DATADIR "images/hudr_3.bmp",false); @@ -104,9 +104,9 @@ { if(hudl.retExist()==false) - hudl.setPict(400,70,"images/hudl_3.bmp",false); + hudl.setPict(400,70,DATADIR "images/hudl_3.bmp",false); if(hudr.retExist()==false) - hudr.setPict(400,70,"images/hudr_3.bmp",false); + hudr.setPict(400,70,DATADIR "images/hudr_3.bmp",false); //if(blue_bar.retExist()==false) // blue_bar.setPict(161,10,"w_hud/blue_bar.bmp"); @@ -193,13 +193,13 @@ { if(ScoreKeeper::instance()->getType()==INCREASING_TIME || ScoreKeeper::instance()->getType()==DECREASING_TIME) { - char timeLeft[5]; + char timeLeft[16]; sprintf(timeLeft,"%0.1f",((float)ScoreKeeper::instance()->getTimeLeft() / 32)); writeText_2D(375,545,40,makecol(200,200,200),allFonts[3],timeLeft); } else if(ScoreKeeper::instance()->getType()==SCORE_BASED) { - char score[5]; + char score[16]; sprintf(score,"Score %d",ScoreKeeper::instance()->getScore(0)); writeText_2D(340,547,40,makecol(200,200,200),allFonts[4],score); sprintf(score,"x%0.2f",ScoreKeeper::instance()->getMultiplier(0)); --- Duel3_20060225_src/Source/Server.h.fixes 2004-04-05 19:35:16.000000000 +0200 +++ Duel3_20060225_src/Source/Server.h 2007-01-31 21:07:51.000000000 +0100 @@ -7,9 +7,9 @@ #include #include #include -#include +#include #include -#include "standards.h" +#include "Standards.h" #include "CNetwork.h" #include "CPacket.h" --- Duel3_20060225_src/Source/AsteroidsGameMode.h.fixes 2006-02-15 22:35:46.000000000 +0100 +++ Duel3_20060225_src/Source/AsteroidsGameMode.h 2007-01-31 21:07:51.000000000 +0100 @@ -6,7 +6,7 @@ #ifndef ASTEROIDSGAMEMODE_H #define ASTEROIDSGAMEMODE_H -#include "gamemode.h" +#include "GameMode.h" #include "CVector2.h" #include "Arena.h" --- Duel3_20060225_src/Source/Controller.cpp.fixes 2006-02-15 22:36:48.000000000 +0100 +++ Duel3_20060225_src/Source/Controller.cpp 2007-01-31 21:07:51.000000000 +0100 @@ -3,7 +3,7 @@ All rights reserved. ***********************************/ -#include "controller.h" // class's header file +#include "Controller.h" // class's header file void Controller::pollController(void) { --- Duel3_20060225_src/Source/main.cpp.fixes 2006-02-25 12:23:32.000000000 +0100 +++ Duel3_20060225_src/Source/main.cpp 2007-01-31 21:07:51.000000000 +0100 @@ -20,11 +20,11 @@ #include "CVector3.h" #include "CCamera.h" -#include "Particle.h" -#include "ParticleSystem.h" +#include "particle.h" +#include "particlesystem.h" //#include "SmokeSystem.h" //#include "SparkSystem.h" -#include "ParticleGenerator.h" +#include "particlegenerator.h" #include "Controller.h" #include "SfxSingleton.h" @@ -39,7 +39,7 @@ #include "SObject.h" #include "Arena.h" #include "PObject.h" -#include "Asteroid.h" +#include "asteroid.h" #include "Ship.h" #include "ShipArray.h" #include "Proj.h" @@ -119,7 +119,11 @@ int iGraphicsLoops=0; int iLogicLoops=0; bool bQuitGame=false; - +#ifdef __unix__ +int check_and_create_dir(const char* dir); +char *homedir; +char LOGFILE[256]; +#endif int cycles=0; float fps; @@ -236,10 +240,16 @@ int main(int argc, const char **argv) { +#ifdef __unix__ + homedir = getenv("HOME"); + homedir = homedir?homedir:(char *)"."; + snprintf(LOGFILE, sizeof(LOGFILE), "%s/.duel3-log.txt", homedir); +#endif remove(LOGFILE); initAllegroGL(); - + +#ifndef __unix__ /**MAKE SURE WE ARE IN THE SAME DIR AS THE EXE**/ char buffer[256]; int len=255; @@ -247,7 +257,7 @@ (get_filename(buffer))[0] = 0; outtext(LOGFILE,buffer); chdir(buffer); - +#endif @@ -270,7 +280,7 @@ // LARGE_INTEGER time1,time2; // QueryPerformanceCounter(&time1); - play_song("music/BlackIce1.XM"); + play_song(DATADIR "music/BlackIce1.XM"); while(/*! key[KEY_ESC] &&*/ !bQuitGame) { @@ -411,7 +421,7 @@ //initMenus(); iMenuNum=0; menu.reset(); - play_song("music/BlackIce1.XM"); + play_song(DATADIR "music/BlackIce1.XM"); outtext(LOGFILE,"RETURNING TO MENU\n"); } } @@ -584,18 +594,18 @@ dumb_register_stdfiles(); outtext(LOGFILE,"Loading title image\n\n"); - title.setPict(800,600,"images/title.bmp",false); + title.setPict(800,600, DATADIR "images/title.bmp",false); load_ship_atts(ship_atts); shipDefs.init(); - loadModels("models.d3"); + loadModels(DATADIR "models.d3"); outtext(LOGFILE,"Models Loaded\n\n"); TShipDef def; outtext(LOGFILE,"Loading fonts\n"); - fonts = load_datafile("fonts.dat"); + fonts = load_datafile(DATADIR "fonts.dat"); if(fonts) outtext(LOGFILE,"Fonts Loaded\n\n"); else @@ -620,7 +630,7 @@ partGen = new ParticleGenerator[MAX_PG]; - loadShipDefs("Ships.d3"); + loadShipDefs(DATADIR "Ships.d3"); game.init(); player1Atts.iColour=0; @@ -632,14 +642,14 @@ strcpy(player2Atts.sName,"Player2"); outtext(LOGFILE,"Loading sounds\n\n"); - SfxSingleton::instance()->setData("sounds.dat"); + SfxSingleton::instance()->setData(DATADIR "sounds.dat"); game.setModels(allModels); - game.setupWeapons("weapons.d3",&partGen); + game.setupWeapons(DATADIR "weapons.d3",&partGen); game.setupPowerupTypes(&partGen); @@ -919,7 +929,7 @@ FILE *fp; outtext(LOGFILE,"\nLoading weapons set\n"); - fp=fopen("WeaponsSet.d3","rt"); + fp=fopen(DATADIR "WeaponsSet.d3","rt"); int numWeaponsSets; if(fp) { @@ -941,7 +951,7 @@ outtext(LOGFILE,"\nLoading ship atts\n"); - fp=fopen("ShipAtts.d3","rt"); + fp=fopen(DATADIR "ShipAtts.d3","rt"); if(fp) { fscanf(fp,"%d",&iNumAtts); @@ -1195,9 +1205,9 @@ outtext(LOGFILE,"entering function startGame\n"); switch( cur_song_num ){ - case 0: play_song("music/BlackIce4.XM"); break; - case 1: play_song("music/BlackIce3.XM"); break; - case 2: play_song("music/BlackIce2.XM"); break; + case 0: play_song(DATADIR "music/BlackIce4.XM"); break; + case 1: play_song(DATADIR "music/BlackIce3.xm"); break; + case 2: play_song(DATADIR "music/BlackIce2.XM"); break; } cur_song_num++; cur_song_num%=3; @@ -1207,7 +1217,7 @@ sec=0; cycles=0; game.resetProjs(); - game.setupWeapons("weapons.d3",&partGen); + game.setupWeapons(DATADIR "weapons.d3",&partGen); game.setupPowerupTypes(&partGen); game.bHotSeat=bHotSeat; @@ -1549,7 +1559,7 @@ void displaySplashScreen(void) { BRect splash; - splash.setPict(1,1,"images/title1.bmp"); + splash.setPict(1,1,DATADIR "images/title1.bmp"); splash.setPos(makeVector2(0,0,true)); @@ -1686,19 +1696,19 @@ /************************SHIP EXAUST**********************************/ partGen[0].setParticles(&partSys); partGen[0].create(smoke_atts,engine_atts); - partGen[0].setTexture("images/t1.bmp"); + partGen[0].setTexture(DATADIR "images/t1.bmp"); partGen[0].start(); /***********************DAMAGE SPARKS********************************/ partGen[1].setParticles(&partSys); partGen[1].create(sparks_atts,damage_atts); - partGen[1].setTexture("images/t3.bmp"); + partGen[1].setTexture(DATADIR "images/t3.bmp"); partGen[1].start(); /***********************SHIP SHIELD PARTS*****************************/ partGen[2].setParticles(&partSys); partGen[2].create(shield_atts,shieldGen_atts); - partGen[2].setTexture("images/t3.bmp"); + partGen[2].setTexture(DATADIR "images/t3.bmp"); partGen[2].start(); /**********************ENERGY PROJ SPARKS******************************/ @@ -1707,7 +1717,7 @@ shield_atts.colour = makeColour(.6 , .6 , 1 ); shield_atts.shape[0]=makeVector3(3,-1,0); shield_atts.shape[1]=makeVector3(3,1,0); shield_atts.shape[2]=makeVector3(-3,1,0); shield_atts.shape[3]=makeVector3(-3,-1,0); partGen[3].create(shield_atts,shieldGen_atts); - partGen[3].setTexture("images/t3.bmp"); + partGen[3].setTexture(DATADIR "images/t3.bmp"); partGen[3].start(); /**********************MISSILE EXAUST**********************************/ @@ -1716,7 +1726,7 @@ smoke_atts.density=1; smoke_atts.start_density=1; smoke_atts.particle_lifespan=10; smoke_atts.shape[0]=makeVector3(1,-2,0); smoke_atts.shape[1]=makeVector3(1,2,0); smoke_atts.shape[2]=makeVector3(-1,2,0); smoke_atts.shape[3]=makeVector3(-1,-2,0); partGen[4].create(smoke_atts,engine_atts); - partGen[4].setTexture("images/t1.bmp"); + partGen[4].setTexture(DATADIR "images/t1.bmp"); partGen[4].start(); /************************SMALL MISSLE EXPLOSIONS***************************/ @@ -1725,14 +1735,14 @@ shield_atts.colour = makeColour(1 , .75 , .1 ); shield_atts.shape[0]=makeVector3(1,-1,0); shield_atts.shape[1]=makeVector3(1,1,0); shield_atts.shape[2]=makeVector3(-1,1,0); shield_atts.shape[3]=makeVector3(-1,-1,0); partGen[5].create(shield_atts,shieldGen_atts); - partGen[5].setTexture("images/t3.bmp"); + partGen[5].setTexture(DATADIR "images/t3.bmp"); partGen[5].start(); /************************SHIP EXPLOSION*******************************/ sparks_atts.shape[0]=makeVector3(2,-1,0); sparks_atts.shape[1]=makeVector3(2,1,0); sparks_atts.shape[2]=makeVector3(-2,1,0); sparks_atts.shape[3]=makeVector3(-2,-1,0); partGen[6].setParticles(&partSys); partGen[6].create(sparks_atts,explosion_atts); - partGen[6].setTexture("images/t3.bmp"); + partGen[6].setTexture(DATADIR "images/t3.bmp"); partGen[6].start(); @@ -1742,7 +1752,7 @@ shield_atts.colour = makeColour(1 , .75 , .1 ); shield_atts.shape[0]=makeVector3(1,-1,0); shield_atts.shape[1]=makeVector3(1,1,0); shield_atts.shape[2]=makeVector3(-1,1,0); shield_atts.shape[3]=makeVector3(-1,-1,0); partGen[7].create(shield_atts,shieldGen_atts); - partGen[7].setTexture("images/t3.bmp"); + partGen[7].setTexture(DATADIR "images/t3.bmp"); partGen[7].start(); /**********************SHIELD SHATTER SPAKRS********************************/ @@ -1752,7 +1762,7 @@ shield_atts.shape[0]=makeVector3(2,-1,0); shield_atts.shape[1]=makeVector3(2,1,0); shield_atts.shape[2]=makeVector3(-2,1,0); shield_atts.shape[3]=makeVector3(-2,-1,0); shield_atts.base_opacity=.45; partGen[8].create(shield_atts,shieldShatter_atts); - partGen[8].setTexture("images/t3.bmp"); + partGen[8].setTexture(DATADIR "images/t3.bmp"); partGen[8].start(); /**************************RESPAWN SPARKS***********************************/ @@ -1762,7 +1772,7 @@ shield_atts.base_opacity=.6; shield_atts.shape[0]=makeVector3(3,-1,0); shield_atts.shape[1]=makeVector3(3,1,0); shield_atts.shape[2]=makeVector3(-3,1,0); shield_atts.shape[3]=makeVector3(-3,-1,0); partGen[9].create(shield_atts,respawnGen_atts); - partGen[9].setTexture("images/t4.bmp"); + partGen[9].setTexture(DATADIR "images/t4.bmp"); partGen[9].start(); //nPartGen++; @@ -1774,7 +1784,7 @@ alwaysOnGen_atts.vel=.25; shield_atts.shape[0]=makeVector3(1,-1,0); shield_atts.shape[1]=makeVector3(1,1,0); shield_atts.shape[2]=makeVector3(-1,1,0); shield_atts.shape[3]=makeVector3(-1,-1,0); partGen[10].create(shield_atts,alwaysOnGen_atts); - partGen[10].setTexture("images/t3.bmp"); + partGen[10].setTexture(DATADIR "images/t3.bmp"); partGen[10].start(); /************************MINE EXPLOSIONS***************************/ @@ -1783,7 +1793,7 @@ shield_atts.colour = makeColour(1 , .3 , 1 ); shield_atts.shape[0]=makeVector3(1,-1,0); shield_atts.shape[1]=makeVector3(1,1,0); shield_atts.shape[2]=makeVector3(-1,1,0); shield_atts.shape[3]=makeVector3(-1,-1,0); partGen[11].create(shield_atts,shieldGen_atts); - partGen[11].setTexture("images/t3.bmp"); + partGen[11].setTexture(DATADIR "images/t3.bmp"); partGen[11].start(); /************************ASTEROID EXPLOSIONS***************************/ @@ -1794,7 +1804,7 @@ asteroidGen_atts.vel=.4; shield_atts.shape[0]=makeVector3(1,-1,0); shield_atts.shape[1]=makeVector3(1,1,0); shield_atts.shape[2]=makeVector3(-1,1,0); shield_atts.shape[3]=makeVector3(-1,-1,0); partGen[12].create(shield_atts,asteroidGen_atts); - partGen[12].setTexture("images/t4.bmp"); + partGen[12].setTexture(DATADIR "images/t4.bmp"); partGen[12].start(); /************************SMALL SHOTGUN SPARKS***************************/ @@ -1804,7 +1814,7 @@ alwaysOnGen_atts.vel=0.1; shield_atts.shape[0]=makeVector3(1,-1,0); shield_atts.shape[1]=makeVector3(1,1,0); shield_atts.shape[2]=makeVector3(-1,1,0); shield_atts.shape[3]=makeVector3(-1,-1,0); partGen[13].create(shield_atts,alwaysOnGen_atts); - partGen[13].setTexture("images/t3.bmp"); + partGen[13].setTexture(DATADIR "images/t3.bmp"); partGen[13].start(); /************************COMING FROM THE CONCUSSION BALLS******************************/ @@ -1816,7 +1826,7 @@ alwaysOnGen_atts.vel=.1; shield_atts.shape[0]=makeVector3(1,-1,0); shield_atts.shape[1]=makeVector3(1,1,0); shield_atts.shape[2]=makeVector3(-1,1,0); shield_atts.shape[3]=makeVector3(-1,-1,0); partGen[14].create(shield_atts,alwaysOnGen_atts); - partGen[14].setTexture("images/t3.bmp"); + partGen[14].setTexture(DATADIR "images/t3.bmp"); partGen[14].start(); /**********************CONCUSSION BALLS SHATTER SPAKRS********************************/ @@ -1826,7 +1836,7 @@ shield_atts.shape[0]=makeVector3(2,-1,0); shield_atts.shape[1]=makeVector3(2,1,0); shield_atts.shape[2]=makeVector3(-2,1,0); shield_atts.shape[3]=makeVector3(-2,-1,0); shield_atts.base_opacity=.45; partGen[15].create(shield_atts,shieldShatter_atts); - partGen[15].setTexture("images/t3.bmp"); + partGen[15].setTexture(DATADIR "images/t3.bmp"); partGen[15].start(); /**********************DEFENCE RING PARTS********************************/ @@ -1838,7 +1848,7 @@ alwaysOnGen_atts.vel=.25; shield_atts.shape[0]=makeVector3(1,-1,0); shield_atts.shape[1]=makeVector3(1,1,0); shield_atts.shape[2]=makeVector3(-1,1,0); shield_atts.shape[3]=makeVector3(-1,-1,0); partGen[16].create(shield_atts,alwaysOnGen_atts); - partGen[16].setTexture("images/t3.bmp"); + partGen[16].setTexture(DATADIR "images/t3.bmp"); partGen[16].start(); /**********************SHIELD BAR EFFECT********************************/ @@ -1850,7 +1860,7 @@ alwaysOnGen_atts.vel=.15; shield_atts.shape[0]=makeVector3(1,-1,0); shield_atts.shape[1]=makeVector3(1,1,0); shield_atts.shape[2]=makeVector3(-1,1,0); shield_atts.shape[3]=makeVector3(-1,-1,0); partGen[17].create(shield_atts,alwaysOnGen_atts); - partGen[17].setTexture("images/t3.bmp"); + partGen[17].setTexture(DATADIR "images/t3.bmp"); partGen[17].start(); /********************ARMOUR BAR EFFECT***********************************/ @@ -1862,7 +1872,7 @@ alwaysOnGen_atts.vel=.1; shield_atts.shape[0]=makeVector3(1,-1,0); shield_atts.shape[1]=makeVector3(1,1,0); shield_atts.shape[2]=makeVector3(-1,1,0); shield_atts.shape[3]=makeVector3(-1,-1,0); partGen[18].create(shield_atts,alwaysOnGen_atts); - partGen[18].setTexture("images/t3.bmp"); + partGen[18].setTexture(DATADIR "images/t3.bmp"); partGen[18].start(); /************************COMING FROM THE EMP WAVE******************************/ @@ -1874,7 +1884,7 @@ alwaysOnGen_atts.vel=.2; shield_atts.shape[0]=makeVector3(2,-1,0); shield_atts.shape[1]=makeVector3(2,1,0); shield_atts.shape[2]=makeVector3(-2,1,0); shield_atts.shape[3]=makeVector3(-2,-1,0); partGen[19].create(shield_atts,alwaysOnGen_atts); - partGen[19].setTexture("images/t4.bmp"); + partGen[19].setTexture(DATADIR "images/t4.bmp"); partGen[19].start(); /************************EMP WAVE END******************************/ @@ -1886,7 +1896,7 @@ alwaysOnGen_atts.vel=.4; shield_atts.shape[0]=makeVector3(2,-1,0); shield_atts.shape[1]=makeVector3(2,1,0); shield_atts.shape[2]=makeVector3(-2,1,0); shield_atts.shape[3]=makeVector3(-2,-1,0); partGen[20].create(shield_atts,alwaysOnGen_atts); - partGen[20].setTexture("images/t4.bmp"); + partGen[20].setTexture(DATADIR "images/t4.bmp"); partGen[20].start(); /************************COMING FROM THE BERSERKERS******************************/ @@ -1897,7 +1907,7 @@ alwaysOnGen_atts.vel=.25; shield_atts.shape[0]=makeVector3(1,-1,0); shield_atts.shape[1]=makeVector3(1,1,0); shield_atts.shape[2]=makeVector3(-1,1,0); shield_atts.shape[3]=makeVector3(-1,-1,0); partGen[21].create(shield_atts,alwaysOnGen_atts); - partGen[21].setTexture("images/t3.bmp"); + partGen[21].setTexture(DATADIR "images/t3.bmp"); partGen[21].start(); /************************BERSERKERS EXPLOSIONS***************************/ @@ -1906,7 +1916,7 @@ shield_atts.colour = makeColour(1 , 0 , .2 ); shield_atts.shape[0]=makeVector3(1,-1,0); shield_atts.shape[1]=makeVector3(1,1,0); shield_atts.shape[2]=makeVector3(-1,1,0); shield_atts.shape[3]=makeVector3(-1,-1,0); partGen[22].create(shield_atts,shieldGen_atts); - partGen[22].setTexture("images/t3.bmp"); + partGen[22].setTexture(DATADIR "images/t3.bmp"); partGen[22].start(); /************************COMING FROM THE EMP WAVE******************************/ @@ -1918,7 +1928,7 @@ alwaysOnGen_atts.vel=.2; shield_atts.shape[0]=makeVector3(2,-1,0); shield_atts.shape[1]=makeVector3(2,1,0); shield_atts.shape[2]=makeVector3(-2,1,0); shield_atts.shape[3]=makeVector3(-2,-1,0); partGen[23].create(shield_atts,alwaysOnGen_atts); - partGen[23].setTexture("images/t4.bmp"); + partGen[23].setTexture(DATADIR "images/t4.bmp"); partGen[23].start(); nPartGen=24; @@ -1928,21 +1938,21 @@ /*partGen[nPartGen].setParticles(&partSys); partGen[nPartGen].create(smoke_atts,engine_atts); - partGen[nPartGen].setTexture("images/t1.bmp"); + partGen[nPartGen].setTexture(DATADIR "images/t1.bmp"); partGen[nPartGen].start();*/ g->retPlayer(n)->retShip()->addPartsGen(&partGen[0]); //nPartGen++; /*partGen[nPartGen].setParticles(&partSys); partGen[nPartGen].create(sparks_atts,damage_atts); - partGen[nPartGen].setTexture("images/t3.bmp"); + partGen[nPartGen].setTexture(DATADIR "images/t3.bmp"); partGen[nPartGen].start();*/ g->retPlayer(n)->retShip()->addPartsGen(&partGen[1]); //nPartGen++; /*partGen[nPartGen].setParticles(&partSys); partGen[nPartGen].create(shield_atts,shieldGen_atts); - partGen[nPartGen].setTexture("images/t3.bmp"); + partGen[nPartGen].setTexture(DATADIR "images/t3.bmp"); partGen[nPartGen].start();*/ g->retPlayer(n)->retShip()->addPartsGen(&partGen[2]); @@ -1960,7 +1970,7 @@ /*sparks_atts.shape[0]=makeVector3(2,-1,0); sparks_atts.shape[1]=makeVector3(2,1,0); sparks_atts.shape[2]=makeVector3(-2,1,0); sparks_atts.shape[3]=makeVector3(-2,-1,0); partGen[nPartGen].setParticles(&partSys); partGen[nPartGen].create(sparks_atts,explosion_atts); - partGen[nPartGen].setTexture("images/t3.bmp"); + partGen[nPartGen].setTexture(DATADIR "images/t3.bmp"); partGen[nPartGen].start(); nPartGen++;*/ } @@ -2124,8 +2134,15 @@ char *filename_base="shot"; for(int num=0 ; num<100 ; num++){ +#ifdef __unix__ + char *filename_final = new char[homedir?strlen(homedir):1+18+4+2+1+3+1]; + sprintf(filename_final,"%s/duel3-screenshots/",homedir); + check_and_create_dir(filename_final); + sprintf(filename_final,"%s/duel3-screenshots/%s%d.bmp",homedir, filename_base,num); +#else char *filename_final = new char[12+4+2+1+3+1]; sprintf(filename_final,"screenshots/%s%d.bmp",filename_base,num); +#endif outtext(LOGFILE,filename_final); if(!exists(filename_final)){ save_bitmap(filename_final,bmp,NULL); --- Duel3_20060225_src/Source/BRect.h.fixes 2006-02-15 22:36:06.000000000 +0100 +++ Duel3_20060225_src/Source/BRect.h 2007-01-31 21:07:51.000000000 +0100 @@ -46,7 +46,7 @@ float shieldDamage,armorDamage,projDamage; int owner_id; //player's id (ie id of ship, or id of projectile's owner) int owner_team; - int ptrToOwner; + void *ptrToOwner; int genType; }CollisionInfo; --- /dev/null 2007-01-31 20:22:37.739376250 +0100 +++ Duel3_20060225_src/Source/unix.cpp 2007-01-31 21:07:51.000000000 +0100 @@ -0,0 +1,50 @@ +#include +#include +#include +#include +#include + +int check_and_create_dir(const char *name) +{ + struct stat stat_buffer; + + if (stat(name, &stat_buffer)) + { + /* error check if it doesn't exist or something else is wrong */ + if (errno == ENOENT) + { + /* doesn't exist letts create it ;) */ +#ifdef BSD43 + if (mkdir(name, 0775)) +#else + if (mkdir(name, S_IRWXU|S_IRWXG|S_IROTH|S_IXOTH)) +#endif + { + fprintf(stderr, "Error creating dir %s", name); + perror(" "); + return -1; + } + } + else + { + /* something else went wrong yell about it */ + fprintf(stderr, "Error opening %s", name); + perror(" "); + return -1; + } + } + else + { + /* file exists check it's a dir otherwise yell about it */ +#ifdef BSD43 + if (!(S_IFDIR & stat_buffer.st_mode)) +#else + if (!S_ISDIR(stat_buffer.st_mode)) +#endif + { + fprintf(stderr,"Error %s exists but isn't a dir\n", name); + return -1; + } + } + return 0; +} --- Duel3_20060225_src/Source/CPacket.h.fixes 2003-07-31 19:24:26.000000000 +0200 +++ Duel3_20060225_src/Source/CPacket.h 2007-01-31 21:07:51.000000000 +0100 @@ -7,9 +7,9 @@ #include #include #include -#include +#include #include -#include "standards.h" +#include "Standards.h" class CPacket { --- Duel3_20060225_src/Source/CCamera.h.fixes 2006-02-15 22:36:32.000000000 +0100 +++ Duel3_20060225_src/Source/CCamera.h 2007-01-31 21:07:51.000000000 +0100 @@ -9,8 +9,8 @@ #include #include #include -#include -#include "standards.h" +#include +#include "Standards.h" #include "CVector3.h" @@ -32,8 +32,8 @@ void moveCamera(void); bool setOrthoViewport(int w, int h); - CCamera::CCamera(CVector3 _pos,CVector3 _forward, CVector3 _up) {pos=_pos; forward=_forward; up=_up; init();} - CCamera::CCamera(void) {pos.zero(); forward.setVector(0,0,1); up.setVector(0,1,0); init(); pos.z=-200;} + CCamera(CVector3 _pos,CVector3 _forward, CVector3 _up) {pos=_pos; forward=_forward; up=_up; init();} + CCamera(void) {pos.zero(); forward.setVector(0,0,1); up.setVector(0,1,0); init(); pos.z=-200;} float retX(void) {return pos.x;} float retZ(void) {return pos.z;} --- Duel3_20060225_src/Source/CVector3.h.fixes 2006-02-15 22:37:30.000000000 +0100 +++ Duel3_20060225_src/Source/CVector3.h 2007-01-31 21:07:51.000000000 +0100 @@ -10,7 +10,7 @@ #include #include -#include "standards.h" +#include "Standards.h" using namespace std; @@ -47,8 +47,8 @@ float retYAng(void); float retZAng(void); - CVector3::CVector3(void) {x=0;y=0;z=0; mag=0;} - CVector3::CVector3(float _x, float _y, float _z) {x=_x; y=_y; z=_z; mag=findMagnitude();} + CVector3(void) {x=0;y=0;z=0; mag=0;} + CVector3(float _x, float _y, float _z) {x=_x; y=_y; z=_z; mag=findMagnitude();} //Overloaded operators //vector addition and subtraction --- Duel3_20060225_src/Source/Player.h.fixes 2006-02-15 22:41:00.000000000 +0100 +++ Duel3_20060225_src/Source/Player.h 2007-01-31 21:07:51.000000000 +0100 @@ -17,7 +17,7 @@ #include "BRect.h" #include "Controller.h" #include "Ship.h" -#include "ParticleGenerator.h" +#include "particlegenerator.h" #define RED 0 --- Duel3_20060225_src/Source/Proj.h.fixes 2006-02-15 22:42:12.000000000 +0100 +++ Duel3_20060225_src/Source/Proj.h 2007-01-31 21:07:51.000000000 +0100 @@ -36,7 +36,7 @@ int armor; //for non-energy projectiles int lifetime; //some projectiles will cease to exist when their life runs out - int ptrToOwner; + void *ptrToOwner; public: void init(void); @@ -49,10 +49,10 @@ CollisionInfo reactToCollision(void); void reactToCollisionInfo(CollisionInfo &colInfo); - void setOwner(int _owner_id, int _owner_team, int ptr) {owner_id=_owner_id; owner_team = _owner_team; ptrToOwner = ptr;} + void setOwner(int _owner_id, int _owner_team, void *ptr) {owner_id=_owner_id; owner_team = _owner_team; ptrToOwner = ptr;} int retOwnerId(void) {return owner_id;} int retOwnerTeam(void) {return owner_team; } - int retPtrToOwner(void) {return ptrToOwner; } + void *retPtrToOwner(void) {return ptrToOwner; } void update(BRect bounds); void draw(bool wireframe=false); --- Duel3_20060225_src/Source/Weapon.cpp.fixes 2007-01-31 21:10:50.000000000 +0100 +++ Duel3_20060225_src/Source/Weapon.cpp 2007-01-31 21:11:07.000000000 +0100 @@ -32,7 +32,6 @@ void Weapon::init(void) { - outtext(LOGFILE,"init weapon\n"); resetProjInfo(); iCoolDown=0; strcpy(sName,""); --- Duel3_20060225_src/Source/particlegenerator.h.fixes 2006-02-15 22:41:00.000000000 +0100 +++ Duel3_20060225_src/Source/particlegenerator.h 2007-01-31 21:07:51.000000000 +0100 @@ -8,8 +8,8 @@ #include -#include "Particle.h" -#include "ParticleSystem.h" +#include "particle.h" +#include "particlesystem.h" typedef struct { --- Duel3_20060225_src/Source/oCVector3.h.fixes 2003-05-29 19:32:36.000000000 +0200 +++ Duel3_20060225_src/Source/oCVector3.h 2007-01-31 21:07:51.000000000 +0100 @@ -5,7 +5,7 @@ #include #include -#include "standards.h" +#include "Standards.h" using namespace std; --- /dev/null 2007-01-31 20:22:37.739376250 +0100 +++ Duel3_20060225_src/Source/Makefile 2007-01-31 21:07:51.000000000 +0100 @@ -0,0 +1,31 @@ +PREFIX = /usr +TARGET = duel3 +BINDIR = $(PREFIX)/bin/ +DATADIR = $(PREFIX)/share/$(TARGET) +CFLAGS = -g -Wall -O2 -Wno-non-virtual-dtor +LDFLAGS = `allegro-config --libs` -ldumb -laldmb -lagl -lGL -lGLU +DEFINES = -DDATADIR=\"$(DATADIR)/\" +OBJS = main.o Standards.o CCamera.o CVector2.o BRect.o SObject.o Model.o Weapon.o Animation.o PObject.o Ship.o Proj.o Arena.o Player.o Game.o Widget.o ShipArray.o Starfield.o CVector3.o particle.o particlesystem.o particlegenerator.o asteroid.o Controller.o SfxSingleton.o GameMode.o AsteroidsGameMode.o NewMenu.o Button.o CheckBox.o ShipSelector.o MissileAvoid.o AIPlayer.o Turret.o MissileAvoid2p.o GameSettingsSingleton.o ScoreKeeper.o AsteroidsGameMode2p.o Powerup.o unix.o + +$(TARGET): $(OBJS) + g++ $(LDFLAGS) -o $@ $^ + +%.o: %.cpp + g++ $(CFLAGS) $(DEFINES) -o $@ -c $< + +install: $(TARGET) + mkdir -p $(BINDIR) + mkdir -p $(DATADIR)/images + mkdir -p $(DATADIR)/models + mkdir -p $(DATADIR)/music + mkdir -p $(DATADIR)/w_hud + install -p -m 755 $(TARGET) $(BINDIR) + install -p -m 644 images/* $(DATADIR)/images + install -p -m 644 models/* $(DATADIR)/models + install -p -m 644 music/* $(DATADIR)/music + install -p -m 644 w_hud/* $(DATADIR)/w_hud + install -p -m 664 *.dat $(DATADIR) + install -p -m 664 *.d3 $(DATADIR) + +clean: + rm -f $(OBJS) $(TARGET) *~ --- Duel3_20060225_src/Source/Game.h.fixes 2006-02-15 22:37:40.000000000 +0100 +++ Duel3_20060225_src/Source/Game.h 2007-01-31 21:07:51.000000000 +0100 @@ -8,13 +8,13 @@ #include #include #include "Standards.h" -#include "ParticleGenerator.h" +#include "particlegenerator.h" #include "ScoreKeeper.h" #include "SObject.h" #include "Arena.h" #include "PObject.h" -#include "Asteroid.h" +#include "asteroid.h" #include "Proj.h" #include "Powerup.h" #include "Player.h" --- Duel3_20060225_src/Source/particle.h.fixes 2006-02-15 22:41:00.000000000 +0100 +++ Duel3_20060225_src/Source/particle.h 2007-01-31 21:07:51.000000000 +0100 @@ -7,6 +7,7 @@ #define PARTICLE_H #include "CVector3.h" +#include #define PART_POINT 0 #define PART_BLOB 1 --- Duel3_20060225_src/Source/CNetwork.h.fixes 2003-05-31 17:59:16.000000000 +0200 +++ Duel3_20060225_src/Source/CNetwork.h 2007-01-31 21:07:51.000000000 +0100 @@ -7,9 +7,9 @@ #include #include #include -#include +#include #include -#include "standards.h" +#include "Standards.h" using namespace std; --- Duel3_20060225_src/Source/CPlayer.h.fixes 2003-06-06 19:11:00.000000000 +0200 +++ Duel3_20060225_src/Source/CPlayer.h 2007-01-31 21:07:51.000000000 +0100 @@ -7,9 +7,9 @@ #include #include #include -#include +#include #include -#include "standards.h" +#include "Standards.h" #include "CShip.h" --- Duel3_20060225_src/Source/Standards.h.fixes 2006-02-15 22:43:24.000000000 +0100 +++ Duel3_20060225_src/Source/Standards.h 2007-01-31 21:07:51.000000000 +0100 @@ -21,7 +21,15 @@ #define Degree 0.0174532925199432957692369076848861 +#ifdef __unix__ +extern char LOGFILE[256]; +#else #define LOGFILE "log.txt" +#endif + +#ifndef DATADIR +#define DATADIR "" +#endif #define MAX_SHIP_ATTS 20 #define DONT_CARE -1 --- Duel3_20060225_src/Source/CMenuItem.h.fixes 2002-12-11 23:12:50.000000000 +0100 +++ Duel3_20060225_src/Source/CMenuItem.h 2007-01-31 21:07:51.000000000 +0100 @@ -4,7 +4,7 @@ #include #include #include -#include "standards.h" +#include "Standards.h" #define MAXSTRING 30 #define MAXSUBITEMS 10 --- Duel3_20060225_src/Source/Client.h.fixes 2004-04-05 18:14:52.000000000 +0200 +++ Duel3_20060225_src/Source/Client.h 2007-01-31 21:07:51.000000000 +0100 @@ -7,9 +7,9 @@ #include #include #include -#include +#include #include -#include "standards.h" +#include "Standards.h" #include "CNetwork.h" #include "CPacket.h" --- Duel3_20060225_src/Source/Model.cpp.fixes 2006-02-15 22:39:54.000000000 +0100 +++ Duel3_20060225_src/Source/Model.cpp 2007-01-31 21:07:51.000000000 +0100 @@ -27,14 +27,21 @@ bool Model::loadModel(char *filename) { byte *bFile; - char temp[20]; - + char temp[20]; +#ifdef __unix__ + char filenamebuf[1024]; +#endif char buf[100]; sprintf(buf," load Model: %s\n",filename); outtext(LOGFILE,buf); - //opens the file - ifstream inputFile( filename, ios::in | ios::binary ); + //opens the file +#if __unix__ + snprintf(filenamebuf, 1024, "%s%s", DATADIR, filename); + ifstream inputFile(filenamebuf, ios::in | ios::binary ); +#else + ifstream inputFile(filename, ios::in | ios::binary ); +#endif if ( inputFile.fail()) return false; // "Couldn't Open The Model File." else --- Duel3_20060225_src/Source/Ship.cpp.fixes 2006-02-20 19:38:42.000000000 +0100 +++ Duel3_20060225_src/Source/Ship.cpp 2007-01-31 21:07:51.000000000 +0100 @@ -245,7 +245,7 @@ proj->create(pinfo,(PObject*)this,angle); proj->addVel(vel); proj->setTarget(target); - proj->setOwner(id,team_id,(int)this); + proj->setOwner(id,team_id,this); if(n==0) //only play the sound effect for the first proj that is fired proj->playFireSound(); --- Duel3_20060225_src/Source/Standards.cpp.fixes 2006-02-15 22:42:12.000000000 +0100 +++ Duel3_20060225_src/Source/Standards.cpp 2007-01-31 21:07:51.000000000 +0100 @@ -3,7 +3,8 @@ All rights reserved. ***********************************/ #include -#include +#include +#include #include "allegro.h" #include "Standards.h" --- Duel3_20060225_src/Source/CVector2.h.fixes 2006-02-18 00:47:48.000000000 +0100 +++ Duel3_20060225_src/Source/CVector2.h 2007-01-31 21:07:51.000000000 +0100 @@ -82,9 +82,9 @@ /************INITIALIAZTION ROUTINES*********/ void init(void) {x=0; y=0; mag=0; position=true; normalized=false;} - CVector2::CVector2(void) {init();} - CVector2::CVector2(float _x,float _y, bool _position=true) {init(); setVector(_x,_y,_position,false); } - CVector2::~CVector2(void) {} + CVector2(void) {init();} + CVector2(float _x,float _y, bool _position=true) {init(); setVector(_x,_y,_position,false); } + ~CVector2(void) {} }; CVector2 makeVector2(float x,float y, bool position); --- Duel3_20060225_src/Source/CMenu.h.fixes 2002-12-11 23:12:40.000000000 +0100 +++ Duel3_20060225_src/Source/CMenu.h 2007-01-31 21:07:51.000000000 +0100 @@ -4,7 +4,7 @@ #include #include #include -#include "standards.h" +#include "Standards.h" #include "CMenuItem.h" --- Duel3_20060225_src/Source/Weapon.h.fixes 2006-02-15 22:43:24.000000000 +0100 +++ Duel3_20060225_src/Source/Weapon.h 2007-01-31 21:07:51.000000000 +0100 @@ -17,7 +17,7 @@ #include "Object.h" #include "BRect.h" -#include "ParticleGenerator.h" +#include "particlegenerator.h" using namespace std; --- Duel3_20060225_src/Source/models.d3.fixes 2006-02-20 19:56:22.000000000 +0100 +++ Duel3_20060225_src/Source/models.d3 2007-01-31 21:07:51.000000000 +0100 @@ -1,16 +1,16 @@ 15 -models\hellstrike.ms3d -models\crysblade.ms3d -models\hammerskull.ms3d -models\viper.ms3d -models\gaia.ms3d -models\bulldog.ms3d -models\switchblade.ms3d -models\redeemer.ms3d -models\missile2.ms3d -models\sphere.ms3d -models\mine.ms3d -models\asteroid.ms3d -models\asteroid2.ms3d -models\asteroid3.ms3d -models\missile3.ms3d \ No newline at end of file +models/hellstrike.ms3d +models/crysblade.ms3d +models/hammerskull.ms3d +models/viper.ms3d +models/gaia.ms3d +models/bulldog.ms3d +models/switchblade.ms3d +models/redeemer.ms3d +models/missile2.ms3d +models/sphere.ms3d +models/mine.ms3d +models/asteroid.ms3d +models/asteroid2.ms3d +models/asteroid3.ms3d +models/missile3.ms3d \ No newline at end of file --- Duel3_20060225_src/Source/CClient.h.fixes 2003-07-28 19:50:40.000000000 +0200 +++ Duel3_20060225_src/Source/CClient.h 2007-01-31 21:07:51.000000000 +0100 @@ -7,9 +7,9 @@ #include #include #include -#include +#include #include -#include "standards.h" +#include "Standards.h" #include "CNetwork.h" #include "CPacket.h" --- Duel3_20060225_src/Source/Game.cpp~ 2007-01-31 21:35:08.000000000 +0100 +++ Duel3_20060225_src/Source/Game.cpp 2007-01-31 21:35:08.000000000 +0100 @@ -110,7 +110,7 @@ pinfo.model = &allModels[8]; pinfo.fRadius = .5; - weapons[iNumWeapons].createWeapon("Lightning Ball",6,pinfo,"w_hud/single_shot.bmp"); + weapons[iNumWeapons].createWeapon("Lightning Ball",6,pinfo,DATADIR "w_hud/single_shot.bmp"); iNumWeapons++; pinfo.fAccel=.03; @@ -138,7 +138,7 @@ pinfo.model = &allModels[14]; pinfo.fRadius = .5; - weapons[iNumWeapons].createWeapon("Hellstrike",14,pinfo,"w_hud/hellstrike.bmp"); + weapons[iNumWeapons].createWeapon("Hellstrike",14,pinfo,DATADIR "w_hud/hellstrike.bmp"); iNumWeapons++; @@ -168,7 +168,7 @@ pinfo.model = &allModels[14]; pinfo.fRadius = .5; - weapons[iNumWeapons].createWeapon("Wrath Missile",14,pinfo,"w_hud/missile.bmp"); + weapons[iNumWeapons].createWeapon("Wrath Missile",14,pinfo,DATADIR "w_hud/missile.bmp"); iNumWeapons++; @@ -197,7 +197,7 @@ pinfo.model = 0; pinfo.fRadius = .05; - weapons[iNumWeapons].createWeapon("Lightning",2,pinfo,"w_hud/lightning.bmp"); + weapons[iNumWeapons].createWeapon("Lightning",2,pinfo,DATADIR "w_hud/lightning.bmp"); iNumWeapons++; pinfo.fAccel=.014; @@ -225,7 +225,7 @@ pinfo.model = 0; pinfo.fRadius = .05; - weapons[iNumWeapons].createWeapon("Shot Gun",14,pinfo,"w_hud/shotgun.bmp"); + weapons[iNumWeapons].createWeapon("Shot Gun",14,pinfo,DATADIR "w_hud/shotgun.bmp"); iNumWeapons++; @@ -254,7 +254,7 @@ pinfo.model = /*&allModels[10]*/0; pinfo.fRadius = .65; - weapons[iNumWeapons].createWeapon("Plasma Mine",25,pinfo,"w_hud/one_mine.bmp"); + weapons[iNumWeapons].createWeapon("Plasma Mine",25,pinfo,DATADIR "w_hud/one_mine.bmp"); iNumWeapons++; @@ -284,7 +284,7 @@ pinfo.model = &allModels[8]; pinfo.fRadius = .5; - weapons[iNumWeapons].createWeapon("Tri-Shot",7,pinfo,"w_hud/tri_shot.bmp"); + weapons[iNumWeapons].createWeapon("Tri-Shot",7,pinfo,DATADIR "w_hud/tri_shot.bmp"); iNumWeapons++; @@ -313,7 +313,7 @@ pinfo.model = &allModels[14]; pinfo.fRadius = .5; - weapons[iNumWeapons].createWeapon("Homing Missiles",14,pinfo,"w_hud/homing_missile.bmp"); + weapons[iNumWeapons].createWeapon("Homing Missiles",14,pinfo,DATADIR "w_hud/homing_missile.bmp"); iNumWeapons++; @@ -342,7 +342,7 @@ pinfo.model = /*&allModels[10]*/0; pinfo.fRadius = .65; - weapons[iNumWeapons].createWeapon("Spider Mine",25,pinfo,"w_hud/four_mines.bmp"); + weapons[iNumWeapons].createWeapon("Spider Mine",25,pinfo,DATADIR "w_hud/four_mines.bmp"); iNumWeapons++; @@ -371,7 +371,7 @@ pinfo.model = /*&allModels[8]*/NULL; pinfo.fRadius = 1; - weapons[iNumWeapons].createWeapon("Concussion",25,pinfo,"w_hud/concussion.bmp"); + weapons[iNumWeapons].createWeapon("Concussion",25,pinfo,DATADIR "w_hud/concussion.bmp"); iNumWeapons++; @@ -400,7 +400,7 @@ pinfo.model = 0; pinfo.fRadius = .65; - weapons[iNumWeapons].createWeapon("Defense Ring",50,pinfo,"w_hud/defense.bmp"); + weapons[iNumWeapons].createWeapon("Defense Ring",50,pinfo,DATADIR "w_hud/defense.bmp"); iNumWeapons++; @@ -430,7 +430,7 @@ pinfo.model = &allModels[14]; pinfo.fRadius = .7; - weapons[iNumWeapons].createWeapon("Redeemer Missile",20,pinfo,"w_hud/redeemer.bmp"); + weapons[iNumWeapons].createWeapon("Redeemer Missile",20,pinfo,DATADIR "w_hud/redeemer.bmp"); iNumWeapons++; @@ -459,7 +459,7 @@ pinfo.model = &allModels[8]; pinfo.fRadius = .5; - weapons[iNumWeapons].createWeapon("Gattling Gun",2,pinfo,"w_hud/gattling.bmp"); + weapons[iNumWeapons].createWeapon("Gattling Gun",2,pinfo,DATADIR "w_hud/gattling.bmp"); iNumWeapons++; pinfo.fAccel=.014; @@ -487,7 +487,7 @@ pinfo.model = &allModels[8]; pinfo.fRadius = .5; - weapons[iNumWeapons].createWeapon("Rebound Gun",40,pinfo,"w_hud/rebound.bmp"); + weapons[iNumWeapons].createWeapon("Rebound Gun",40,pinfo,DATADIR "w_hud/rebound.bmp"); iNumWeapons++; pinfo.fAccel=.014; @@ -515,7 +515,7 @@ pinfo.model = /*&allModels[8]*/0; pinfo.fRadius = 3; - weapons[iNumWeapons].createWeapon("EMP Wave",30,pinfo,"w_hud/emp.bmp"); + weapons[iNumWeapons].createWeapon("EMP Wave",30,pinfo,DATADIR "w_hud/emp.bmp"); iNumWeapons++; @@ -545,7 +545,7 @@ pinfo.model = /*&allModels[10]*/0; pinfo.fRadius = .65; - weapons[iNumWeapons].createWeapon("Berserkers",25,pinfo,"w_hud/berserkers.bmp"); + weapons[iNumWeapons].createWeapon("Berserkers",25,pinfo,DATADIR "w_hud/berserkers.bmp"); iNumWeapons++; /*pinfo.fAccel=.014; --- NEW FILE duel3.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Duel 3 Comment=One on one spaceship duel in a 2D arena Exec=duel3 Icon=duel3.png Terminal=false StartupNotify=false Type=Application Categories=Game;ArcadeGame; --- NEW FILE duel3.spec --- %define snapshot 20060225 Name: duel3 Version: 0.1 Release: 0.2.%{snapshot}%{?dist} Summary: One on one spaceship duel in a 2D arena Group: Amusements/Games License: BSD URL: http://ts-games.com/duel3.php Source0: http://dl.sf.net/sourceforge/%{name}/Duel3_%{snapshot}_src.zip Source1: http://dl.sf.net/sourceforge/%{name}/Duel3_%{snapshot}_bin.zip Source2: %{name}.desktop Source3: %{name}.png Source4: music-credits.txt Patch0: Duel3_20060225-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alleggl-devel dumb-devel libGLU-devel desktop-file-utils Requires: hicolor-icon-theme %description The sudden attack from the Martain Rim miners caught the Earth by suprise, there was no way the meager Earth Space Fleet could defend themselves. The miners attacked, and eliminated their enemies, and then returned to the asteroid belt. However, Earth could not accept such an embarrassing defeat. The military developed new space fighters, and trained several squadrons of elite pilots. The task force was then deployed against the miners. These trained pilots utterly defeated the miners in a matter of weeks, and the first space war in human history was finished. The military, however, now had a new problem on their hands. These new elite pilots were becoming restless, and there was no way for them to test their skills. The military dare not disband the force, or let their skills dull, so the Duel Combat League was formed. The newly formed league quickly became the premier entertainment form on the planet, and the military's largest source of income. Take control of a Duel fighter, and test your skills againt your opponents and the arena itself in fast-paced space combat. %prep %setup -q -a 1 -n Duel3_%{snapshot}_src mv Duel3_%{snapshot}_bin/* Source cp %{SOURCE4} . %patch0 -p1 -z .fixes sed -i 's/\r//' Source/readme.txt license.txt music-credits.txt %build pushd Source make %{?_smp_mflags} PREFIX=%{_prefix} \ CFLAGS="$RPM_OPT_FLAGS -fsigned-char -Wno-deprecated-declarations -Wno-non-virtual-dtor" popd %install rm -rf $RPM_BUILD_ROOT pushd Source make install PREFIX=$RPM_BUILD_ROOT%{_prefix} popd # below is the desktop file and icon stuff. mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE2} mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps install -p -m 644 %{SOURCE3} \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files %defattr(-,root,root,-) %doc Source/readme.txt license.txt music-credits.txt %{_bindir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/64x64/apps/%{name}.png %changelog * Sat Feb 3 2007 Hans de Goede 0.1-0.2.20060225 - Add missing "Requires: hicolor-icon-theme" (bz 226729) - Add music-credits.txt, properly giving credits for the used music (bz 226729) * Thu Jan 25 2007 Hans de Goede 0.1-0.1.20060225 - Initial Fedora Extras package, many thanks to my students Albert-Jan Visser and Bas Meel for doing the Linux port of this! --- NEW FILE music-credits.txt --- Music Created by and used with permission of Antonio Salgado (aka NoOne) Email: tognin at hotmail.com http://www.s3m.com/dma/displayuser.php?user_id=1061 The permission request mail and permission notice are below for reference: --- Message-ID: <45C1AEB2.7030804 at hhs.nl> Date: Thu, 01 Feb 2007 10:11:14 +0100 From: Hans de Goede User-Agent: Thunderbird 1.5.0.9 (X11/20061223) MIME-Version: 1.0 To: tognin at hotmail.com, tognin at ole.com Subject: BlackIce songs on www.s3m.com Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Hi, First let me introduce myself I'm a Linux enthousiast and developer. Lately I'm mainly active in porting games to Linux and packaging them for the Fedora Linux Distribution. The last game which I've just finished porting to Linux is a game called duel3, see: http://ts-games.com/duel3.php This game uses your Black Ice 1 - 4 songs (as is stated in the readme) from: http://www.s3m.com/dma/displayuser.php?user_id=1061 However the docs in the game, nor your website contain any further information on under which conditions these songs may be distributed. Since we (the Fedora community) take intellectual property very serious I would like to ask you if its ok to distribute your songs and if there are any special conditions to distributing other then giving you credit for the songs and linking to your homepage from the docs. Thanks & Regards, Hans --- Return-Path: Received: from koko.hhs.nl ([145.52.2.16] verified) by hhs.nl (CommuniGate Pro SMTP 4.3.6) with ESMTP id 59604439 for j.w.r.degoede at hhs.nl; Thu, 01 Feb 2007 12:48:56 +0100 Received: from exim by koko.hhs.nl with spam-scanned (Exim 4.62) (envelope-from ) id 1HCaQv-0005Nx-3o for j.w.r.degoede at hhs.nl; Thu, 01 Feb 2007 12:48:56 +0100 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on koko.hhs.nl X-Spam-Level: xx X-Spam-Status: No, score=2.1 required=5.0 tests=BAYES_00,DNS_FROM_RFC_ABUSE, DNS_FROM_RFC_POST,MSGID_FROM_MTA_HEADER,SPF_PASS, UNWANTED_LANGUAGE_BODY autolearn=no version=3.1.0 Received: from exim (helo=koko) by koko.hhs.nl with local-smtp (Exim 4.62) (envelope-from ) id 1HCaQu-0005Nt-Vp for j.w.r.degoede at hhs.nl; Thu, 01 Feb 2007 12:48:53 +0100 Received: from [65.54.246.156] (port=2230 helo=bay0-omc2-s20.bay0.hotmail.com) by koko.hhs.nl with esmtp (Exim 4.62) (envelope-from ) id 1HCaQu-0005No-H9 for j.w.r.degoede at hhs.nl; Thu, 01 Feb 2007 12:48:52 +0100 Received: from hotmail.com ([65.54.162.24]) by bay0-omc2-s20.bay0.hotmail.com with Microsoft SMTPSVC(6.0.3790.2668); Thu, 1 Feb 2007 03:48:51 -0800 Received: from mail pickup service by hotmail.com with Microsoft SMTPSVC; Thu, 1 Feb 2007 03:48:51 -0800 Message-ID: Received: from 65.54.162.200 by by108fd.bay108.hotmail.msn.com with HTTP; Thu, 01 Feb 2007 11:48:50 GMT X-Originating-IP: [195.53.125.135] X-Originating-Email: [tognin at hotmail.com] X-Sender: tognin at hotmail.com In-Reply-To: <45C1AEB2.7030804 at hhs.nl> From: "Antonio Salgado" To: j.w.r.degoede at hhs.nl Bcc: Subject: RE: BlackIce songs on www.s3m.com Date: Thu, 01 Feb 2007 11:48:50 +0000 Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1; format=flowed X-OriginalArrivalTime: 01 Feb 2007 11:48:51.0016 (UTC) FILETIME=[F0F44480:01C745F6] X-Anti-Virus: Kaspersky Anti-Virus for MailServers 5.5.2/RELEASE, bases: 01022007 #249122, status: clean Hi! the first thing I have to say is that I'm spanish, so I hope that my english will be fine. thanks for your e-mail. These songs can be used freely. The only thing I want is to be credited on the game as "Antonio Salgado" that is my real name. When I'll arrive at home I'll try the game, It looks good. thanks again. see you!! _________________________________________________________________ ?Est?s pensando en cambiar de coche? Todas los modelos de serie y extras en MSN Motor. http://motor.msn.es/researchcentre/ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/duel3/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Feb 2007 22:02:50 -0000 1.1 +++ .cvsignore 7 Feb 2007 10:07:12 -0000 1.2 @@ -0,0 +1,2 @@ +Duel3_20060225_bin.zip +Duel3_20060225_src.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/duel3/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Feb 2007 22:02:50 -0000 1.1 +++ sources 7 Feb 2007 10:07:12 -0000 1.2 @@ -0,0 +1,2 @@ +0aa9fa786257d6f1d6dd79d2bf591070 Duel3_20060225_bin.zip +44023431a37932ab44a9cf0be9230714 Duel3_20060225_src.zip From fedora-extras-commits at redhat.com Wed Feb 7 10:11:02 2007 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Wed, 7 Feb 2007 05:11:02 -0500 Subject: rpms/fcron/devel fcron-3.0.2-accept_readable_fcron.conf.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 fcron.spec, 1.7, 1.8 sources, 1.2, 1.3 Message-ID: <200702071011.l17AB2qU014556@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/fcron/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14530 Modified Files: .cvsignore fcron.spec sources Added Files: fcron-3.0.2-accept_readable_fcron.conf.patch Log Message: New upstream release fcron-3.0.2-accept_readable_fcron.conf.patch: --- NEW FILE fcron-3.0.2-accept_readable_fcron.conf.patch --- --- subs.c.orig 2007-01-15 22:41:06.000000000 +0100 +++ subs.c 2007-02-07 10:45:31.000000000 +0100 @@ -222,10 +222,9 @@ /* check if the file is secure : owner:root, group:fcron, * writable only by owner */ if ( fstat(fileno(f), &st) != 0 - || st.st_uid != rootuid || st.st_gid != fcrongid || st.st_mode & S_IWGRP || st.st_mode & S_IWOTH ) { - error("Conf file (%s) must be owned by root:" GROUPNAME - " and (no more than) 644 : ignored", fcronconf, GROUPNAME); + error("Conf file (%s) must not have more perms than 644 : ignored", + fcronconf); fclose(f); return; } Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fcron/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Jun 2006 11:55:08 -0000 1.2 +++ .cvsignore 7 Feb 2007 10:10:30 -0000 1.3 @@ -1 +1 @@ -fcron-3.0.1.src.tar.gz +fcron-3.0.2.src.tar.gz Index: fcron.spec =================================================================== RCS file: /cvs/extras/rpms/fcron/devel/fcron.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- fcron.spec 12 Oct 2006 07:46:24 -0000 1.7 +++ fcron.spec 7 Feb 2007 10:10:30 -0000 1.8 @@ -1,6 +1,6 @@ Name: fcron -Version: 3.0.1 -Release: 17%{?dist} +Version: 3.0.2 +Release: 1%{?dist} Summary: A task scheduler Summary(fr): Un ordonnanceur de t??ches Summary(it): Uno schedulatore di processi @@ -14,8 +14,8 @@ Patch0: fcron-3.0.1-Makefile.in.fedora_install.patch Patch1: fcron-3.0.1-doc_Makefile.in.fedora_install.patch Patch2: fcron-3.0.1-configure.fedora.patch -Patch3: fcron-3.0.1-accept_readable_fcron.conf.patch -Patch4: fcrontab.c.seteuid +Patch3: fcron-3.0.2-accept_readable_fcron.conf.patch +#Patch4: fcrontab.c.seteuid BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: sysklogd @@ -85,8 +85,8 @@ %patch0 -p0 %patch1 -p0 %patch2 -p0 -%patch3 -p1 -%patch4 -p0 +%patch3 -p0 +#%patch4 -p0 %build @@ -186,6 +186,11 @@ %ghost %{_localstatedir}/run/fcron.pid %changelog +* Wed Feb 7 2007 Alain Portal 3.0.2-1 + - New upstream version + - Update patch3 + - Remove patch4 now applied by upstream + * Fri Oct 12 2006 Alain Portal 3.0.1-17 - Don't remove frcon user when erasing package - Update doc accordingly Index: sources =================================================================== RCS file: /cvs/extras/rpms/fcron/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Jun 2006 11:55:08 -0000 1.2 +++ sources 7 Feb 2007 10:10:30 -0000 1.3 @@ -1 +1 @@ -8e5dcb3a646c11294294895954ef0a48 fcron-3.0.1.src.tar.gz +f35e6af41d356ebcb38882f86a14fb94 fcron-3.0.2.src.tar.gz From fedora-extras-commits at redhat.com Wed Feb 7 10:15:37 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 7 Feb 2007 05:15:37 -0500 Subject: rpms/duel3/FC-6 .cvsignore,1.1,1.2 sources,1.1,1.2 Message-ID: <200702071015.l17AFbKG014706@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/duel3/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14658 Modified Files: .cvsignore sources Log Message: * Sat Feb 3 2007 Hans de Goede 0.1-0.2.20060225 - Add missing "Requires: hicolor-icon-theme" (bz 226729) - Add music-credits.txt, properly giving credits for the used music (bz 226729) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/duel3/FC-6/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Feb 2007 22:02:50 -0000 1.1 +++ .cvsignore 7 Feb 2007 10:15:05 -0000 1.2 @@ -0,0 +1,2 @@ +Duel3_20060225_bin.zip +Duel3_20060225_src.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/duel3/FC-6/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Feb 2007 22:02:50 -0000 1.1 +++ sources 7 Feb 2007 10:15:05 -0000 1.2 @@ -0,0 +1,2 @@ +0aa9fa786257d6f1d6dd79d2bf591070 Duel3_20060225_bin.zip +44023431a37932ab44a9cf0be9230714 Duel3_20060225_src.zip From fedora-extras-commits at redhat.com Wed Feb 7 10:16:02 2007 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Wed, 7 Feb 2007 05:16:02 -0500 Subject: rpms/fcron/FC-6 .cvsignore, 1.2, 1.3 fcron.spec, 1.7, 1.8 sources, 1.2, 1.3 Message-ID: <200702071016.l17AG2ws014741@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/fcron/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14686 Modified Files: .cvsignore fcron.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fcron/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Jun 2006 11:55:08 -0000 1.2 +++ .cvsignore 7 Feb 2007 10:15:29 -0000 1.3 @@ -1 +1 @@ -fcron-3.0.1.src.tar.gz +fcron-3.0.2.src.tar.gz Index: fcron.spec =================================================================== RCS file: /cvs/extras/rpms/fcron/FC-6/fcron.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- fcron.spec 12 Oct 2006 07:46:24 -0000 1.7 +++ fcron.spec 7 Feb 2007 10:15:29 -0000 1.8 @@ -1,6 +1,6 @@ Name: fcron -Version: 3.0.1 -Release: 17%{?dist} +Version: 3.0.2 +Release: 1%{?dist} Summary: A task scheduler Summary(fr): Un ordonnanceur de t??ches Summary(it): Uno schedulatore di processi @@ -14,8 +14,8 @@ Patch0: fcron-3.0.1-Makefile.in.fedora_install.patch Patch1: fcron-3.0.1-doc_Makefile.in.fedora_install.patch Patch2: fcron-3.0.1-configure.fedora.patch -Patch3: fcron-3.0.1-accept_readable_fcron.conf.patch -Patch4: fcrontab.c.seteuid +Patch3: fcron-3.0.2-accept_readable_fcron.conf.patch +#Patch4: fcrontab.c.seteuid BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: sysklogd @@ -85,8 +85,8 @@ %patch0 -p0 %patch1 -p0 %patch2 -p0 -%patch3 -p1 -%patch4 -p0 +%patch3 -p0 +#%patch4 -p0 %build @@ -186,6 +186,11 @@ %ghost %{_localstatedir}/run/fcron.pid %changelog +* Wed Feb 7 2007 Alain Portal 3.0.2-1 + - New upstream version + - Update patch3 + - Remove patch4 now applied by upstream + * Fri Oct 12 2006 Alain Portal 3.0.1-17 - Don't remove frcon user when erasing package - Update doc accordingly Index: sources =================================================================== RCS file: /cvs/extras/rpms/fcron/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Jun 2006 11:55:08 -0000 1.2 +++ sources 7 Feb 2007 10:15:29 -0000 1.3 @@ -1 +1 @@ -8e5dcb3a646c11294294895954ef0a48 fcron-3.0.1.src.tar.gz +f35e6af41d356ebcb38882f86a14fb94 fcron-3.0.2.src.tar.gz From fedora-extras-commits at redhat.com Wed Feb 7 10:17:22 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 7 Feb 2007 05:17:22 -0500 Subject: rpms/duel3/FC-6 Duel3_20060225-fixes.patch, NONE, 1.1 duel3.desktop, NONE, 1.1 duel3.png, NONE, 1.1 duel3.spec, NONE, 1.1 music-credits.txt, NONE, 1.1 Message-ID: <200702071017.l17AHMpn014838@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/duel3/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14828 Added Files: Duel3_20060225-fixes.patch duel3.desktop duel3.png duel3.spec music-credits.txt Log Message: * Sat Feb 3 2007 Hans de Goede 0.1-0.2.20060225 - Add missing "Requires: hicolor-icon-theme" (bz 226729) - Add music-credits.txt, properly giving credits for the used music (bz 226729) Duel3_20060225-fixes.patch: --- NEW FILE Duel3_20060225-fixes.patch --- --- Duel3_20060225_src/Source/PObject.h.fixes 2006-02-18 01:17:42.000000000 +0100 +++ Duel3_20060225_src/Source/PObject.h 2007-01-31 21:07:51.000000000 +0100 @@ -14,8 +14,8 @@ #include "CVector2.h" #include "Object.h" -#include "ParticleSystem.h" -#include "ParticleGenerator.h" +#include "particlesystem.h" +#include "particlegenerator.h" #include "BRect.h" #include "SObject.h" --- Duel3_20060225_src/Source/Button.h.fixes 2006-02-15 22:41:00.000000000 +0100 +++ Duel3_20060225_src/Source/Button.h 2007-01-31 21:07:51.000000000 +0100 @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include "Standards.h" --- Duel3_20060225_src/Source/CServer.h.fixes 2003-06-06 15:30:42.000000000 +0200 +++ Duel3_20060225_src/Source/CServer.h 2007-01-31 21:07:51.000000000 +0100 @@ -7,9 +7,9 @@ #include #include #include -#include +#include #include -#include "standards.h" +#include "Standards.h" #include "CNetwork.h" #include "CPacket.h" --- Duel3_20060225_src/Source/Player.cpp.fixes 2006-02-19 01:16:26.000000000 +0100 +++ Duel3_20060225_src/Source/Player.cpp 2007-01-31 21:07:51.000000000 +0100 @@ -19,9 +19,9 @@ if(hudl.retExist()==false) - hudl.setPict(400,70,"images/hudl_closed.bmp",false); + hudl.setPict(400,70,DATADIR "images/hudl_closed.bmp",false); if(hudr.retExist()==false) - hudr.setPict(400,70,"images/hudr_3.bmp",false); + hudr.setPict(400,70,DATADIR "images/hudr_3.bmp",false); @@ -104,9 +104,9 @@ { if(hudl.retExist()==false) - hudl.setPict(400,70,"images/hudl_3.bmp",false); + hudl.setPict(400,70,DATADIR "images/hudl_3.bmp",false); if(hudr.retExist()==false) - hudr.setPict(400,70,"images/hudr_3.bmp",false); + hudr.setPict(400,70,DATADIR "images/hudr_3.bmp",false); //if(blue_bar.retExist()==false) // blue_bar.setPict(161,10,"w_hud/blue_bar.bmp"); @@ -193,13 +193,13 @@ { if(ScoreKeeper::instance()->getType()==INCREASING_TIME || ScoreKeeper::instance()->getType()==DECREASING_TIME) { - char timeLeft[5]; + char timeLeft[16]; sprintf(timeLeft,"%0.1f",((float)ScoreKeeper::instance()->getTimeLeft() / 32)); writeText_2D(375,545,40,makecol(200,200,200),allFonts[3],timeLeft); } else if(ScoreKeeper::instance()->getType()==SCORE_BASED) { - char score[5]; + char score[16]; sprintf(score,"Score %d",ScoreKeeper::instance()->getScore(0)); writeText_2D(340,547,40,makecol(200,200,200),allFonts[4],score); sprintf(score,"x%0.2f",ScoreKeeper::instance()->getMultiplier(0)); --- Duel3_20060225_src/Source/Server.h.fixes 2004-04-05 19:35:16.000000000 +0200 +++ Duel3_20060225_src/Source/Server.h 2007-01-31 21:07:51.000000000 +0100 @@ -7,9 +7,9 @@ #include #include #include -#include +#include #include -#include "standards.h" +#include "Standards.h" #include "CNetwork.h" #include "CPacket.h" --- Duel3_20060225_src/Source/AsteroidsGameMode.h.fixes 2006-02-15 22:35:46.000000000 +0100 +++ Duel3_20060225_src/Source/AsteroidsGameMode.h 2007-01-31 21:07:51.000000000 +0100 @@ -6,7 +6,7 @@ #ifndef ASTEROIDSGAMEMODE_H #define ASTEROIDSGAMEMODE_H -#include "gamemode.h" +#include "GameMode.h" #include "CVector2.h" #include "Arena.h" --- Duel3_20060225_src/Source/Controller.cpp.fixes 2006-02-15 22:36:48.000000000 +0100 +++ Duel3_20060225_src/Source/Controller.cpp 2007-01-31 21:07:51.000000000 +0100 @@ -3,7 +3,7 @@ All rights reserved. ***********************************/ -#include "controller.h" // class's header file +#include "Controller.h" // class's header file void Controller::pollController(void) { --- Duel3_20060225_src/Source/main.cpp.fixes 2006-02-25 12:23:32.000000000 +0100 +++ Duel3_20060225_src/Source/main.cpp 2007-01-31 21:07:51.000000000 +0100 @@ -20,11 +20,11 @@ #include "CVector3.h" #include "CCamera.h" -#include "Particle.h" -#include "ParticleSystem.h" +#include "particle.h" +#include "particlesystem.h" //#include "SmokeSystem.h" //#include "SparkSystem.h" -#include "ParticleGenerator.h" +#include "particlegenerator.h" #include "Controller.h" #include "SfxSingleton.h" @@ -39,7 +39,7 @@ #include "SObject.h" #include "Arena.h" #include "PObject.h" -#include "Asteroid.h" +#include "asteroid.h" #include "Ship.h" #include "ShipArray.h" #include "Proj.h" @@ -119,7 +119,11 @@ int iGraphicsLoops=0; int iLogicLoops=0; bool bQuitGame=false; - +#ifdef __unix__ +int check_and_create_dir(const char* dir); +char *homedir; +char LOGFILE[256]; +#endif int cycles=0; float fps; @@ -236,10 +240,16 @@ int main(int argc, const char **argv) { +#ifdef __unix__ + homedir = getenv("HOME"); + homedir = homedir?homedir:(char *)"."; + snprintf(LOGFILE, sizeof(LOGFILE), "%s/.duel3-log.txt", homedir); +#endif remove(LOGFILE); initAllegroGL(); - + +#ifndef __unix__ /**MAKE SURE WE ARE IN THE SAME DIR AS THE EXE**/ char buffer[256]; int len=255; @@ -247,7 +257,7 @@ (get_filename(buffer))[0] = 0; outtext(LOGFILE,buffer); chdir(buffer); - +#endif @@ -270,7 +280,7 @@ // LARGE_INTEGER time1,time2; // QueryPerformanceCounter(&time1); - play_song("music/BlackIce1.XM"); + play_song(DATADIR "music/BlackIce1.XM"); while(/*! key[KEY_ESC] &&*/ !bQuitGame) { @@ -411,7 +421,7 @@ //initMenus(); iMenuNum=0; menu.reset(); - play_song("music/BlackIce1.XM"); + play_song(DATADIR "music/BlackIce1.XM"); outtext(LOGFILE,"RETURNING TO MENU\n"); } } @@ -584,18 +594,18 @@ dumb_register_stdfiles(); outtext(LOGFILE,"Loading title image\n\n"); - title.setPict(800,600,"images/title.bmp",false); + title.setPict(800,600, DATADIR "images/title.bmp",false); load_ship_atts(ship_atts); shipDefs.init(); - loadModels("models.d3"); + loadModels(DATADIR "models.d3"); outtext(LOGFILE,"Models Loaded\n\n"); TShipDef def; outtext(LOGFILE,"Loading fonts\n"); - fonts = load_datafile("fonts.dat"); + fonts = load_datafile(DATADIR "fonts.dat"); if(fonts) outtext(LOGFILE,"Fonts Loaded\n\n"); else @@ -620,7 +630,7 @@ partGen = new ParticleGenerator[MAX_PG]; - loadShipDefs("Ships.d3"); + loadShipDefs(DATADIR "Ships.d3"); game.init(); player1Atts.iColour=0; @@ -632,14 +642,14 @@ strcpy(player2Atts.sName,"Player2"); outtext(LOGFILE,"Loading sounds\n\n"); - SfxSingleton::instance()->setData("sounds.dat"); + SfxSingleton::instance()->setData(DATADIR "sounds.dat"); game.setModels(allModels); - game.setupWeapons("weapons.d3",&partGen); + game.setupWeapons(DATADIR "weapons.d3",&partGen); game.setupPowerupTypes(&partGen); @@ -919,7 +929,7 @@ FILE *fp; outtext(LOGFILE,"\nLoading weapons set\n"); - fp=fopen("WeaponsSet.d3","rt"); + fp=fopen(DATADIR "WeaponsSet.d3","rt"); int numWeaponsSets; if(fp) { @@ -941,7 +951,7 @@ outtext(LOGFILE,"\nLoading ship atts\n"); - fp=fopen("ShipAtts.d3","rt"); + fp=fopen(DATADIR "ShipAtts.d3","rt"); if(fp) { fscanf(fp,"%d",&iNumAtts); @@ -1195,9 +1205,9 @@ outtext(LOGFILE,"entering function startGame\n"); switch( cur_song_num ){ - case 0: play_song("music/BlackIce4.XM"); break; - case 1: play_song("music/BlackIce3.XM"); break; - case 2: play_song("music/BlackIce2.XM"); break; + case 0: play_song(DATADIR "music/BlackIce4.XM"); break; + case 1: play_song(DATADIR "music/BlackIce3.xm"); break; + case 2: play_song(DATADIR "music/BlackIce2.XM"); break; } cur_song_num++; cur_song_num%=3; @@ -1207,7 +1217,7 @@ sec=0; cycles=0; game.resetProjs(); - game.setupWeapons("weapons.d3",&partGen); + game.setupWeapons(DATADIR "weapons.d3",&partGen); game.setupPowerupTypes(&partGen); game.bHotSeat=bHotSeat; @@ -1549,7 +1559,7 @@ void displaySplashScreen(void) { BRect splash; - splash.setPict(1,1,"images/title1.bmp"); + splash.setPict(1,1,DATADIR "images/title1.bmp"); splash.setPos(makeVector2(0,0,true)); @@ -1686,19 +1696,19 @@ /************************SHIP EXAUST**********************************/ partGen[0].setParticles(&partSys); partGen[0].create(smoke_atts,engine_atts); - partGen[0].setTexture("images/t1.bmp"); + partGen[0].setTexture(DATADIR "images/t1.bmp"); partGen[0].start(); /***********************DAMAGE SPARKS********************************/ partGen[1].setParticles(&partSys); partGen[1].create(sparks_atts,damage_atts); - partGen[1].setTexture("images/t3.bmp"); + partGen[1].setTexture(DATADIR "images/t3.bmp"); partGen[1].start(); /***********************SHIP SHIELD PARTS*****************************/ partGen[2].setParticles(&partSys); partGen[2].create(shield_atts,shieldGen_atts); - partGen[2].setTexture("images/t3.bmp"); + partGen[2].setTexture(DATADIR "images/t3.bmp"); partGen[2].start(); /**********************ENERGY PROJ SPARKS******************************/ @@ -1707,7 +1717,7 @@ shield_atts.colour = makeColour(.6 , .6 , 1 ); shield_atts.shape[0]=makeVector3(3,-1,0); shield_atts.shape[1]=makeVector3(3,1,0); shield_atts.shape[2]=makeVector3(-3,1,0); shield_atts.shape[3]=makeVector3(-3,-1,0); partGen[3].create(shield_atts,shieldGen_atts); - partGen[3].setTexture("images/t3.bmp"); + partGen[3].setTexture(DATADIR "images/t3.bmp"); partGen[3].start(); /**********************MISSILE EXAUST**********************************/ @@ -1716,7 +1726,7 @@ smoke_atts.density=1; smoke_atts.start_density=1; smoke_atts.particle_lifespan=10; smoke_atts.shape[0]=makeVector3(1,-2,0); smoke_atts.shape[1]=makeVector3(1,2,0); smoke_atts.shape[2]=makeVector3(-1,2,0); smoke_atts.shape[3]=makeVector3(-1,-2,0); partGen[4].create(smoke_atts,engine_atts); - partGen[4].setTexture("images/t1.bmp"); + partGen[4].setTexture(DATADIR "images/t1.bmp"); partGen[4].start(); /************************SMALL MISSLE EXPLOSIONS***************************/ @@ -1725,14 +1735,14 @@ shield_atts.colour = makeColour(1 , .75 , .1 ); shield_atts.shape[0]=makeVector3(1,-1,0); shield_atts.shape[1]=makeVector3(1,1,0); shield_atts.shape[2]=makeVector3(-1,1,0); shield_atts.shape[3]=makeVector3(-1,-1,0); partGen[5].create(shield_atts,shieldGen_atts); - partGen[5].setTexture("images/t3.bmp"); + partGen[5].setTexture(DATADIR "images/t3.bmp"); partGen[5].start(); /************************SHIP EXPLOSION*******************************/ sparks_atts.shape[0]=makeVector3(2,-1,0); sparks_atts.shape[1]=makeVector3(2,1,0); sparks_atts.shape[2]=makeVector3(-2,1,0); sparks_atts.shape[3]=makeVector3(-2,-1,0); partGen[6].setParticles(&partSys); partGen[6].create(sparks_atts,explosion_atts); - partGen[6].setTexture("images/t3.bmp"); + partGen[6].setTexture(DATADIR "images/t3.bmp"); partGen[6].start(); @@ -1742,7 +1752,7 @@ shield_atts.colour = makeColour(1 , .75 , .1 ); shield_atts.shape[0]=makeVector3(1,-1,0); shield_atts.shape[1]=makeVector3(1,1,0); shield_atts.shape[2]=makeVector3(-1,1,0); shield_atts.shape[3]=makeVector3(-1,-1,0); partGen[7].create(shield_atts,shieldGen_atts); - partGen[7].setTexture("images/t3.bmp"); + partGen[7].setTexture(DATADIR "images/t3.bmp"); partGen[7].start(); /**********************SHIELD SHATTER SPAKRS********************************/ @@ -1752,7 +1762,7 @@ shield_atts.shape[0]=makeVector3(2,-1,0); shield_atts.shape[1]=makeVector3(2,1,0); shield_atts.shape[2]=makeVector3(-2,1,0); shield_atts.shape[3]=makeVector3(-2,-1,0); shield_atts.base_opacity=.45; partGen[8].create(shield_atts,shieldShatter_atts); - partGen[8].setTexture("images/t3.bmp"); + partGen[8].setTexture(DATADIR "images/t3.bmp"); partGen[8].start(); /**************************RESPAWN SPARKS***********************************/ @@ -1762,7 +1772,7 @@ shield_atts.base_opacity=.6; shield_atts.shape[0]=makeVector3(3,-1,0); shield_atts.shape[1]=makeVector3(3,1,0); shield_atts.shape[2]=makeVector3(-3,1,0); shield_atts.shape[3]=makeVector3(-3,-1,0); partGen[9].create(shield_atts,respawnGen_atts); - partGen[9].setTexture("images/t4.bmp"); + partGen[9].setTexture(DATADIR "images/t4.bmp"); partGen[9].start(); //nPartGen++; @@ -1774,7 +1784,7 @@ alwaysOnGen_atts.vel=.25; shield_atts.shape[0]=makeVector3(1,-1,0); shield_atts.shape[1]=makeVector3(1,1,0); shield_atts.shape[2]=makeVector3(-1,1,0); shield_atts.shape[3]=makeVector3(-1,-1,0); partGen[10].create(shield_atts,alwaysOnGen_atts); - partGen[10].setTexture("images/t3.bmp"); + partGen[10].setTexture(DATADIR "images/t3.bmp"); partGen[10].start(); /************************MINE EXPLOSIONS***************************/ @@ -1783,7 +1793,7 @@ shield_atts.colour = makeColour(1 , .3 , 1 ); shield_atts.shape[0]=makeVector3(1,-1,0); shield_atts.shape[1]=makeVector3(1,1,0); shield_atts.shape[2]=makeVector3(-1,1,0); shield_atts.shape[3]=makeVector3(-1,-1,0); partGen[11].create(shield_atts,shieldGen_atts); - partGen[11].setTexture("images/t3.bmp"); + partGen[11].setTexture(DATADIR "images/t3.bmp"); partGen[11].start(); /************************ASTEROID EXPLOSIONS***************************/ @@ -1794,7 +1804,7 @@ asteroidGen_atts.vel=.4; shield_atts.shape[0]=makeVector3(1,-1,0); shield_atts.shape[1]=makeVector3(1,1,0); shield_atts.shape[2]=makeVector3(-1,1,0); shield_atts.shape[3]=makeVector3(-1,-1,0); partGen[12].create(shield_atts,asteroidGen_atts); - partGen[12].setTexture("images/t4.bmp"); + partGen[12].setTexture(DATADIR "images/t4.bmp"); partGen[12].start(); /************************SMALL SHOTGUN SPARKS***************************/ @@ -1804,7 +1814,7 @@ alwaysOnGen_atts.vel=0.1; shield_atts.shape[0]=makeVector3(1,-1,0); shield_atts.shape[1]=makeVector3(1,1,0); shield_atts.shape[2]=makeVector3(-1,1,0); shield_atts.shape[3]=makeVector3(-1,-1,0); partGen[13].create(shield_atts,alwaysOnGen_atts); - partGen[13].setTexture("images/t3.bmp"); + partGen[13].setTexture(DATADIR "images/t3.bmp"); partGen[13].start(); /************************COMING FROM THE CONCUSSION BALLS******************************/ @@ -1816,7 +1826,7 @@ alwaysOnGen_atts.vel=.1; shield_atts.shape[0]=makeVector3(1,-1,0); shield_atts.shape[1]=makeVector3(1,1,0); shield_atts.shape[2]=makeVector3(-1,1,0); shield_atts.shape[3]=makeVector3(-1,-1,0); partGen[14].create(shield_atts,alwaysOnGen_atts); - partGen[14].setTexture("images/t3.bmp"); + partGen[14].setTexture(DATADIR "images/t3.bmp"); partGen[14].start(); /**********************CONCUSSION BALLS SHATTER SPAKRS********************************/ @@ -1826,7 +1836,7 @@ shield_atts.shape[0]=makeVector3(2,-1,0); shield_atts.shape[1]=makeVector3(2,1,0); shield_atts.shape[2]=makeVector3(-2,1,0); shield_atts.shape[3]=makeVector3(-2,-1,0); shield_atts.base_opacity=.45; partGen[15].create(shield_atts,shieldShatter_atts); - partGen[15].setTexture("images/t3.bmp"); + partGen[15].setTexture(DATADIR "images/t3.bmp"); partGen[15].start(); /**********************DEFENCE RING PARTS********************************/ @@ -1838,7 +1848,7 @@ alwaysOnGen_atts.vel=.25; shield_atts.shape[0]=makeVector3(1,-1,0); shield_atts.shape[1]=makeVector3(1,1,0); shield_atts.shape[2]=makeVector3(-1,1,0); shield_atts.shape[3]=makeVector3(-1,-1,0); partGen[16].create(shield_atts,alwaysOnGen_atts); - partGen[16].setTexture("images/t3.bmp"); + partGen[16].setTexture(DATADIR "images/t3.bmp"); partGen[16].start(); /**********************SHIELD BAR EFFECT********************************/ @@ -1850,7 +1860,7 @@ alwaysOnGen_atts.vel=.15; shield_atts.shape[0]=makeVector3(1,-1,0); shield_atts.shape[1]=makeVector3(1,1,0); shield_atts.shape[2]=makeVector3(-1,1,0); shield_atts.shape[3]=makeVector3(-1,-1,0); partGen[17].create(shield_atts,alwaysOnGen_atts); - partGen[17].setTexture("images/t3.bmp"); + partGen[17].setTexture(DATADIR "images/t3.bmp"); partGen[17].start(); /********************ARMOUR BAR EFFECT***********************************/ @@ -1862,7 +1872,7 @@ alwaysOnGen_atts.vel=.1; shield_atts.shape[0]=makeVector3(1,-1,0); shield_atts.shape[1]=makeVector3(1,1,0); shield_atts.shape[2]=makeVector3(-1,1,0); shield_atts.shape[3]=makeVector3(-1,-1,0); partGen[18].create(shield_atts,alwaysOnGen_atts); - partGen[18].setTexture("images/t3.bmp"); + partGen[18].setTexture(DATADIR "images/t3.bmp"); partGen[18].start(); /************************COMING FROM THE EMP WAVE******************************/ @@ -1874,7 +1884,7 @@ alwaysOnGen_atts.vel=.2; shield_atts.shape[0]=makeVector3(2,-1,0); shield_atts.shape[1]=makeVector3(2,1,0); shield_atts.shape[2]=makeVector3(-2,1,0); shield_atts.shape[3]=makeVector3(-2,-1,0); partGen[19].create(shield_atts,alwaysOnGen_atts); - partGen[19].setTexture("images/t4.bmp"); + partGen[19].setTexture(DATADIR "images/t4.bmp"); partGen[19].start(); /************************EMP WAVE END******************************/ @@ -1886,7 +1896,7 @@ alwaysOnGen_atts.vel=.4; shield_atts.shape[0]=makeVector3(2,-1,0); shield_atts.shape[1]=makeVector3(2,1,0); shield_atts.shape[2]=makeVector3(-2,1,0); shield_atts.shape[3]=makeVector3(-2,-1,0); partGen[20].create(shield_atts,alwaysOnGen_atts); - partGen[20].setTexture("images/t4.bmp"); + partGen[20].setTexture(DATADIR "images/t4.bmp"); partGen[20].start(); /************************COMING FROM THE BERSERKERS******************************/ @@ -1897,7 +1907,7 @@ alwaysOnGen_atts.vel=.25; shield_atts.shape[0]=makeVector3(1,-1,0); shield_atts.shape[1]=makeVector3(1,1,0); shield_atts.shape[2]=makeVector3(-1,1,0); shield_atts.shape[3]=makeVector3(-1,-1,0); partGen[21].create(shield_atts,alwaysOnGen_atts); - partGen[21].setTexture("images/t3.bmp"); + partGen[21].setTexture(DATADIR "images/t3.bmp"); partGen[21].start(); /************************BERSERKERS EXPLOSIONS***************************/ @@ -1906,7 +1916,7 @@ shield_atts.colour = makeColour(1 , 0 , .2 ); shield_atts.shape[0]=makeVector3(1,-1,0); shield_atts.shape[1]=makeVector3(1,1,0); shield_atts.shape[2]=makeVector3(-1,1,0); shield_atts.shape[3]=makeVector3(-1,-1,0); partGen[22].create(shield_atts,shieldGen_atts); - partGen[22].setTexture("images/t3.bmp"); + partGen[22].setTexture(DATADIR "images/t3.bmp"); partGen[22].start(); /************************COMING FROM THE EMP WAVE******************************/ @@ -1918,7 +1928,7 @@ alwaysOnGen_atts.vel=.2; shield_atts.shape[0]=makeVector3(2,-1,0); shield_atts.shape[1]=makeVector3(2,1,0); shield_atts.shape[2]=makeVector3(-2,1,0); shield_atts.shape[3]=makeVector3(-2,-1,0); partGen[23].create(shield_atts,alwaysOnGen_atts); - partGen[23].setTexture("images/t4.bmp"); + partGen[23].setTexture(DATADIR "images/t4.bmp"); partGen[23].start(); nPartGen=24; @@ -1928,21 +1938,21 @@ /*partGen[nPartGen].setParticles(&partSys); partGen[nPartGen].create(smoke_atts,engine_atts); - partGen[nPartGen].setTexture("images/t1.bmp"); + partGen[nPartGen].setTexture(DATADIR "images/t1.bmp"); partGen[nPartGen].start();*/ g->retPlayer(n)->retShip()->addPartsGen(&partGen[0]); //nPartGen++; /*partGen[nPartGen].setParticles(&partSys); partGen[nPartGen].create(sparks_atts,damage_atts); - partGen[nPartGen].setTexture("images/t3.bmp"); + partGen[nPartGen].setTexture(DATADIR "images/t3.bmp"); partGen[nPartGen].start();*/ g->retPlayer(n)->retShip()->addPartsGen(&partGen[1]); //nPartGen++; /*partGen[nPartGen].setParticles(&partSys); partGen[nPartGen].create(shield_atts,shieldGen_atts); - partGen[nPartGen].setTexture("images/t3.bmp"); + partGen[nPartGen].setTexture(DATADIR "images/t3.bmp"); partGen[nPartGen].start();*/ g->retPlayer(n)->retShip()->addPartsGen(&partGen[2]); @@ -1960,7 +1970,7 @@ /*sparks_atts.shape[0]=makeVector3(2,-1,0); sparks_atts.shape[1]=makeVector3(2,1,0); sparks_atts.shape[2]=makeVector3(-2,1,0); sparks_atts.shape[3]=makeVector3(-2,-1,0); partGen[nPartGen].setParticles(&partSys); partGen[nPartGen].create(sparks_atts,explosion_atts); - partGen[nPartGen].setTexture("images/t3.bmp"); + partGen[nPartGen].setTexture(DATADIR "images/t3.bmp"); partGen[nPartGen].start(); nPartGen++;*/ } @@ -2124,8 +2134,15 @@ char *filename_base="shot"; for(int num=0 ; num<100 ; num++){ +#ifdef __unix__ + char *filename_final = new char[homedir?strlen(homedir):1+18+4+2+1+3+1]; + sprintf(filename_final,"%s/duel3-screenshots/",homedir); + check_and_create_dir(filename_final); + sprintf(filename_final,"%s/duel3-screenshots/%s%d.bmp",homedir, filename_base,num); +#else char *filename_final = new char[12+4+2+1+3+1]; sprintf(filename_final,"screenshots/%s%d.bmp",filename_base,num); +#endif outtext(LOGFILE,filename_final); if(!exists(filename_final)){ save_bitmap(filename_final,bmp,NULL); --- Duel3_20060225_src/Source/BRect.h.fixes 2006-02-15 22:36:06.000000000 +0100 +++ Duel3_20060225_src/Source/BRect.h 2007-01-31 21:07:51.000000000 +0100 @@ -46,7 +46,7 @@ float shieldDamage,armorDamage,projDamage; int owner_id; //player's id (ie id of ship, or id of projectile's owner) int owner_team; - int ptrToOwner; + void *ptrToOwner; int genType; }CollisionInfo; --- /dev/null 2007-01-31 20:22:37.739376250 +0100 +++ Duel3_20060225_src/Source/unix.cpp 2007-01-31 21:07:51.000000000 +0100 @@ -0,0 +1,50 @@ +#include +#include +#include +#include +#include + +int check_and_create_dir(const char *name) +{ + struct stat stat_buffer; + + if (stat(name, &stat_buffer)) + { + /* error check if it doesn't exist or something else is wrong */ + if (errno == ENOENT) + { + /* doesn't exist letts create it ;) */ +#ifdef BSD43 + if (mkdir(name, 0775)) +#else + if (mkdir(name, S_IRWXU|S_IRWXG|S_IROTH|S_IXOTH)) +#endif + { + fprintf(stderr, "Error creating dir %s", name); + perror(" "); + return -1; + } + } + else + { + /* something else went wrong yell about it */ + fprintf(stderr, "Error opening %s", name); + perror(" "); + return -1; + } + } + else + { + /* file exists check it's a dir otherwise yell about it */ +#ifdef BSD43 + if (!(S_IFDIR & stat_buffer.st_mode)) +#else + if (!S_ISDIR(stat_buffer.st_mode)) +#endif + { + fprintf(stderr,"Error %s exists but isn't a dir\n", name); + return -1; + } + } + return 0; +} --- Duel3_20060225_src/Source/CPacket.h.fixes 2003-07-31 19:24:26.000000000 +0200 +++ Duel3_20060225_src/Source/CPacket.h 2007-01-31 21:07:51.000000000 +0100 @@ -7,9 +7,9 @@ #include #include #include -#include +#include #include -#include "standards.h" +#include "Standards.h" class CPacket { --- Duel3_20060225_src/Source/CCamera.h.fixes 2006-02-15 22:36:32.000000000 +0100 +++ Duel3_20060225_src/Source/CCamera.h 2007-01-31 21:07:51.000000000 +0100 @@ -9,8 +9,8 @@ #include #include #include -#include -#include "standards.h" +#include +#include "Standards.h" #include "CVector3.h" @@ -32,8 +32,8 @@ void moveCamera(void); bool setOrthoViewport(int w, int h); - CCamera::CCamera(CVector3 _pos,CVector3 _forward, CVector3 _up) {pos=_pos; forward=_forward; up=_up; init();} - CCamera::CCamera(void) {pos.zero(); forward.setVector(0,0,1); up.setVector(0,1,0); init(); pos.z=-200;} + CCamera(CVector3 _pos,CVector3 _forward, CVector3 _up) {pos=_pos; forward=_forward; up=_up; init();} + CCamera(void) {pos.zero(); forward.setVector(0,0,1); up.setVector(0,1,0); init(); pos.z=-200;} float retX(void) {return pos.x;} float retZ(void) {return pos.z;} --- Duel3_20060225_src/Source/CVector3.h.fixes 2006-02-15 22:37:30.000000000 +0100 +++ Duel3_20060225_src/Source/CVector3.h 2007-01-31 21:07:51.000000000 +0100 @@ -10,7 +10,7 @@ #include #include -#include "standards.h" +#include "Standards.h" using namespace std; @@ -47,8 +47,8 @@ float retYAng(void); float retZAng(void); - CVector3::CVector3(void) {x=0;y=0;z=0; mag=0;} - CVector3::CVector3(float _x, float _y, float _z) {x=_x; y=_y; z=_z; mag=findMagnitude();} + CVector3(void) {x=0;y=0;z=0; mag=0;} + CVector3(float _x, float _y, float _z) {x=_x; y=_y; z=_z; mag=findMagnitude();} //Overloaded operators //vector addition and subtraction --- Duel3_20060225_src/Source/Player.h.fixes 2006-02-15 22:41:00.000000000 +0100 +++ Duel3_20060225_src/Source/Player.h 2007-01-31 21:07:51.000000000 +0100 @@ -17,7 +17,7 @@ #include "BRect.h" #include "Controller.h" #include "Ship.h" -#include "ParticleGenerator.h" +#include "particlegenerator.h" #define RED 0 --- Duel3_20060225_src/Source/Proj.h.fixes 2006-02-15 22:42:12.000000000 +0100 +++ Duel3_20060225_src/Source/Proj.h 2007-01-31 21:07:51.000000000 +0100 @@ -36,7 +36,7 @@ int armor; //for non-energy projectiles int lifetime; //some projectiles will cease to exist when their life runs out - int ptrToOwner; + void *ptrToOwner; public: void init(void); @@ -49,10 +49,10 @@ CollisionInfo reactToCollision(void); void reactToCollisionInfo(CollisionInfo &colInfo); - void setOwner(int _owner_id, int _owner_team, int ptr) {owner_id=_owner_id; owner_team = _owner_team; ptrToOwner = ptr;} + void setOwner(int _owner_id, int _owner_team, void *ptr) {owner_id=_owner_id; owner_team = _owner_team; ptrToOwner = ptr;} int retOwnerId(void) {return owner_id;} int retOwnerTeam(void) {return owner_team; } - int retPtrToOwner(void) {return ptrToOwner; } + void *retPtrToOwner(void) {return ptrToOwner; } void update(BRect bounds); void draw(bool wireframe=false); --- Duel3_20060225_src/Source/Weapon.cpp.fixes 2007-01-31 21:10:50.000000000 +0100 +++ Duel3_20060225_src/Source/Weapon.cpp 2007-01-31 21:11:07.000000000 +0100 @@ -32,7 +32,6 @@ void Weapon::init(void) { - outtext(LOGFILE,"init weapon\n"); resetProjInfo(); iCoolDown=0; strcpy(sName,""); --- Duel3_20060225_src/Source/particlegenerator.h.fixes 2006-02-15 22:41:00.000000000 +0100 +++ Duel3_20060225_src/Source/particlegenerator.h 2007-01-31 21:07:51.000000000 +0100 @@ -8,8 +8,8 @@ #include -#include "Particle.h" -#include "ParticleSystem.h" +#include "particle.h" +#include "particlesystem.h" typedef struct { --- Duel3_20060225_src/Source/oCVector3.h.fixes 2003-05-29 19:32:36.000000000 +0200 +++ Duel3_20060225_src/Source/oCVector3.h 2007-01-31 21:07:51.000000000 +0100 @@ -5,7 +5,7 @@ #include #include -#include "standards.h" +#include "Standards.h" using namespace std; --- /dev/null 2007-01-31 20:22:37.739376250 +0100 +++ Duel3_20060225_src/Source/Makefile 2007-01-31 21:07:51.000000000 +0100 @@ -0,0 +1,31 @@ +PREFIX = /usr +TARGET = duel3 +BINDIR = $(PREFIX)/bin/ +DATADIR = $(PREFIX)/share/$(TARGET) +CFLAGS = -g -Wall -O2 -Wno-non-virtual-dtor +LDFLAGS = `allegro-config --libs` -ldumb -laldmb -lagl -lGL -lGLU +DEFINES = -DDATADIR=\"$(DATADIR)/\" +OBJS = main.o Standards.o CCamera.o CVector2.o BRect.o SObject.o Model.o Weapon.o Animation.o PObject.o Ship.o Proj.o Arena.o Player.o Game.o Widget.o ShipArray.o Starfield.o CVector3.o particle.o particlesystem.o particlegenerator.o asteroid.o Controller.o SfxSingleton.o GameMode.o AsteroidsGameMode.o NewMenu.o Button.o CheckBox.o ShipSelector.o MissileAvoid.o AIPlayer.o Turret.o MissileAvoid2p.o GameSettingsSingleton.o ScoreKeeper.o AsteroidsGameMode2p.o Powerup.o unix.o + +$(TARGET): $(OBJS) + g++ $(LDFLAGS) -o $@ $^ + +%.o: %.cpp + g++ $(CFLAGS) $(DEFINES) -o $@ -c $< + +install: $(TARGET) + mkdir -p $(BINDIR) + mkdir -p $(DATADIR)/images + mkdir -p $(DATADIR)/models + mkdir -p $(DATADIR)/music + mkdir -p $(DATADIR)/w_hud + install -p -m 755 $(TARGET) $(BINDIR) + install -p -m 644 images/* $(DATADIR)/images + install -p -m 644 models/* $(DATADIR)/models + install -p -m 644 music/* $(DATADIR)/music + install -p -m 644 w_hud/* $(DATADIR)/w_hud + install -p -m 664 *.dat $(DATADIR) + install -p -m 664 *.d3 $(DATADIR) + +clean: + rm -f $(OBJS) $(TARGET) *~ --- Duel3_20060225_src/Source/Game.h.fixes 2006-02-15 22:37:40.000000000 +0100 +++ Duel3_20060225_src/Source/Game.h 2007-01-31 21:07:51.000000000 +0100 @@ -8,13 +8,13 @@ #include #include #include "Standards.h" -#include "ParticleGenerator.h" +#include "particlegenerator.h" #include "ScoreKeeper.h" #include "SObject.h" #include "Arena.h" #include "PObject.h" -#include "Asteroid.h" +#include "asteroid.h" #include "Proj.h" #include "Powerup.h" #include "Player.h" --- Duel3_20060225_src/Source/particle.h.fixes 2006-02-15 22:41:00.000000000 +0100 +++ Duel3_20060225_src/Source/particle.h 2007-01-31 21:07:51.000000000 +0100 @@ -7,6 +7,7 @@ #define PARTICLE_H #include "CVector3.h" +#include #define PART_POINT 0 #define PART_BLOB 1 --- Duel3_20060225_src/Source/CNetwork.h.fixes 2003-05-31 17:59:16.000000000 +0200 +++ Duel3_20060225_src/Source/CNetwork.h 2007-01-31 21:07:51.000000000 +0100 @@ -7,9 +7,9 @@ #include #include #include -#include +#include #include -#include "standards.h" +#include "Standards.h" using namespace std; --- Duel3_20060225_src/Source/CPlayer.h.fixes 2003-06-06 19:11:00.000000000 +0200 +++ Duel3_20060225_src/Source/CPlayer.h 2007-01-31 21:07:51.000000000 +0100 @@ -7,9 +7,9 @@ #include #include #include -#include +#include #include -#include "standards.h" +#include "Standards.h" #include "CShip.h" --- Duel3_20060225_src/Source/Standards.h.fixes 2006-02-15 22:43:24.000000000 +0100 +++ Duel3_20060225_src/Source/Standards.h 2007-01-31 21:07:51.000000000 +0100 @@ -21,7 +21,15 @@ #define Degree 0.0174532925199432957692369076848861 +#ifdef __unix__ +extern char LOGFILE[256]; +#else #define LOGFILE "log.txt" +#endif + +#ifndef DATADIR +#define DATADIR "" +#endif #define MAX_SHIP_ATTS 20 #define DONT_CARE -1 --- Duel3_20060225_src/Source/CMenuItem.h.fixes 2002-12-11 23:12:50.000000000 +0100 +++ Duel3_20060225_src/Source/CMenuItem.h 2007-01-31 21:07:51.000000000 +0100 @@ -4,7 +4,7 @@ #include #include #include -#include "standards.h" +#include "Standards.h" #define MAXSTRING 30 #define MAXSUBITEMS 10 --- Duel3_20060225_src/Source/Client.h.fixes 2004-04-05 18:14:52.000000000 +0200 +++ Duel3_20060225_src/Source/Client.h 2007-01-31 21:07:51.000000000 +0100 @@ -7,9 +7,9 @@ #include #include #include -#include +#include #include -#include "standards.h" +#include "Standards.h" #include "CNetwork.h" #include "CPacket.h" --- Duel3_20060225_src/Source/Model.cpp.fixes 2006-02-15 22:39:54.000000000 +0100 +++ Duel3_20060225_src/Source/Model.cpp 2007-01-31 21:07:51.000000000 +0100 @@ -27,14 +27,21 @@ bool Model::loadModel(char *filename) { byte *bFile; - char temp[20]; - + char temp[20]; +#ifdef __unix__ + char filenamebuf[1024]; +#endif char buf[100]; sprintf(buf," load Model: %s\n",filename); outtext(LOGFILE,buf); - //opens the file - ifstream inputFile( filename, ios::in | ios::binary ); + //opens the file +#if __unix__ + snprintf(filenamebuf, 1024, "%s%s", DATADIR, filename); + ifstream inputFile(filenamebuf, ios::in | ios::binary ); +#else + ifstream inputFile(filename, ios::in | ios::binary ); +#endif if ( inputFile.fail()) return false; // "Couldn't Open The Model File." else --- Duel3_20060225_src/Source/Ship.cpp.fixes 2006-02-20 19:38:42.000000000 +0100 +++ Duel3_20060225_src/Source/Ship.cpp 2007-01-31 21:07:51.000000000 +0100 @@ -245,7 +245,7 @@ proj->create(pinfo,(PObject*)this,angle); proj->addVel(vel); proj->setTarget(target); - proj->setOwner(id,team_id,(int)this); + proj->setOwner(id,team_id,this); if(n==0) //only play the sound effect for the first proj that is fired proj->playFireSound(); --- Duel3_20060225_src/Source/Standards.cpp.fixes 2006-02-15 22:42:12.000000000 +0100 +++ Duel3_20060225_src/Source/Standards.cpp 2007-01-31 21:07:51.000000000 +0100 @@ -3,7 +3,8 @@ All rights reserved. ***********************************/ #include -#include +#include +#include #include "allegro.h" #include "Standards.h" --- Duel3_20060225_src/Source/CVector2.h.fixes 2006-02-18 00:47:48.000000000 +0100 +++ Duel3_20060225_src/Source/CVector2.h 2007-01-31 21:07:51.000000000 +0100 @@ -82,9 +82,9 @@ /************INITIALIAZTION ROUTINES*********/ void init(void) {x=0; y=0; mag=0; position=true; normalized=false;} - CVector2::CVector2(void) {init();} - CVector2::CVector2(float _x,float _y, bool _position=true) {init(); setVector(_x,_y,_position,false); } - CVector2::~CVector2(void) {} + CVector2(void) {init();} + CVector2(float _x,float _y, bool _position=true) {init(); setVector(_x,_y,_position,false); } + ~CVector2(void) {} }; CVector2 makeVector2(float x,float y, bool position); --- Duel3_20060225_src/Source/CMenu.h.fixes 2002-12-11 23:12:40.000000000 +0100 +++ Duel3_20060225_src/Source/CMenu.h 2007-01-31 21:07:51.000000000 +0100 @@ -4,7 +4,7 @@ #include #include #include -#include "standards.h" +#include "Standards.h" #include "CMenuItem.h" --- Duel3_20060225_src/Source/Weapon.h.fixes 2006-02-15 22:43:24.000000000 +0100 +++ Duel3_20060225_src/Source/Weapon.h 2007-01-31 21:07:51.000000000 +0100 @@ -17,7 +17,7 @@ #include "Object.h" #include "BRect.h" -#include "ParticleGenerator.h" +#include "particlegenerator.h" using namespace std; --- Duel3_20060225_src/Source/models.d3.fixes 2006-02-20 19:56:22.000000000 +0100 +++ Duel3_20060225_src/Source/models.d3 2007-01-31 21:07:51.000000000 +0100 @@ -1,16 +1,16 @@ 15 -models\hellstrike.ms3d -models\crysblade.ms3d -models\hammerskull.ms3d -models\viper.ms3d -models\gaia.ms3d -models\bulldog.ms3d -models\switchblade.ms3d -models\redeemer.ms3d -models\missile2.ms3d -models\sphere.ms3d -models\mine.ms3d -models\asteroid.ms3d -models\asteroid2.ms3d -models\asteroid3.ms3d -models\missile3.ms3d \ No newline at end of file +models/hellstrike.ms3d +models/crysblade.ms3d +models/hammerskull.ms3d +models/viper.ms3d +models/gaia.ms3d +models/bulldog.ms3d +models/switchblade.ms3d +models/redeemer.ms3d +models/missile2.ms3d +models/sphere.ms3d +models/mine.ms3d +models/asteroid.ms3d +models/asteroid2.ms3d +models/asteroid3.ms3d +models/missile3.ms3d \ No newline at end of file --- Duel3_20060225_src/Source/CClient.h.fixes 2003-07-28 19:50:40.000000000 +0200 +++ Duel3_20060225_src/Source/CClient.h 2007-01-31 21:07:51.000000000 +0100 @@ -7,9 +7,9 @@ #include #include #include -#include +#include #include -#include "standards.h" +#include "Standards.h" #include "CNetwork.h" #include "CPacket.h" --- Duel3_20060225_src/Source/Game.cpp~ 2007-01-31 21:35:08.000000000 +0100 +++ Duel3_20060225_src/Source/Game.cpp 2007-01-31 21:35:08.000000000 +0100 @@ -110,7 +110,7 @@ pinfo.model = &allModels[8]; pinfo.fRadius = .5; - weapons[iNumWeapons].createWeapon("Lightning Ball",6,pinfo,"w_hud/single_shot.bmp"); + weapons[iNumWeapons].createWeapon("Lightning Ball",6,pinfo,DATADIR "w_hud/single_shot.bmp"); iNumWeapons++; pinfo.fAccel=.03; @@ -138,7 +138,7 @@ pinfo.model = &allModels[14]; pinfo.fRadius = .5; - weapons[iNumWeapons].createWeapon("Hellstrike",14,pinfo,"w_hud/hellstrike.bmp"); + weapons[iNumWeapons].createWeapon("Hellstrike",14,pinfo,DATADIR "w_hud/hellstrike.bmp"); iNumWeapons++; @@ -168,7 +168,7 @@ pinfo.model = &allModels[14]; pinfo.fRadius = .5; - weapons[iNumWeapons].createWeapon("Wrath Missile",14,pinfo,"w_hud/missile.bmp"); + weapons[iNumWeapons].createWeapon("Wrath Missile",14,pinfo,DATADIR "w_hud/missile.bmp"); iNumWeapons++; @@ -197,7 +197,7 @@ pinfo.model = 0; pinfo.fRadius = .05; - weapons[iNumWeapons].createWeapon("Lightning",2,pinfo,"w_hud/lightning.bmp"); + weapons[iNumWeapons].createWeapon("Lightning",2,pinfo,DATADIR "w_hud/lightning.bmp"); iNumWeapons++; pinfo.fAccel=.014; @@ -225,7 +225,7 @@ pinfo.model = 0; pinfo.fRadius = .05; - weapons[iNumWeapons].createWeapon("Shot Gun",14,pinfo,"w_hud/shotgun.bmp"); + weapons[iNumWeapons].createWeapon("Shot Gun",14,pinfo,DATADIR "w_hud/shotgun.bmp"); iNumWeapons++; @@ -254,7 +254,7 @@ pinfo.model = /*&allModels[10]*/0; pinfo.fRadius = .65; - weapons[iNumWeapons].createWeapon("Plasma Mine",25,pinfo,"w_hud/one_mine.bmp"); + weapons[iNumWeapons].createWeapon("Plasma Mine",25,pinfo,DATADIR "w_hud/one_mine.bmp"); iNumWeapons++; @@ -284,7 +284,7 @@ pinfo.model = &allModels[8]; pinfo.fRadius = .5; - weapons[iNumWeapons].createWeapon("Tri-Shot",7,pinfo,"w_hud/tri_shot.bmp"); + weapons[iNumWeapons].createWeapon("Tri-Shot",7,pinfo,DATADIR "w_hud/tri_shot.bmp"); iNumWeapons++; @@ -313,7 +313,7 @@ pinfo.model = &allModels[14]; pinfo.fRadius = .5; - weapons[iNumWeapons].createWeapon("Homing Missiles",14,pinfo,"w_hud/homing_missile.bmp"); + weapons[iNumWeapons].createWeapon("Homing Missiles",14,pinfo,DATADIR "w_hud/homing_missile.bmp"); iNumWeapons++; @@ -342,7 +342,7 @@ pinfo.model = /*&allModels[10]*/0; pinfo.fRadius = .65; - weapons[iNumWeapons].createWeapon("Spider Mine",25,pinfo,"w_hud/four_mines.bmp"); + weapons[iNumWeapons].createWeapon("Spider Mine",25,pinfo,DATADIR "w_hud/four_mines.bmp"); iNumWeapons++; @@ -371,7 +371,7 @@ pinfo.model = /*&allModels[8]*/NULL; pinfo.fRadius = 1; - weapons[iNumWeapons].createWeapon("Concussion",25,pinfo,"w_hud/concussion.bmp"); + weapons[iNumWeapons].createWeapon("Concussion",25,pinfo,DATADIR "w_hud/concussion.bmp"); iNumWeapons++; @@ -400,7 +400,7 @@ pinfo.model = 0; pinfo.fRadius = .65; - weapons[iNumWeapons].createWeapon("Defense Ring",50,pinfo,"w_hud/defense.bmp"); + weapons[iNumWeapons].createWeapon("Defense Ring",50,pinfo,DATADIR "w_hud/defense.bmp"); iNumWeapons++; @@ -430,7 +430,7 @@ pinfo.model = &allModels[14]; pinfo.fRadius = .7; - weapons[iNumWeapons].createWeapon("Redeemer Missile",20,pinfo,"w_hud/redeemer.bmp"); + weapons[iNumWeapons].createWeapon("Redeemer Missile",20,pinfo,DATADIR "w_hud/redeemer.bmp"); iNumWeapons++; @@ -459,7 +459,7 @@ pinfo.model = &allModels[8]; pinfo.fRadius = .5; - weapons[iNumWeapons].createWeapon("Gattling Gun",2,pinfo,"w_hud/gattling.bmp"); + weapons[iNumWeapons].createWeapon("Gattling Gun",2,pinfo,DATADIR "w_hud/gattling.bmp"); iNumWeapons++; pinfo.fAccel=.014; @@ -487,7 +487,7 @@ pinfo.model = &allModels[8]; pinfo.fRadius = .5; - weapons[iNumWeapons].createWeapon("Rebound Gun",40,pinfo,"w_hud/rebound.bmp"); + weapons[iNumWeapons].createWeapon("Rebound Gun",40,pinfo,DATADIR "w_hud/rebound.bmp"); iNumWeapons++; pinfo.fAccel=.014; @@ -515,7 +515,7 @@ pinfo.model = /*&allModels[8]*/0; pinfo.fRadius = 3; - weapons[iNumWeapons].createWeapon("EMP Wave",30,pinfo,"w_hud/emp.bmp"); + weapons[iNumWeapons].createWeapon("EMP Wave",30,pinfo,DATADIR "w_hud/emp.bmp"); iNumWeapons++; @@ -545,7 +545,7 @@ pinfo.model = /*&allModels[10]*/0; pinfo.fRadius = .65; - weapons[iNumWeapons].createWeapon("Berserkers",25,pinfo,"w_hud/berserkers.bmp"); + weapons[iNumWeapons].createWeapon("Berserkers",25,pinfo,DATADIR "w_hud/berserkers.bmp"); iNumWeapons++; /*pinfo.fAccel=.014; --- NEW FILE duel3.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Duel 3 Comment=One on one spaceship duel in a 2D arena Exec=duel3 Icon=duel3.png Terminal=false StartupNotify=false Type=Application Categories=Game;ArcadeGame; --- NEW FILE duel3.spec --- %define snapshot 20060225 Name: duel3 Version: 0.1 Release: 0.2.%{snapshot}%{?dist} Summary: One on one spaceship duel in a 2D arena Group: Amusements/Games License: BSD URL: http://ts-games.com/duel3.php Source0: http://dl.sf.net/sourceforge/%{name}/Duel3_%{snapshot}_src.zip Source1: http://dl.sf.net/sourceforge/%{name}/Duel3_%{snapshot}_bin.zip Source2: %{name}.desktop Source3: %{name}.png Source4: music-credits.txt Patch0: Duel3_20060225-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alleggl-devel dumb-devel libGLU-devel desktop-file-utils Requires: hicolor-icon-theme %description The sudden attack from the Martain Rim miners caught the Earth by suprise, there was no way the meager Earth Space Fleet could defend themselves. The miners attacked, and eliminated their enemies, and then returned to the asteroid belt. However, Earth could not accept such an embarrassing defeat. The military developed new space fighters, and trained several squadrons of elite pilots. The task force was then deployed against the miners. These trained pilots utterly defeated the miners in a matter of weeks, and the first space war in human history was finished. The military, however, now had a new problem on their hands. These new elite pilots were becoming restless, and there was no way for them to test their skills. The military dare not disband the force, or let their skills dull, so the Duel Combat League was formed. The newly formed league quickly became the premier entertainment form on the planet, and the military's largest source of income. Take control of a Duel fighter, and test your skills againt your opponents and the arena itself in fast-paced space combat. %prep %setup -q -a 1 -n Duel3_%{snapshot}_src mv Duel3_%{snapshot}_bin/* Source cp %{SOURCE4} . %patch0 -p1 -z .fixes sed -i 's/\r//' Source/readme.txt license.txt music-credits.txt %build pushd Source make %{?_smp_mflags} PREFIX=%{_prefix} \ CFLAGS="$RPM_OPT_FLAGS -fsigned-char -Wno-deprecated-declarations -Wno-non-virtual-dtor" popd %install rm -rf $RPM_BUILD_ROOT pushd Source make install PREFIX=$RPM_BUILD_ROOT%{_prefix} popd # below is the desktop file and icon stuff. mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE2} mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps install -p -m 644 %{SOURCE3} \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files %defattr(-,root,root,-) %doc Source/readme.txt license.txt music-credits.txt %{_bindir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/64x64/apps/%{name}.png %changelog * Sat Feb 3 2007 Hans de Goede 0.1-0.2.20060225 - Add missing "Requires: hicolor-icon-theme" (bz 226729) - Add music-credits.txt, properly giving credits for the used music (bz 226729) * Thu Jan 25 2007 Hans de Goede 0.1-0.1.20060225 - Initial Fedora Extras package, many thanks to my students Albert-Jan Visser and Bas Meel for doing the Linux port of this! --- NEW FILE music-credits.txt --- Music Created by and used with permission of Antonio Salgado (aka NoOne) Email: tognin at hotmail.com http://www.s3m.com/dma/displayuser.php?user_id=1061 The permission request mail and permission notice are below for reference: --- Message-ID: <45C1AEB2.7030804 at hhs.nl> Date: Thu, 01 Feb 2007 10:11:14 +0100 From: Hans de Goede User-Agent: Thunderbird 1.5.0.9 (X11/20061223) MIME-Version: 1.0 To: tognin at hotmail.com, tognin at ole.com Subject: BlackIce songs on www.s3m.com Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Hi, First let me introduce myself I'm a Linux enthousiast and developer. Lately I'm mainly active in porting games to Linux and packaging them for the Fedora Linux Distribution. The last game which I've just finished porting to Linux is a game called duel3, see: http://ts-games.com/duel3.php This game uses your Black Ice 1 - 4 songs (as is stated in the readme) from: http://www.s3m.com/dma/displayuser.php?user_id=1061 However the docs in the game, nor your website contain any further information on under which conditions these songs may be distributed. Since we (the Fedora community) take intellectual property very serious I would like to ask you if its ok to distribute your songs and if there are any special conditions to distributing other then giving you credit for the songs and linking to your homepage from the docs. Thanks & Regards, Hans --- Return-Path: Received: from koko.hhs.nl ([145.52.2.16] verified) by hhs.nl (CommuniGate Pro SMTP 4.3.6) with ESMTP id 59604439 for j.w.r.degoede at hhs.nl; Thu, 01 Feb 2007 12:48:56 +0100 Received: from exim by koko.hhs.nl with spam-scanned (Exim 4.62) (envelope-from ) id 1HCaQv-0005Nx-3o for j.w.r.degoede at hhs.nl; Thu, 01 Feb 2007 12:48:56 +0100 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on koko.hhs.nl X-Spam-Level: xx X-Spam-Status: No, score=2.1 required=5.0 tests=BAYES_00,DNS_FROM_RFC_ABUSE, DNS_FROM_RFC_POST,MSGID_FROM_MTA_HEADER,SPF_PASS, UNWANTED_LANGUAGE_BODY autolearn=no version=3.1.0 Received: from exim (helo=koko) by koko.hhs.nl with local-smtp (Exim 4.62) (envelope-from ) id 1HCaQu-0005Nt-Vp for j.w.r.degoede at hhs.nl; Thu, 01 Feb 2007 12:48:53 +0100 Received: from [65.54.246.156] (port=2230 helo=bay0-omc2-s20.bay0.hotmail.com) by koko.hhs.nl with esmtp (Exim 4.62) (envelope-from ) id 1HCaQu-0005No-H9 for j.w.r.degoede at hhs.nl; Thu, 01 Feb 2007 12:48:52 +0100 Received: from hotmail.com ([65.54.162.24]) by bay0-omc2-s20.bay0.hotmail.com with Microsoft SMTPSVC(6.0.3790.2668); Thu, 1 Feb 2007 03:48:51 -0800 Received: from mail pickup service by hotmail.com with Microsoft SMTPSVC; Thu, 1 Feb 2007 03:48:51 -0800 Message-ID: Received: from 65.54.162.200 by by108fd.bay108.hotmail.msn.com with HTTP; Thu, 01 Feb 2007 11:48:50 GMT X-Originating-IP: [195.53.125.135] X-Originating-Email: [tognin at hotmail.com] X-Sender: tognin at hotmail.com In-Reply-To: <45C1AEB2.7030804 at hhs.nl> From: "Antonio Salgado" To: j.w.r.degoede at hhs.nl Bcc: Subject: RE: BlackIce songs on www.s3m.com Date: Thu, 01 Feb 2007 11:48:50 +0000 Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1; format=flowed X-OriginalArrivalTime: 01 Feb 2007 11:48:51.0016 (UTC) FILETIME=[F0F44480:01C745F6] X-Anti-Virus: Kaspersky Anti-Virus for MailServers 5.5.2/RELEASE, bases: 01022007 #249122, status: clean Hi! the first thing I have to say is that I'm spanish, so I hope that my english will be fine. thanks for your e-mail. These songs can be used freely. The only thing I want is to be credited on the game as "Antonio Salgado" that is my real name. When I'll arrive at home I'll try the game, It looks good. thanks again. see you!! _________________________________________________________________ ?Est?s pensando en cambiar de coche? Todas los modelos de serie y extras en MSN Motor. http://motor.msn.es/researchcentre/ From fedora-extras-commits at redhat.com Wed Feb 7 10:18:00 2007 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Wed, 7 Feb 2007 05:18:00 -0500 Subject: rpms/fcron/FC-5 fcron-3.0.2-accept_readable_fcron.conf.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 fcron.spec, 1.6, 1.7 sources, 1.2, 1.3 Message-ID: <200702071018.l17AI0bD014943@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/fcron/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14853 Modified Files: .cvsignore fcron.spec sources Added Files: fcron-3.0.2-accept_readable_fcron.conf.patch Log Message: New upstream release fcron-3.0.2-accept_readable_fcron.conf.patch: --- NEW FILE fcron-3.0.2-accept_readable_fcron.conf.patch --- --- subs.c.orig 2007-01-15 22:41:06.000000000 +0100 +++ subs.c 2007-02-07 10:45:31.000000000 +0100 @@ -222,10 +222,9 @@ /* check if the file is secure : owner:root, group:fcron, * writable only by owner */ if ( fstat(fileno(f), &st) != 0 - || st.st_uid != rootuid || st.st_gid != fcrongid || st.st_mode & S_IWGRP || st.st_mode & S_IWOTH ) { - error("Conf file (%s) must be owned by root:" GROUPNAME - " and (no more than) 644 : ignored", fcronconf, GROUPNAME); + error("Conf file (%s) must not have more perms than 644 : ignored", + fcronconf); fclose(f); return; } Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fcron/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Jun 2006 11:55:08 -0000 1.2 +++ .cvsignore 7 Feb 2007 10:17:28 -0000 1.3 @@ -1 +1 @@ -fcron-3.0.1.src.tar.gz +fcron-3.0.2.src.tar.gz Index: fcron.spec =================================================================== RCS file: /cvs/extras/rpms/fcron/FC-5/fcron.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- fcron.spec 12 Oct 2006 07:47:21 -0000 1.6 +++ fcron.spec 7 Feb 2007 10:17:28 -0000 1.7 @@ -1,6 +1,6 @@ Name: fcron -Version: 3.0.1 -Release: 16%{?dist} +Version: 3.0.2 +Release: 1%{?dist} Summary: A task scheduler Summary(fr): Un ordonnanceur de t??ches Summary(it): Uno schedulatore di processi @@ -14,8 +14,8 @@ Patch0: fcron-3.0.1-Makefile.in.fedora_install.patch Patch1: fcron-3.0.1-doc_Makefile.in.fedora_install.patch Patch2: fcron-3.0.1-configure.fedora.patch -Patch3: fcron-3.0.1-accept_readable_fcron.conf.patch -Patch4: fcrontab.c.seteuid +Patch3: fcron-3.0.2-accept_readable_fcron.conf.patch +#Patch4: fcrontab.c.seteuid BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: sysklogd @@ -85,8 +85,8 @@ %patch0 -p0 %patch1 -p0 %patch2 -p0 -%patch3 -p1 -%patch4 -p0 +%patch3 -p0 +#%patch4 -p0 %build @@ -129,7 +129,7 @@ %{__mv} tmp $i done -# rpmbuild insist that %ghost files exist? +# rpmbuild insist that %ghost files exist %{__install} -d %{buildroot}%{_localstatedir}/run/ touch %{buildroot}%{_localstatedir}/run/fcron.pid @@ -137,7 +137,7 @@ %pre if [ "$1" = "1" ] then - /usr/sbin/useradd -c "Fcron system user" -r fcron -d %{_localstatedir}/spool/fcron -s /bin/true + /usr/sbin/useradd -c "Fcron system user" -r fcron -d %{_localstatedir}/spool/fcron -s /bin/true &>/dev/null || : fi %post @@ -186,11 +186,19 @@ %ghost %{_localstatedir}/run/fcron.pid %changelog -* Fri Oct 12 2006 Alain Portal 3.0.1-16 +* Wed Feb 7 2007 Alain Portal 3.0.2-1 + - New upstream version + - Update patch3 + - Remove patch4 now applied by upstream + +* Fri Oct 12 2006 Alain Portal 3.0.1-17 - Don't remove frcon user when erasing package - Update doc accordingly - Don't ghost fcron.fifo +* Fri Sep 1 2006 Alain Portal 3.0.1-16 + - FE6 rebuild + * Thu Aug 24 2006 Ville Skytt?? - 3.0.1-15 - Fix doc permissions (#200834). Index: sources =================================================================== RCS file: /cvs/extras/rpms/fcron/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Jun 2006 11:55:08 -0000 1.2 +++ sources 7 Feb 2007 10:17:28 -0000 1.3 @@ -1 +1 @@ -8e5dcb3a646c11294294895954ef0a48 fcron-3.0.1.src.tar.gz +f35e6af41d356ebcb38882f86a14fb94 fcron-3.0.2.src.tar.gz From fedora-extras-commits at redhat.com Wed Feb 7 10:19:28 2007 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Wed, 7 Feb 2007 05:19:28 -0500 Subject: rpms/fcron/FC-4 fcron-3.0.2-accept_readable_fcron.conf.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 fcron.spec, 1.6, 1.7 sources, 1.2, 1.3 Message-ID: <200702071019.l17AJSIP015034@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/fcron/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15007 Modified Files: .cvsignore fcron.spec sources Added Files: fcron-3.0.2-accept_readable_fcron.conf.patch Log Message: New upstream release fcron-3.0.2-accept_readable_fcron.conf.patch: --- NEW FILE fcron-3.0.2-accept_readable_fcron.conf.patch --- --- subs.c.orig 2007-01-15 22:41:06.000000000 +0100 +++ subs.c 2007-02-07 10:45:31.000000000 +0100 @@ -222,10 +222,9 @@ /* check if the file is secure : owner:root, group:fcron, * writable only by owner */ if ( fstat(fileno(f), &st) != 0 - || st.st_uid != rootuid || st.st_gid != fcrongid || st.st_mode & S_IWGRP || st.st_mode & S_IWOTH ) { - error("Conf file (%s) must be owned by root:" GROUPNAME - " and (no more than) 644 : ignored", fcronconf, GROUPNAME); + error("Conf file (%s) must not have more perms than 644 : ignored", + fcronconf); fclose(f); return; } Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fcron/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Jun 2006 11:55:08 -0000 1.2 +++ .cvsignore 7 Feb 2007 10:18:55 -0000 1.3 @@ -1 +1 @@ -fcron-3.0.1.src.tar.gz +fcron-3.0.2.src.tar.gz Index: fcron.spec =================================================================== RCS file: /cvs/extras/rpms/fcron/FC-4/fcron.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- fcron.spec 12 Oct 2006 07:46:55 -0000 1.6 +++ fcron.spec 7 Feb 2007 10:18:55 -0000 1.7 @@ -1,6 +1,6 @@ Name: fcron -Version: 3.0.1 -Release: 16%{?dist} +Version: 3.0.2 +Release: 1%{?dist} Summary: A task scheduler Summary(fr): Un ordonnanceur de t??ches Summary(it): Uno schedulatore di processi @@ -14,8 +14,8 @@ Patch0: fcron-3.0.1-Makefile.in.fedora_install.patch Patch1: fcron-3.0.1-doc_Makefile.in.fedora_install.patch Patch2: fcron-3.0.1-configure.fedora.patch -Patch3: fcron-3.0.1-accept_readable_fcron.conf.patch -Patch4: fcrontab.c.seteuid +Patch3: fcron-3.0.2-accept_readable_fcron.conf.patch +#Patch4: fcrontab.c.seteuid BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: sysklogd @@ -85,8 +85,8 @@ %patch0 -p0 %patch1 -p0 %patch2 -p0 -%patch3 -p1 -%patch4 -p0 +%patch3 -p0 +#%patch4 -p0 %build @@ -129,7 +129,7 @@ %{__mv} tmp $i done -# rpmbuild insist that %ghost files exist? +# rpmbuild insist that %ghost files exist %{__install} -d %{buildroot}%{_localstatedir}/run/ touch %{buildroot}%{_localstatedir}/run/fcron.pid @@ -137,7 +137,7 @@ %pre if [ "$1" = "1" ] then - /usr/sbin/useradd -c "Fcron system user" -r fcron -d %{_localstatedir}/spool/fcron -s /bin/true + /usr/sbin/useradd -c "Fcron system user" -r fcron -d %{_localstatedir}/spool/fcron -s /bin/true &>/dev/null || : fi %post @@ -186,11 +186,19 @@ %ghost %{_localstatedir}/run/fcron.pid %changelog -* Fri Oct 12 2006 Alain Portal 3.0.1-16 +* Wed Feb 7 2007 Alain Portal 3.0.2-1 + - New upstream version + - Update patch3 + - Remove patch4 now applied by upstream + +* Fri Oct 12 2006 Alain Portal 3.0.1-17 - Don't remove frcon user when erasing package - Update doc accordingly - Don't ghost fcron.fifo +* Fri Sep 1 2006 Alain Portal 3.0.1-16 + - FE6 rebuild + * Thu Aug 24 2006 Ville Skytt?? - 3.0.1-15 - Fix doc permissions (#200834). Index: sources =================================================================== RCS file: /cvs/extras/rpms/fcron/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Jun 2006 11:55:08 -0000 1.2 +++ sources 7 Feb 2007 10:18:55 -0000 1.3 @@ -1 +1 @@ -8e5dcb3a646c11294294895954ef0a48 fcron-3.0.1.src.tar.gz +f35e6af41d356ebcb38882f86a14fb94 fcron-3.0.2.src.tar.gz From fedora-extras-commits at redhat.com Wed Feb 7 10:21:13 2007 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Wed, 7 Feb 2007 05:21:13 -0500 Subject: rpms/fcron/FC-6 fcron-3.0.2-accept_readable_fcron.conf.patch, NONE, 1.1 Message-ID: <200702071021.l17ALDun015088@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/fcron/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15079 Added Files: fcron-3.0.2-accept_readable_fcron.conf.patch Log Message: New upstream release fcron-3.0.2-accept_readable_fcron.conf.patch: --- NEW FILE fcron-3.0.2-accept_readable_fcron.conf.patch --- --- subs.c.orig 2007-01-15 22:41:06.000000000 +0100 +++ subs.c 2007-02-07 10:45:31.000000000 +0100 @@ -222,10 +222,9 @@ /* check if the file is secure : owner:root, group:fcron, * writable only by owner */ if ( fstat(fileno(f), &st) != 0 - || st.st_uid != rootuid || st.st_gid != fcrongid || st.st_mode & S_IWGRP || st.st_mode & S_IWOTH ) { - error("Conf file (%s) must be owned by root:" GROUPNAME - " and (no more than) 644 : ignored", fcronconf, GROUPNAME); + error("Conf file (%s) must not have more perms than 644 : ignored", + fcronconf); fclose(f); return; } From fedora-extras-commits at redhat.com Wed Feb 7 10:25:10 2007 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Wed, 7 Feb 2007 05:25:10 -0500 Subject: rpms/fcron/FC-6 fcron.spec,1.8,1.9 Message-ID: <200702071025.l17APAZF015242@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/fcron/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15216 Modified Files: fcron.spec Log Message: Fix previous commit Index: fcron.spec =================================================================== RCS file: /cvs/extras/rpms/fcron/FC-6/fcron.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fcron.spec 7 Feb 2007 10:15:29 -0000 1.8 +++ fcron.spec 7 Feb 2007 10:24:37 -0000 1.9 @@ -1,6 +1,6 @@ Name: fcron Version: 3.0.2 -Release: 1%{?dist} +Release: 1%{?dist}.1 Summary: A task scheduler Summary(fr): Un ordonnanceur de t??ches Summary(it): Uno schedulatore di processi @@ -186,6 +186,9 @@ %ghost %{_localstatedir}/run/fcron.pid %changelog +* Wed Feb 7 2007 Alain Portal 3.0.2-1.1 + - To increase release + * Wed Feb 7 2007 Alain Portal 3.0.2-1 - New upstream version - Update patch3 From fedora-extras-commits at redhat.com Wed Feb 7 10:52:01 2007 From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann)) Date: Wed, 7 Feb 2007 05:52:01 -0500 Subject: fedora-security/audit fc5,1.447,1.448 fc6,1.201,1.202 Message-ID: <200702071052.l17Aq28N015514@cvs-int.fedora.redhat.com> Author: holtmann Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15495/audit Modified Files: fc5 fc6 Log Message: Add CVE-2007-0006 Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.447 retrieving revision 1.448 diff -u -r1.447 -r1.448 --- fc5 5 Feb 2007 18:09:34 -0000 1.447 +++ fc5 7 Feb 2007 10:51:59 -0000 1.448 @@ -11,6 +11,7 @@ CVE-2007-0104 ignore (poppler) only client DoS CVE-2007-0104 ignore (kdegraphics) only client DoS CVE-2007-0086 ignore (apache) not a security issue +CVE-2007-0006 VULNERABLE (kernel, fixed in -mm) CVE-2006-6939 VULNERABLE (ed, fixed 0.3) #223075 CVE-2006-6870 backport (avahi, fixed 0.6.16) #221726 [since FEDORA-2007-018] CVE-2006-6899 version (bluez-utils, fixed 2.23) Index: fc6 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc6,v retrieving revision 1.201 retrieving revision 1.202 diff -u -r1.201 -r1.202 --- fc6 5 Feb 2007 18:09:34 -0000 1.201 +++ fc6 7 Feb 2007 10:51:59 -0000 1.202 @@ -18,6 +18,7 @@ CVE-2007-0104 ignore (poppler) only client DoS CVE-2007-0104 ignore (kdegraphics) only client DoS CVE-2007-0086 ignore (apache) not a security issue +CVE-2007-0006 VULNERABLE (kernel, fixed in -mm) CVE-2006-6939 VULNERABLE (ed, fixed 0.3) #223075 CVE-2006-6899 version (bluez-utils, fixed 2.23) CVE-2006-6870 version (avahi, fixed 0.6.16) #221440 [since FEDORA-2007-019] From fedora-extras-commits at redhat.com Wed Feb 7 12:09:26 2007 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Wed, 7 Feb 2007 07:09:26 -0500 Subject: rpms/gnomad2/FC-6 .cvsignore, 1.8, 1.9 gnomad2.spec, 1.12, 1.13 sources, 1.8, 1.9 Message-ID: <200702071209.l17C9QUT022924@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/gnomad2/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22899 Modified Files: .cvsignore gnomad2.spec sources Log Message: Bump up to follow libmtp 0.1.3 using latest gnomad2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-6/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 21 Sep 2006 22:26:16 -0000 1.8 +++ .cvsignore 7 Feb 2007 12:08:54 -0000 1.9 @@ -1 +1 @@ -gnomad2-2.8.9.tar.gz +gnomad2-2.8.11.tar.gz Index: gnomad2.spec =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-6/gnomad2.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gnomad2.spec 30 Sep 2006 09:27:26 -0000 1.12 +++ gnomad2.spec 7 Feb 2007 12:08:54 -0000 1.13 @@ -9,8 +9,8 @@ # Name: gnomad2 -Version: 2.8.9 -Release: 2%{?dist} +Version: 2.8.11 +Release: 1%{?dist} Summary: A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs License: GPL @@ -80,6 +80,14 @@ %doc AUTHORS NEWS README COPYING ChangeLog %changelog +* Mon Jan 29 2007 Linus Walleij 2.8.11-1 +- New upstream version fixing a bug. +* Wed Jan 24 2007 Linus Walleij 2.8.10-1 +- New upstream version that works with libmtp 0.1.3 also. +* Sun Jan 7 2007 Linus Walleij 2.8.9-4 +- Doesn't seem to have done it. Make a new build again. +* Sat Dec 9 2006 Linus Walleij 2.8.9-3 +- Pick up the new libmtp dependency. * Sat Sep 30 2006 Linus Walleij 2.8.9-2 - Pick up the new libmtp dependency. * Fri Sep 22 2006 Linus Walleij 2.8.9-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-6/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 21 Sep 2006 22:26:16 -0000 1.8 +++ sources 7 Feb 2007 12:08:54 -0000 1.9 @@ -1 +1 @@ -d9362ae17f1ced02efe297a255512377 gnomad2-2.8.9.tar.gz +661af9f68f2aab19659265050a9ae40c gnomad2-2.8.11.tar.gz From fedora-extras-commits at redhat.com Wed Feb 7 12:11:21 2007 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Wed, 7 Feb 2007 07:11:21 -0500 Subject: rpms/gnomad2/FC-5 .cvsignore, 1.8, 1.9 gnomad2.spec, 1.11, 1.12 sources, 1.8, 1.9 Message-ID: <200702071211.l17CBLSN023004@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/gnomad2/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22978 Modified Files: .cvsignore gnomad2.spec sources Log Message: Bump gnomad2 to follow libmtp 0.1.3. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 21 Sep 2006 22:28:39 -0000 1.8 +++ .cvsignore 7 Feb 2007 12:10:49 -0000 1.9 @@ -1 +1 @@ -gnomad2-2.8.9.tar.gz +gnomad2-2.8.11.tar.gz Index: gnomad2.spec =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-5/gnomad2.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gnomad2.spec 30 Sep 2006 09:42:25 -0000 1.11 +++ gnomad2.spec 7 Feb 2007 12:10:49 -0000 1.12 @@ -9,8 +9,8 @@ # Name: gnomad2 -Version: 2.8.9 -Release: 2%{?dist} +Version: 2.8.11 +Release: 1%{?dist} Summary: A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs License: GPL @@ -80,6 +80,14 @@ %doc AUTHORS NEWS README COPYING ChangeLog %changelog +* Mon Jan 29 2007 Linus Walleij 2.8.11-1 +- New upstream version fixing a bug. +* Wed Jan 24 2007 Linus Walleij 2.8.10-1 +- New upstream version that works with libmtp 0.1.3 also. +* Sun Jan 7 2007 Linus Walleij 2.8.9-4 +- Doesn't seem to have done it. Make a new build again. +* Sat Dec 9 2006 Linus Walleij 2.8.9-3 +- Pick up the new libmtp dependency. * Sat Sep 30 2006 Linus Walleij 2.8.9-2 - Pick up the new libmtp dependency. * Fri Sep 22 2006 Linus Walleij 2.8.9-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 21 Sep 2006 22:28:39 -0000 1.8 +++ sources 7 Feb 2007 12:10:49 -0000 1.9 @@ -1 +1 @@ -d9362ae17f1ced02efe297a255512377 gnomad2-2.8.9.tar.gz +661af9f68f2aab19659265050a9ae40c gnomad2-2.8.11.tar.gz From fedora-extras-commits at redhat.com Wed Feb 7 12:18:56 2007 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Wed, 7 Feb 2007 07:18:56 -0500 Subject: rpms/exim/devel exim-greylist.conf.inc, NONE, 1.1 greylist-tidy.sh, NONE, 1.1 mk-greylist-db.sql, NONE, 1.1 exim.spec, 1.35, 1.36 Message-ID: <200702071218.l17CIuE8023135@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23115 Modified Files: exim.spec Added Files: exim-greylist.conf.inc greylist-tidy.sh mk-greylist-db.sql Log Message: Add greylisting --- NEW FILE exim-greylist.conf.inc --- # $Id: acl-greylist-sqlite,v 1.1 2006/06/13 13:56:54 dwmw2 Exp $ GREYDB=/var/spool/exim/db/greylist.db # ACL for greylisting. Place reason(s) for greylisting into a variable named # $acl_m_greylistreasons before invoking with 'require acl = greylist_mail'. # The reasons should be separate lines of text, and will be reported in # the SMTP rejection message as well as the log message. # # When a suspicious mail is seen, we temporarily reject it and wait to see # if the sender tries again. Most spam robots won't bother. Real mail hosts # _will_ retry, and we'll accept it the second time. For hosts which are # observed to retry, we don't bother greylisting again in the future -- # it's obviously pointless. We remember such hosts, or 'known resenders', # by a tuple of their IP address and the name they used in HELO. # # We also include the time of listing for 'known resenders', just in case # someone wants to expire them after a certain amount of time. So the # database table for these 'known resenders' looks like this: # # CREATE TABLE resenders ( # host TEXT PRIMARY KEY, # helo TEXT, # time INTEGER # ); # # To remember mail we've rejected, we create an 'identity' from its sender # and recipient addresses and its Message-ID: header. We don't include the # sending IP address in the identity, because sometimes the second and # subsequent attempts may come from a different IP address to the original. # # We do record the original IP address and HELO name though, because if # the message _is_ retried from another machine, it's the _first_ one we # want to record as a 'known resender'; not just its backup path. # # Obviously we record the time too, so the main table of greylisted mail # looks like this: # # CREATE TABLE greylist ( # id TEXT PRIMARY KEY, # expire INTEGER, # host TEXT, # helo TEXT # ); # greylist_mail: # First, accept if it there's absolutely nothing suspicious about it... accept condition = ${if eq{$acl_m_greylistreasons}{} {1}} # ... or if it was generated locally or by authenticated clients. accept hosts = : accept authenticated = * # Secondly, there's _absolutely_ no point in greylisting mail from # hosts which are known to resend their mail. Just accept it. accept hosts = sqlite;GREYDB SELECT host from resenders \ WHERE helo='${quote_sqlite:$sender_helo_name}' \ AND host='$sender_host_address'; # Generate the mail identity (as described above) warn set acl_m_greyident = ${hash{20}{62}{$sender_address$recipients$h_message-id:}} # Attempt to look up this mail in the greylist database. If it's there, # remember the expiry time for it; we need to make sure they've waited # long enough. warn set acl_m_greyexpiry = ${lookup sqlite {GREYDB SELECT expire FROM greylist \ WHERE id='${quote_sqlite:$acl_m_greyident}';}{$value}} # If the mail isn't already the database, defer it with an appropriate # message, and add it. Do the addition to the greylist database as a # hackish side-effect of the log-message, appending 'success' or 'failure' # to the log-message depending on whether the SQL worked (which it always # should). This is where the 5 minute timeout is set ($tod_epoch + 300) # should you wish to change it. defer condition = ${if eq {$acl_m_greyexpiry}{} {1}} log_message = Greylisted $h_message-id: for offences: ${sg {$acl_m_greylistreasons}{\n}{,}}:\ ${lookup sqlite {GREYDB INSERT INTO greylist \ VALUES ( '$acl_m_greyident', \ '${eval10:$tod_epoch+300}', \ '$sender_host_address', \ '${quote_sqlite:$sender_helo_name}' );}\ {success}{failure}} message = Your mail was considered suspicious for the following reason(s):\n$acl_m_greylistreasons \ The mail has been greylisted for 5 minutes, after which it should be accepted. \ We apologise for the inconvenience. Your mail system should keep the mail on \ its queue and retry. When that happens, your system will be added to the list \ genuine mail systems, and mail from it should not be greylisted any more. \ In the event of problems, please contact postmaster@$qualify_domain # If the message was already listed but its time hasn't yet expired, keep rejecting it defer condition = ${if > {$acl_m_greyexpiry}{$tod_epoch}} message = Your mail was previously greylisted and the time has not yet expired.\n\ You should wait another ${eval10:$acl_m_greyexpiry-$tod_epoch} seconds.\n\ Reason(s) for greylisting: \n$acl_m_greylistreasons # The message was listed but it's been more than five minutes. Accept it now and whitelist # the sending host by its { IP, HELO } so that we don't delay its mail again. The addition # to the database is again done as a hackish side-effect; this time a side-effect of # evaluating a condition which comes out as '1' whether the database bit succeeds or not. accept condition = ${lookup sqlite {GREYDB INSERT INTO resenders \ VALUES ( '$sender_host_address', \ '${quote_sqlite:$sender_helo_name}', '$tod_epoch' ); }{1}{1}} --- NEW FILE greylist-tidy.sh --- #!/bin/bash if [ -r /var/spool/exim/db/greylist.db ]; then sqlite /var/spool/exim/db/greylist.db < 4.66-2 +- Add example of greylisting implementation in Exim ACLs + * Tue Feb 6 2007 David Woodhouse 4.66-1 - Update to 4.66 - Add dovecot authenticator From fedora-extras-commits at redhat.com Wed Feb 7 12:21:42 2007 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Wed, 7 Feb 2007 07:21:42 -0500 Subject: rpms/exim/devel exim-greylist.conf.inc,1.1,1.2 Message-ID: <200702071221.l17CLgt1023171@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23152 Modified Files: exim-greylist.conf.inc Log Message: Stupid dwmw2. Fix it in the package as well as on the test system. Index: exim-greylist.conf.inc =================================================================== RCS file: /cvs/extras/rpms/exim/devel/exim-greylist.conf.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- exim-greylist.conf.inc 7 Feb 2007 12:18:24 -0000 1.1 +++ exim-greylist.conf.inc 7 Feb 2007 12:21:10 -0000 1.2 @@ -99,6 +99,6 @@ # evaluating a condition which comes out as '1' whether the database bit succeeds or not. accept condition = ${lookup sqlite {GREYDB INSERT INTO resenders \ VALUES ( '$sender_host_address', \ - '${quote_sqlite:$sender_helo_name}', + '${quote_sqlite:$sender_helo_name}', \ '$tod_epoch' ); }{1}{1}} From fedora-extras-commits at redhat.com Wed Feb 7 12:32:48 2007 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Wed, 7 Feb 2007 07:32:48 -0500 Subject: rpms/limph pkg.acl,1.2,1.3 Message-ID: <200702071232.l17CWmeq023350@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/extras/rpms/limph In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23308 Modified Files: pkg.acl Log Message: Fixed. Index: pkg.acl =================================================================== RCS file: /cvs/extras/rpms/limph/pkg.acl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pkg.acl 6 Feb 2007 19:19:18 -0000 1.2 +++ pkg.acl 7 Feb 2007 12:32:15 -0000 1.3 @@ -1,2 +1,2 @@ -limb at jcomserv.net -orion at cora.nwra.com +limb +orion From fedora-extras-commits at redhat.com Wed Feb 7 12:33:17 2007 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Wed, 7 Feb 2007 07:33:17 -0500 Subject: rpms/exim/devel exim-greylist.conf.inc, 1.2, 1.3 mk-greylist-db.sql, 1.1, 1.2 Message-ID: <200702071233.l17CXHm8023354@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23332 Modified Files: exim-greylist.conf.inc mk-greylist-db.sql Log Message: primary key in resenders is (host,helo) not just host Index: exim-greylist.conf.inc =================================================================== RCS file: /cvs/extras/rpms/exim/devel/exim-greylist.conf.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- exim-greylist.conf.inc 7 Feb 2007 12:21:10 -0000 1.2 +++ exim-greylist.conf.inc 7 Feb 2007 12:32:44 -0000 1.3 @@ -19,10 +19,10 @@ # database table for these 'known resenders' looks like this: # # CREATE TABLE resenders ( -# host TEXT PRIMARY KEY, +# host TEXT, # helo TEXT, -# time INTEGER -# ); +# time INTEGER, +# PRIMARY KEY (host, helo) ); # # To remember mail we've rejected, we create an 'identity' from its sender # and recipient addresses and its Message-ID: header. We don't include the @@ -37,11 +37,10 @@ # looks like this: # # CREATE TABLE greylist ( -# id TEXT PRIMARY KEY, +# id TEXT, # expire INTEGER, # host TEXT, -# helo TEXT -# ); +# helo TEXT); # greylist_mail: Index: mk-greylist-db.sql =================================================================== RCS file: /cvs/extras/rpms/exim/devel/mk-greylist-db.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mk-greylist-db.sql 7 Feb 2007 12:18:24 -0000 1.1 +++ mk-greylist-db.sql 7 Feb 2007 12:32:44 -0000 1.2 @@ -1,7 +1,8 @@ CREATE TABLE resenders ( - host TEXT PRIMARY KEY, + host TEXT, helo TEXT, time INTEGER + PRIMARY KEY (host, helo) ); CREATE TABLE greylist ( From fedora-extras-commits at redhat.com Wed Feb 7 12:46:05 2007 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Wed, 7 Feb 2007 07:46:05 -0500 Subject: rpms/exim/devel exim-greylist.conf.inc, 1.3, 1.4 mk-greylist-db.sql, 1.2, 1.3 Message-ID: <200702071246.l17Ck5IA023464@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23434 Modified Files: exim-greylist.conf.inc mk-greylist-db.sql Log Message: fix sql, remove bogus success/failure indication Index: exim-greylist.conf.inc =================================================================== RCS file: /cvs/extras/rpms/exim/devel/exim-greylist.conf.inc,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- exim-greylist.conf.inc 7 Feb 2007 12:32:44 -0000 1.3 +++ exim-greylist.conf.inc 7 Feb 2007 12:45:33 -0000 1.4 @@ -67,18 +67,15 @@ # If the mail isn't already the database, defer it with an appropriate # message, and add it. Do the addition to the greylist database as a - # hackish side-effect of the log-message, appending 'success' or 'failure' - # to the log-message depending on whether the SQL worked (which it always - # should). This is where the 5 minute timeout is set ($tod_epoch + 300) - # should you wish to change it. + # hackish side-effect of the log-message. This is where the 5 minute + # timeout is set ($tod_epoch + 300), should you wish to change it. defer condition = ${if eq {$acl_m_greyexpiry}{} {1}} - log_message = Greylisted $h_message-id: for offences: ${sg {$acl_m_greylistreasons}{\n}{,}}:\ + log_message = Greylisted $h_message-id: for offences: ${sg {$acl_m_greylistreasons}{\n}{,}}\ ${lookup sqlite {GREYDB INSERT INTO greylist \ VALUES ( '$acl_m_greyident', \ '${eval10:$tod_epoch+300}', \ '$sender_host_address', \ - '${quote_sqlite:$sender_helo_name}' );}\ - {success}{failure}} + '${quote_sqlite:$sender_helo_name}' );}} message = Your mail was considered suspicious for the following reason(s):\n$acl_m_greylistreasons \ The mail has been greylisted for 5 minutes, after which it should be accepted. \ We apologise for the inconvenience. Your mail system should keep the mail on \ Index: mk-greylist-db.sql =================================================================== RCS file: /cvs/extras/rpms/exim/devel/mk-greylist-db.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mk-greylist-db.sql 7 Feb 2007 12:32:44 -0000 1.2 +++ mk-greylist-db.sql 7 Feb 2007 12:45:33 -0000 1.3 @@ -1,7 +1,7 @@ CREATE TABLE resenders ( host TEXT, helo TEXT, - time INTEGER + time INTEGER, PRIMARY KEY (host, helo) ); From fedora-extras-commits at redhat.com Wed Feb 7 12:48:49 2007 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Wed, 7 Feb 2007 07:48:49 -0500 Subject: rpms/exim/devel greylist-tidy.sh,1.1,1.2 Message-ID: <200702071248.l17CmnUr023728@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23519 Modified Files: greylist-tidy.sh Log Message: it's sqlite3 in -devel not sqlite Index: greylist-tidy.sh =================================================================== RCS file: /cvs/extras/rpms/exim/devel/greylist-tidy.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- greylist-tidy.sh 7 Feb 2007 12:18:24 -0000 1.1 +++ greylist-tidy.sh 7 Feb 2007 12:48:17 -0000 1.2 @@ -1,7 +1,7 @@ #!/bin/bash if [ -r /var/spool/exim/db/greylist.db ]; then - sqlite /var/spool/exim/db/greylist.db < Author: dwmw2 Update of /cvs/extras/rpms/exim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27586 Added Files: exim-4.66-greylist-conf.patch Log Message: greylisting patch to make conf file exim-4.66-greylist-conf.patch: --- NEW FILE exim-4.66-greylist-conf.patch --- --- exim-4.66/src/configure.default.grey 2007-02-07 12:01:16.000000000 +0000 +++ exim-4.66/src/configure.default 2007-02-07 12:09:06.000000000 +0000 @@ -435,7 +435,8 @@ acl_check_rcpt: # There are no default checks on DNS black lists because the domains that # contain these lists are changing all the time. However, here are two # examples of how you can get Exim to perform a DNS black list lookup at this - # point. The first one denies, whereas the second just warns. + # point. The first one denies, whereas the second just warns. The third + # triggers greylisting for any host in the blacklist. # # deny message = rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text # dnslists = black.list.example @@ -443,6 +444,10 @@ acl_check_rcpt: # warn dnslists = black.list.example # add_header = X-Warning: $sender_host_address is in a black list at $dnslist_domain # log_message = found in $dnslist_domain + # + # warn dnslists = black.list.example + # set acl_m_greylistreasons = Host found in $dnslist_domain\n$acl_m_greylistreasons + # ############################################################################# ############################################################################# @@ -456,6 +461,10 @@ acl_check_rcpt: # require verify = csa ############################################################################# + # Alternatively, greylist for it: + # warn !verify = csa + # set acl_m_greylistreasons = Host failed CSA check\n$acl_m_greylistreasons + # At this point, the address has passed all the checks that have been # configured, so we accept it unconditionally. @@ -481,6 +490,12 @@ acl_check_data: # deny condition = ${if !def:h_Message-ID: {1}} # message = RFC2822 says that all mail SHOULD have a Message-ID header.\n\ # Most messages without it are spam, so your mail has been rejected. + # + # Alternatively if we're feeling more lenient we could just use it to + # trigger greylisting instead: + + warn condition = ${if !def:h_Message-ID: {1}} + set acl_m_greylistreasons = Message lacks Message-Id: header. Consult RFC2822.\n$acl_m_greylistreasons # Deny if the message contains a virus. Before enabling this check, you # must install a virus scanner and set the av_scanner option above. @@ -515,8 +530,30 @@ acl_check_data: # message = Your message scored $spam_score SpamAssassin point. Report follows:\n\ # $spam_report + # Trigger greylisting (if enabled) if the SpamAssassin score is greater than 0.5 + # + # warn condition = ${if >{$spam_score_int}{5} {1}} + # set acl_m_greylistreasons = Message has $spam_score SpamAssassin points\n$acl_m_greylistreasons + + + # If you want to greylist _all_ mail rather than only mail which looks like there + # might be something wrong with it, then you can do this... + # + # warn set acl_m_greylistreasons = We greylist all mail\n$acl_m_greylistreasons + + # Now, invoke the greylisting. For this you need to have installed the exim-greylist + # package which contains this subroutine, and you need to uncomment the bit below + # which includes it too. Whenever the $acl_m_greylistreasons variable is non-empty, + # greylisting will kick in and will defer the mail to check if the sender is a + # proper mail which which retries, or whether it's a zombie. For more details, see + # the exim-greylist.conf.inc file itself. + # + # require acl = greylist_mail + accept +# To enable the greylisting, also uncomment this line: +# .include /etc/exim/exim-greylist.conf.inc acl_check_mime: From fedora-extras-commits at redhat.com Wed Feb 7 13:25:56 2007 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Wed, 7 Feb 2007 08:25:56 -0500 Subject: rpms/perl-Crypt-CBC/FC-4 perl-Crypt-CBC.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200702071325.l17DPuo9006242@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Crypt-CBC/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6174/FC-4 Modified Files: perl-Crypt-CBC.spec sources Log Message: * Wed Feb 07 2007 Andreas Thienemann - 2.22-1 - Upgrade to 2.22 Index: perl-Crypt-CBC.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-CBC/FC-4/perl-Crypt-CBC.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Crypt-CBC.spec 24 Feb 2006 19:38:05 -0000 1.3 +++ perl-Crypt-CBC.spec 7 Feb 2007 13:25:24 -0000 1.4 @@ -1,6 +1,6 @@ Summary: Encrypt Data with Cipher Block Chaining Mode Name: perl-Crypt-CBC -Version: 2.17 +Version: 2.22 Release: 1%{?dist} License: Artistic Group: Development/Libraries @@ -46,6 +46,12 @@ %{_mandir}/man3/*.3* %changelog +* Wed Feb 07 2007 Andreas Thienemann - 2.22-1 +- Upgrade to 2.22 + +* Fri Sep 08 2006 Andreas Thienemann - 2.19-1 +- Upgrade to 2.19 + * Fri Feb 24 2006 Andreas Thienemann - 2.17-1 - Upgrade to 2.17 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-CBC/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 24 Feb 2006 19:38:05 -0000 1.3 +++ sources 7 Feb 2007 13:25:24 -0000 1.4 @@ -1 +1 @@ -521bf0506e1da71506dd0f4afd16d8b4 Crypt-CBC-2.17.tar.gz +02622a5f0e70c1bc45c8db7985606643 Crypt-CBC-2.22.tar.gz From fedora-extras-commits at redhat.com Wed Feb 7 13:26:04 2007 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Wed, 7 Feb 2007 08:26:04 -0500 Subject: rpms/perl-Crypt-CBC/devel .cvsignore, 1.4, 1.5 perl-Crypt-CBC.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200702071326.l17DQ47t006255@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Crypt-CBC/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6174/devel Modified Files: .cvsignore perl-Crypt-CBC.spec sources Log Message: * Wed Feb 07 2007 Andreas Thienemann - 2.22-1 - Upgrade to 2.22 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-CBC/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 8 Sep 2006 17:50:42 -0000 1.4 +++ .cvsignore 7 Feb 2007 13:25:32 -0000 1.5 @@ -1 +1 @@ -Crypt-CBC-2.19.tar.gz +Crypt-CBC-2.22.tar.gz Index: perl-Crypt-CBC.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-CBC/devel/perl-Crypt-CBC.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Crypt-CBC.spec 8 Sep 2006 17:47:02 -0000 1.4 +++ perl-Crypt-CBC.spec 7 Feb 2007 13:25:32 -0000 1.5 @@ -1,6 +1,6 @@ Summary: Encrypt Data with Cipher Block Chaining Mode Name: perl-Crypt-CBC -Version: 2.19 +Version: 2.22 Release: 1%{?dist} License: Artistic Group: Development/Libraries @@ -46,6 +46,9 @@ %{_mandir}/man3/*.3* %changelog +* Wed Feb 07 2007 Andreas Thienemann - 2.22-1 +- Upgrade to 2.22 + * Fri Sep 08 2006 Andreas Thienemann - 2.19-1 - Upgrade to 2.19 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-CBC/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Sep 2006 17:50:42 -0000 1.4 +++ sources 7 Feb 2007 13:25:32 -0000 1.5 @@ -1 +1 @@ -9e611ce8984d1d2f14cd038e62b50064 Crypt-CBC-2.19.tar.gz +02622a5f0e70c1bc45c8db7985606643 Crypt-CBC-2.22.tar.gz From fedora-extras-commits at redhat.com Wed Feb 7 13:26:01 2007 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Wed, 7 Feb 2007 08:26:01 -0500 Subject: rpms/perl-Crypt-CBC/FC-6 perl-Crypt-CBC.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200702071326.l17DQ1dv006250@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Crypt-CBC/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6174/FC-6 Modified Files: perl-Crypt-CBC.spec sources Log Message: * Wed Feb 07 2007 Andreas Thienemann - 2.22-1 - Upgrade to 2.22 Index: perl-Crypt-CBC.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-CBC/FC-6/perl-Crypt-CBC.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Crypt-CBC.spec 8 Sep 2006 17:47:02 -0000 1.4 +++ perl-Crypt-CBC.spec 7 Feb 2007 13:25:29 -0000 1.5 @@ -1,6 +1,6 @@ Summary: Encrypt Data with Cipher Block Chaining Mode Name: perl-Crypt-CBC -Version: 2.19 +Version: 2.22 Release: 1%{?dist} License: Artistic Group: Development/Libraries @@ -46,6 +46,9 @@ %{_mandir}/man3/*.3* %changelog +* Wed Feb 07 2007 Andreas Thienemann - 2.22-1 +- Upgrade to 2.22 + * Fri Sep 08 2006 Andreas Thienemann - 2.19-1 - Upgrade to 2.19 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-CBC/FC-6/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Sep 2006 17:50:42 -0000 1.4 +++ sources 7 Feb 2007 13:25:29 -0000 1.5 @@ -1 +1 @@ -9e611ce8984d1d2f14cd038e62b50064 Crypt-CBC-2.19.tar.gz +02622a5f0e70c1bc45c8db7985606643 Crypt-CBC-2.22.tar.gz From fedora-extras-commits at redhat.com Wed Feb 7 13:25:59 2007 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Wed, 7 Feb 2007 08:25:59 -0500 Subject: rpms/perl-Crypt-CBC/FC-5 perl-Crypt-CBC.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200702071325.l17DPxk7006246@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Crypt-CBC/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6174/FC-5 Modified Files: perl-Crypt-CBC.spec sources Log Message: * Wed Feb 07 2007 Andreas Thienemann - 2.22-1 - Upgrade to 2.22 Index: perl-Crypt-CBC.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-CBC/FC-5/perl-Crypt-CBC.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Crypt-CBC.spec 24 Feb 2006 19:34:08 -0000 1.3 +++ perl-Crypt-CBC.spec 7 Feb 2007 13:25:27 -0000 1.4 @@ -1,6 +1,6 @@ Summary: Encrypt Data with Cipher Block Chaining Mode Name: perl-Crypt-CBC -Version: 2.17 +Version: 2.22 Release: 1%{?dist} License: Artistic Group: Development/Libraries @@ -46,6 +46,12 @@ %{_mandir}/man3/*.3* %changelog +* Wed Feb 07 2007 Andreas Thienemann - 2.22-1 +- Upgrade to 2.22 + +* Fri Sep 08 2006 Andreas Thienemann - 2.19-1 +- Upgrade to 2.19 + * Fri Feb 24 2006 Andreas Thienemann - 2.17-1 - Upgrade to 2.17 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-CBC/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 24 Feb 2006 19:34:08 -0000 1.3 +++ sources 7 Feb 2007 13:25:27 -0000 1.4 @@ -1 +1 @@ -521bf0506e1da71506dd0f4afd16d8b4 Crypt-CBC-2.17.tar.gz +02622a5f0e70c1bc45c8db7985606643 Crypt-CBC-2.22.tar.gz From fedora-extras-commits at redhat.com Wed Feb 7 14:22:19 2007 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 7 Feb 2007 09:22:19 -0500 Subject: rpms/uw-imap/devel uw-imap.spec,1.25,1.26 c-client.cf,1.3,NONE Message-ID: <200702071422.l17EMJPg010294@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/uw-imap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10272 Modified Files: uw-imap.spec Removed Files: c-client.cf Log Message: * Wed Feb 07 2007 Rex Dieter 2006e-3 - Obsoletes: libc-client2004g - cleanup/simplify c-client.cf handling Index: uw-imap.spec =================================================================== RCS file: /cvs/extras/rpms/uw-imap/devel/uw-imap.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- uw-imap.spec 27 Jan 2007 03:42:20 -0000 1.25 +++ uw-imap.spec 7 Feb 2007 14:21:47 -0000 1.26 @@ -1,11 +1,13 @@ +# Fedora review: http://bugzilla.redhat.com/166008 + #define snap 0701181849 #define beta .DEV.SNAP-%{snap} Summary: UW Server daemons for IMAP and POP network mail protocols Name: uw-imap Version: 2006e -Release: 2%{?dist} +Release: 3%{?dist} # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0 License: Apache 2.0 @@ -20,7 +22,8 @@ %define somajor 2006 %define shlibname lib%{soname}.so.%{somajor} %define imap_libs lib%{soname}%{somajor} -#Old naming +## Old naming +#define imap_libs lib%{soname} #define imap_libs imap-libs # FC4+ uses %%_sysconfdir/pki/tls/certs, previous releases used %%_datadir/ssl/certs @@ -29,8 +32,6 @@ # imap -> uw-imap rename Obsoletes: imap < 1:%{version} -Source10: c-client.cf - # new pam setup, using new "include" feature Source21: imap.pam # legacy/old pam setup, using pam_stack.so @@ -68,6 +69,7 @@ Group: System Environment/Libraries Obsoletes: libc-client2004d < 1:2004d-2 Obsoletes: libc-client2004e < 2004e-2 +Obsoletes: libc-client2004g < 2004g-7 %description -n %{imap_libs} Provides a common API for accessing mailboxes. @@ -182,11 +184,12 @@ install -p -m644 -D %{SOURCE34} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/ipop3 install -p -m644 -D %{SOURCE35} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/pop3s -# %ghost *.pem files +## %ghost'd items +# *.pem files mkdir -p $RPM_BUILD_ROOT%{sslcerts}/ touch $RPM_BUILD_ROOT%{sslcerts}/{imapd,ipop3d}.pem - -install -p -m644 -D %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/c-client.cf +# c-client.cf +touch $RPM_BUILD_ROOT%{_sysconfdir}/c-client.cf # FIXME, do this on daemon startup -- Rex @@ -271,6 +274,10 @@ %changelog +* Wed Feb 07 2007 Rex Dieter 2006e-3 +- Obsoletes: libc-client2004g +- cleanup/simplify c-client.cf handling + * Fri Jan 26 2007 Rex Dieter 2006e-2 - use /etc/profile.d/krb5-devel.sh --- c-client.cf DELETED --- From fedora-extras-commits at redhat.com Wed Feb 7 14:55:38 2007 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Wed, 7 Feb 2007 09:55:38 -0500 Subject: rpms/graphviz/devel graphviz-tk8.5.patch, NONE, 1.1 graphviz.spec, 1.32, 1.33 Message-ID: <200702071455.l17EtcvV010676@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/graphviz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10653 Modified Files: graphviz.spec Added Files: graphviz-tk8.5.patch Log Message: * Wed Feb 07 2007 Patrick "Jima" Laughton 2.12-5 - Added patch for slightly broken tk 8.5 graphviz-tk8.5.patch: --- NEW FILE graphviz-tk8.5.patch --- diff -urN graphviz-2.12/configure graphviz-2.12-patched/configure --- graphviz-2.12/configure 2006-12-04 16:02:10.000000000 -0600 +++ graphviz-2.12-patched/configure 2007-02-07 08:20:19.000000000 -0600 @@ -26251,8 +26251,8 @@ fi; if test "x$TCLSH" = "x"; then - # Extract the first word of "tclsh8.4", so it can be a program name with args. -set dummy tclsh8.4; ac_word=$2 + # Extract the first word of "tclsh8.5", so it can be a program name with args. +set dummy tclsh8.5; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_TCLSH+set}" = set; then @@ -26291,8 +26291,8 @@ fi if test "x$TCLSH" = "x"; then - # Extract the first word of "tclsh8.3", so it can be a program name with args. -set dummy tclsh8.3; ac_word=$2 + # Extract the first word of "tclsh8.4", so it can be a program name with args. +set dummy tclsh8.4; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_TCLSH+set}" = set; then @@ -26331,7 +26331,47 @@ fi if test "x$TCLSH" = "x"; then - # Extract the first word of "tclsh", so it can be a program name with args. + # Extract the first word of "tclsh8.3", so it can be a program name with args. +set dummy tclsh8.3; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_TCLSH+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $TCLSH in + [\\/]* | ?:[\\/]*) + ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_TCLSH="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + ;; +esac +fi +TCLSH=$ac_cv_path_TCLSH + +if test -n "$TCLSH"; then + echo "$as_me:$LINENO: result: $TCLSH" >&5 +echo "${ECHO_T}$TCLSH" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test "x$TCLSH" = "x"; then + # Extract the first word of "tclsh", so it can be a program name with args. set dummy tclsh; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 @@ -26370,6 +26410,7 @@ echo "${ECHO_T}no" >&6 fi + fi fi fi fi @@ -26674,8 +26715,8 @@ WISH=$withval fi; if test "x$WISH" = "x"; then - # Extract the first word of "wish8.4", so it can be a program name with args. -set dummy wish8.4; ac_word=$2 + # Extract the first word of "wish8.5", so it can be a program name with args. +set dummy wish8.5; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_WISH+set}" = set; then @@ -26714,7 +26755,47 @@ fi if test "x$WISH" = "x"; then - # Extract the first word of "wish8.3", so it can be a program name with args. + # Extract the first word of "wish8.4", so it can be a program name with args. +set dummy wish8.4; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_WISH+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $WISH in + [\\/]* | ?:[\\/]*) + ac_cv_path_WISH="$WISH" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_WISH="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + ;; +esac +fi +WISH=$ac_cv_path_WISH + +if test -n "$WISH"; then + echo "$as_me:$LINENO: result: $WISH" >&5 +echo "${ECHO_T}$WISH" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test "x$WISH" = "x"; then + # Extract the first word of "wish8.3", so it can be a program name with args. set dummy wish8.3; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 @@ -26753,8 +26834,8 @@ echo "${ECHO_T}no" >&6 fi - if test "x$WISH" = "x"; then - # Extract the first word of "wish", so it can be a program name with args. + if test "x$WISH" = "x"; then + # Extract the first word of "wish", so it can be a program name with args. set dummy wish; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 @@ -26793,6 +26874,7 @@ echo "${ECHO_T}no" >&6 fi + fi fi fi fi @@ -26815,7 +26897,7 @@ WISH_EXEC_PREFIX=`echo $WISH|sed -e 's%/bin/wish.*$%%'` if test -f ${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/tk.h; then - TK_INCLUDES="-I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND} -I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/generic" + TK_INCLUDES="-I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND} -I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/generic -I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/unix" else if test "x${WISH_EXEC_PREFIX}" != "x/usr" -a -f ${WISH_EXEC_PREFIX}/include/tk.h; then TK_INCLUDES=-I${WISH_EXEC_PREFIX}/include @@ -33490,7 +33572,7 @@ # ----------------------------------- # tkInt.h if test -f "$TK_SRC_DIR/generic/tkInt.h"; then -TKINT_INCLUDES="-I$TK_SRC_DIR/generic" +TKINT_INCLUDES="-I$TK_SRC_DIR/generic -I$TK_SRC_DIR/unix" else if test -f "/usr/include/tkInt.h"; then TKINT_INCLUDES="" diff -urN graphviz-2.12/configure.ac graphviz-2.12-patched/configure.ac --- graphviz-2.12/configure.ac 2006-12-04 15:11:58.000000000 -0600 +++ graphviz-2.12-patched/configure.ac 2007-02-07 08:20:02.000000000 -0600 @@ -755,11 +755,14 @@ TCLSH=$withval,) if test "x$TCLSH" = "x"; then - AC_PATH_PROG(TCLSH,tclsh8.4) + AC_PATH_PROG(TCLSH,tclsh8.5) if test "x$TCLSH" = "x"; then - AC_PATH_PROG(TCLSH,tclsh8.3) + AC_PATH_PROG(TCLSH,tclsh8.4) if test "x$TCLSH" = "x"; then - AC_PATH_PROG(TCLSH,tclsh) + AC_PATH_PROG(TCLSH,tclsh8.3) + if test "x$TCLSH" = "x"; then + AC_PATH_PROG(TCLSH,tclsh) + fi fi fi fi @@ -904,11 +907,14 @@ [ --with-wish=PROG build graphviz for specific wish], WISH=$withval,) if test "x$WISH" = "x"; then - AC_PATH_PROG(WISH,wish8.4) + AC_PATH_PROG(WISH,wish8.5) if test "x$WISH" = "x"; then - AC_PATH_PROG(WISH,wish8.3) - if test "x$WISH" = "x"; then - AC_PATH_PROG(WISH,wish) + AC_PATH_PROG(WISH,wish8.4) + if test "x$WISH" = "x"; then + AC_PATH_PROG(WISH,wish8.3) + if test "x$WISH" = "x"; then + AC_PATH_PROG(WISH,wish) + fi fi fi fi @@ -930,7 +936,7 @@ WISH_EXEC_PREFIX=`echo $WISH|sed -e 's%/bin/wish.*$%%'` if test -f ${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/tk.h; then - TK_INCLUDES="-I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND} -I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/generic" + TK_INCLUDES="-I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND} -I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/generic -I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/unix" else if test "x${WISH_EXEC_PREFIX}" != "x/usr" -a -f ${WISH_EXEC_PREFIX}/include/tk.h; then TK_INCLUDES=-I${WISH_EXEC_PREFIX}/include @@ -1673,7 +1679,7 @@ # ----------------------------------- # tkInt.h if test -f "$TK_SRC_DIR/generic/tkInt.h"; then -TKINT_INCLUDES="-I$TK_SRC_DIR/generic" +TKINT_INCLUDES="-I$TK_SRC_DIR/generic -I$TK_SRC_DIR/unix" else if test -f "/usr/include/tkInt.h"; then TKINT_INCLUDES="" Index: graphviz.spec =================================================================== RCS file: /cvs/extras/rpms/graphviz/devel/graphviz.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- graphviz.spec 1 Feb 2007 16:00:56 -0000 1.32 +++ graphviz.spec 7 Feb 2007 14:55:06 -0000 1.33 @@ -7,12 +7,13 @@ #-- graphviz src.rpm -------------------------------------------------------- Name: graphviz Version: 2.12 -Release: 4%{?dist} +Release: 5%{?dist} License: CPL URL: http://www.graphviz.org/ Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.12.tar.gz Patch0: %{name}-php5.patch +Patch1: %{name}-tk8.5.patch # graphviz is relocatable Prefix: /usr @@ -397,6 +398,9 @@ %prep %setup -q %patch0 -p1 +%if "%fedora" >= "7" +%patch1 -p1 +%endif %build # XXX ix86 only used to have -ffast-math, let's use everywhere @@ -433,6 +437,9 @@ #-- changelog -------------------------------------------------- %changelog +* Wed Feb 07 2007 Patrick "Jima" Laughton 2.12-5 +- Added patch for slightly broken tk 8.5 + * Thu Feb 01 2007 Patrick "Jima" Laughton 2.12-4 - Bump-n-build due to tk upgrade From fedora-extras-commits at redhat.com Wed Feb 7 15:09:40 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 7 Feb 2007 10:09:40 -0500 Subject: comps comps-fe7.xml.in,1.100,1.101 comps-fe6.xml.in,1.292,1.293 Message-ID: <200702071509.l17F9eXm014150@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14124 Modified Files: comps-fe7.xml.in comps-fe6.xml.in Log Message: add duel3 smashteroid Index: comps-fe7.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe7.xml.in,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- comps-fe7.xml.in 3 Feb 2007 21:14:09 -0000 1.100 +++ comps-fe7.xml.in 7 Feb 2007 15:09:10 -0000 1.101 @@ -407,6 +407,7 @@ csmash cyphesis dd2 + duel3 enigma fbg fillets-ng Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.292 retrieving revision 1.293 diff -u -r1.292 -r1.293 --- comps-fe6.xml.in 3 Feb 2007 21:14:09 -0000 1.292 +++ comps-fe6.xml.in 7 Feb 2007 15:09:10 -0000 1.293 @@ -407,6 +407,7 @@ csmash cyphesis dd2 + duel3 enigma fbg fillets-ng @@ -467,6 +468,7 @@ scorched3d scummvm shippy + smashteroid sopwith starfighter sturmbahnfahrer From fedora-extras-commits at redhat.com Wed Feb 7 15:13:37 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Wed, 7 Feb 2007 10:13:37 -0500 Subject: rpms/zabbix/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 zabbix.spec, 1.5, 1.6 zabbix-1.1.4-snmp-poll-overflow.patch, 1.1, NONE Message-ID: <200702071513.l17FDbbf014194@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/zabbix/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14170 Modified Files: .cvsignore sources zabbix.spec Removed Files: zabbix-1.1.4-snmp-poll-overflow.patch Log Message: New upstream release, zabbix v1.1.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/zabbix/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Feb 2007 15:45:52 -0000 1.3 +++ .cvsignore 7 Feb 2007 15:13:05 -0000 1.4 @@ -1,2 +1,3 @@ zabbix-1.1.4.tar.gz zabbix-1.1.5.tar.gz +zabbix-1.1.6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/zabbix/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Feb 2007 15:45:52 -0000 1.3 +++ sources 7 Feb 2007 15:13:05 -0000 1.4 @@ -1 +1 @@ -8f47fc38b26a7c04fdcb0354e66dab37 zabbix-1.1.5.tar.gz +baa6896c5f41ed286bca3c40e419e1cf zabbix-1.1.6.tar.gz Index: zabbix.spec =================================================================== RCS file: /cvs/extras/rpms/zabbix/devel/zabbix.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- zabbix.spec 1 Feb 2007 15:45:52 -0000 1.5 +++ zabbix.spec 7 Feb 2007 15:13:05 -0000 1.6 @@ -1,5 +1,5 @@ Name: zabbix -Version: 1.1.5 +Version: 1.1.6 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -213,6 +213,9 @@ %{_datadir}/%{name} %changelog +* Wed Feb 07 2007 Jarod Wilson 1.1.6-1 +- New upstream release + * Thu Feb 01 2007 Jarod Wilson 1.1.5-1 - New upstream release --- zabbix-1.1.4-snmp-poll-overflow.patch DELETED --- From fedora-extras-commits at redhat.com Wed Feb 7 15:37:32 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Wed, 7 Feb 2007 10:37:32 -0500 Subject: rpms/zabbix/FC-6 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 zabbix.spec, 1.3, 1.4 zabbix-1.1.4-snmp-poll-overflow.patch, 1.1, NONE Message-ID: <200702071537.l17FbWIL014625@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/zabbix/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14579 Modified Files: .cvsignore sources zabbix.spec Removed Files: zabbix-1.1.4-snmp-poll-overflow.patch Log Message: New upstream release, zabbix v1.1.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/zabbix/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Feb 2007 15:53:10 -0000 1.3 +++ .cvsignore 7 Feb 2007 15:37:00 -0000 1.4 @@ -1,2 +1,3 @@ zabbix-1.1.4.tar.gz zabbix-1.1.5.tar.gz +zabbix-1.1.6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/zabbix/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Feb 2007 15:53:10 -0000 1.3 +++ sources 7 Feb 2007 15:37:00 -0000 1.4 @@ -1 +1 @@ -8f47fc38b26a7c04fdcb0354e66dab37 zabbix-1.1.5.tar.gz +baa6896c5f41ed286bca3c40e419e1cf zabbix-1.1.6.tar.gz Index: zabbix.spec =================================================================== RCS file: /cvs/extras/rpms/zabbix/FC-6/zabbix.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- zabbix.spec 1 Feb 2007 15:53:10 -0000 1.3 +++ zabbix.spec 7 Feb 2007 15:37:00 -0000 1.4 @@ -1,5 +1,5 @@ Name: zabbix -Version: 1.1.5 +Version: 1.1.6 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -213,6 +213,9 @@ %{_datadir}/%{name} %changelog +* Wed Feb 07 2007 Jarod Wilson 1.1.6-1 +- New upstream release + * Thu Feb 01 2007 Jarod Wilson 1.1.5-1 - New upstream release --- zabbix-1.1.4-snmp-poll-overflow.patch DELETED --- From fedora-extras-commits at redhat.com Wed Feb 7 15:40:33 2007 From: fedora-extras-commits at redhat.com (John Clark Williams (jcwillia)) Date: Wed, 7 Feb 2007 10:40:33 -0500 Subject: mock ChangeLog, 1.8.2.5, 1.8.2.6 mock.py, 1.53.2.8, 1.53.2.9 mock.spec, 1.16.2.16, 1.16.2.17 Message-ID: <200702071540.l17FeXiA014709@cvs-int.fedora.redhat.com> Author: jcwillia Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14688 Modified Files: Tag: mock-0-6-branch ChangeLog mock.py mock.spec Log Message: added error() calls for printing command output on failed commands; added installdeps command for long-term chroot management; fixed invalid call to os.file (rather than os.path) Index: ChangeLog =================================================================== RCS file: /cvs/fedora/mock/ChangeLog,v retrieving revision 1.8.2.5 retrieving revision 1.8.2.6 diff -u -r1.8.2.5 -r1.8.2.6 --- ChangeLog 8 Jan 2007 17:39:13 -0000 1.8.2.5 +++ ChangeLog 7 Feb 2007 15:40:31 -0000 1.8.2.6 @@ -1,3 +1,13 @@ +2007-02-07 Clark Williams + + * Added error() calls to print command output on failed commands + +2007-02-06 Clark Williams + + * mock.py + added installdeps command for long-term chroot management + fixed invalid reference to os.file (rather than os.path) + 2007-01-08 Clark Williams * Makefile changed archive creation to keep tarball clean Index: mock.py =================================================================== RCS file: /cvs/fedora/mock/mock.py,v retrieving revision 1.53.2.8 retrieving revision 1.53.2.9 diff -u -r1.53.2.8 -r1.53.2.9 --- mock.py 8 Jan 2007 17:36:38 -0000 1.53.2.8 +++ mock.py 7 Feb 2007 15:40:31 -0000 1.53.2.9 @@ -21,6 +21,7 @@ import rpmUtils try: test = rpmUtils.transaction.initReadOnlyTransaction() + test = None except: import rpmUtils.transaction import rpm @@ -193,7 +194,7 @@ (retval, output) = self.do(cmd) if retval != 0: - error("Errors cleaning out chroot: %s" % output) + error(output) if os.path.exists(self.rootdir): raise RootError, "Failed to clean basedir, exiting" @@ -269,6 +270,7 @@ (retval, output) = self.do(command) if retval != 0: + error(output) raise YumError, "Error performing yum command: %s" % command return (retval, output) @@ -295,6 +297,7 @@ if retval != 0: msg = "Error installing srpm: %s" % srpmfn self.root_log(msg) + error(output) raise RootError, msg specdir = os.path.join(bd_out, 'SPECS') @@ -314,6 +317,7 @@ (retval, output) = self.do_chroot(cmd) if retval != 0: + error(output) raise PkgError, "Error building srpm from installed spec. See Root log." srpmdir = os.path.join(bd_out, 'SRPMS') @@ -342,12 +346,20 @@ for line in output.split('\n'): if line.find('No Package Found for') != -1: errorpkg = line.replace('No Package Found for', '') + error(output) raise BuildError, "Cannot find build req %s. Exiting." % errorpkg # nothing made us exit, so we continue self.yum('install %s' % arg_string) - return srpm + def installdeps(self, srpm): + """build an srpm into binary rpms, capture log""" + + self.state("setup") + # take srpm, pass to install_build_deps() to rebuild it to a valid srpm + # and do build deps + self.install_build_deps(srpm) + def build(self, srpm): """build an srpm into binary rpms, capture log""" @@ -370,6 +382,7 @@ (retval, output) = self.do_chroot(cmd) if retval != 0: + error(output) raise BuildError, "Error building package from %s, See build log" % srpmfn bd_out = self.rootdir + self.builddir @@ -441,6 +454,7 @@ if retval != 0: if output.find('already mounted') == -1: # probably won't work in other LOCALES + error(output) raise RootError, "could not mount /dev/pts error was: %s" % output @@ -452,6 +466,7 @@ if retval != 0: if output.find('not mounted') == -1: # this probably won't work in other LOCALES + error(output) raise RootError, "could not umount %s error was: %s" % (path, output) @@ -529,10 +544,9 @@ self.close() if exitcode: ret = exitcode - error("Non-zero return value %d on executing %s\n" % (ret, cmd)) + error(output) sys.exit(ret) - return (ret, output) def _text_requires_from_hdr(self, hdr, srpm): @@ -606,6 +620,7 @@ if not os.path.exists(devpath): (retval, output) = self.do(cmd) if retval != 0: + error(output) raise RootError, "could not mknod error was: %s" % output # link fd to ../proc/self/fd @@ -736,7 +751,9 @@ chroot - run the specified command within the chroot shell - run an interactive shell within specified chroot clean - clean out the specified chroot - init - initialize the chroot, do not build anything""" + init - initialize the chroot, do not build anything + installdeps - install build dependencies""" + parser = OptionParser(usage=usage, version=__VERSION__) parser.add_option("-r", action="store", type="string", dest="chroot", help="chroot name/config file name default: %default", @@ -938,7 +955,7 @@ if os.path.exists(cfg): execfile(cfg) else: - if config_path != "/etc/mock" and os.file.exists("/etc/mock/defaults.cfg"): + if config_path != "/etc/mock" and os.path.exists("/etc/mock/defaults.cfg"): execfile("/etc/mock/defaults.cfg") # read in the config file by chroot name @@ -976,6 +993,35 @@ config_opts['clean'] = config_opts['quiet'] = False do_run_cmd(config_opts, "/bin/bash", env='PS1="mock-chroot> "', raw_chroot=1) + elif args[0] == 'installdeps': + if len(args) > 1: + srpm = args[1] + else: + error("No package specified to installdeps command.") + sys.exit(50) + ts = rpmUtils.transaction.initReadOnlyTransaction() + try: + hdr = rpmUtils.miscutils.hdrFromPackage(ts, srpm) + except rpmUtils.RpmUtilsError, e: + error("Specified srpm %s cannot be found/opened" % srpm) + sys.exit(50) + if hdr[rpm.RPMTAG_SOURCEPACKAGE] != 1: + error("Specified srpm isn't a srpm! Can't go on") + sys.exit(50) + try: + my = None # if Root() fails, my will be undefined so we force it to None + my = Root(config_opts) + os.umask(0022) # set a umask- protects from paranoid whackjobs with an 002 umask + my.prep() + my.installdeps(srpm) + except Error, e: + error(e) + if my: + my.close() + sys.exit(e.resultcode) + my.close() + print "Logs in: %s" % my.resultdir + else: if args[0] == 'rebuild': if len(args) > 1: Index: mock.spec =================================================================== RCS file: /cvs/fedora/mock/mock.spec,v retrieving revision 1.16.2.16 retrieving revision 1.16.2.17 diff -u -r1.16.2.16 -r1.16.2.17 --- mock.spec 8 Jan 2007 17:39:13 -0000 1.16.2.16 +++ mock.spec 7 Feb 2007 15:40:31 -0000 1.16.2.17 @@ -1,6 +1,6 @@ Summary: Builds packages inside chroots Name: mock -Version: 0.6.10 +Version: 0.6.11 Release: 1%{?dist} License: GPL Group: Development/Tools @@ -11,7 +11,6 @@ Requires(pre): shadow-utils BuildRequires: libselinux-devel - %description Mock takes a srpm and builds it in a chroot @@ -67,6 +66,12 @@ %{_libdir}/libselinux-mock.so %changelog +* Wed Feb 7 2007 Clark Williams - 0.6.11-1 +- added error() calls to print command output on failed commands + +* Tue Feb 6 2007 Clark Williams - 0.6.11-1 +- added installdeps command for long-term chroot management + * Mon Jan 8 2007 Clark Williams - 0.6.10-1 - Added Josh Boyer's EPEL config files From fedora-extras-commits at redhat.com Wed Feb 7 15:52:24 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Wed, 7 Feb 2007 10:52:24 -0500 Subject: rpms/zabbix/FC-5 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 zabbix.spec, 1.3, 1.4 zabbix-1.1.4-snmp-poll-overflow.patch, 1.1, NONE Message-ID: <200702071552.l17FqOCR014795@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/zabbix/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14774 Modified Files: .cvsignore sources zabbix.spec Removed Files: zabbix-1.1.4-snmp-poll-overflow.patch Log Message: New upstream release, zabbix v1.1.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/zabbix/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Feb 2007 15:54:51 -0000 1.3 +++ .cvsignore 7 Feb 2007 15:51:51 -0000 1.4 @@ -1,2 +1,3 @@ zabbix-1.1.4.tar.gz zabbix-1.1.5.tar.gz +zabbix-1.1.6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/zabbix/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Feb 2007 15:54:51 -0000 1.3 +++ sources 7 Feb 2007 15:51:51 -0000 1.4 @@ -1 +1 @@ -8f47fc38b26a7c04fdcb0354e66dab37 zabbix-1.1.5.tar.gz +baa6896c5f41ed286bca3c40e419e1cf zabbix-1.1.6.tar.gz Index: zabbix.spec =================================================================== RCS file: /cvs/extras/rpms/zabbix/FC-5/zabbix.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- zabbix.spec 1 Feb 2007 15:54:51 -0000 1.3 +++ zabbix.spec 7 Feb 2007 15:51:51 -0000 1.4 @@ -1,5 +1,5 @@ Name: zabbix -Version: 1.1.5 +Version: 1.1.6 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -213,6 +213,9 @@ %{_datadir}/%{name} %changelog +* Wed Feb 07 2007 Jarod Wilson 1.1.6-1 +- New upstream release + * Thu Feb 01 2007 Jarod Wilson 1.1.5-1 - New upstream release --- zabbix-1.1.4-snmp-poll-overflow.patch DELETED --- From fedora-extras-commits at redhat.com Wed Feb 7 15:55:10 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Wed, 7 Feb 2007 10:55:10 -0500 Subject: rpms/beryl-settings/devel beryl-settings.spec,1.8,1.9 Message-ID: <200702071555.l17FtA6f014873@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/beryl-settings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14856 Modified Files: beryl-settings.spec Log Message: Fix image path in beryl-settings-simple Index: beryl-settings.spec =================================================================== RCS file: /cvs/extras/rpms/beryl-settings/devel/beryl-settings.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- beryl-settings.spec 6 Feb 2007 16:42:14 -0000 1.8 +++ beryl-settings.spec 7 Feb 2007 15:54:38 -0000 1.9 @@ -3,7 +3,7 @@ License: GPL Group: User Interface/Desktops Version: 0.1.9999.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Beryl OpenGL window and compositing manager GUI config utility BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -48,6 +48,9 @@ %prep %setup -q -a 1 -a 2 +### FIXME: fixed upstream, drop this from next release build +perl -pi -e 's#/share/bsm--/#/share/beryl-settings-simple/#g' \ + beryl-settings-simple-0.1.9999.1/src/beryl-settings-simple.in %build # beryl-settings-bindings @@ -131,6 +134,9 @@ %changelog +* Wed Feb 07 2007 Jarod Wilson 0.1.9999.1-4 +- Fix image path in beryl-settings-simple + * Tue Feb 06 2007 Jarod Wilson 0.1.9999.1-3 - Get rid of duplicate desktop entries From fedora-extras-commits at redhat.com Wed Feb 7 16:15:51 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Wed, 7 Feb 2007 11:15:51 -0500 Subject: rpms/beryl-settings/FC-6 beryl-settings.spec,1.8,1.9 Message-ID: <200702071615.l17GFpT2018399@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/beryl-settings/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18382 Modified Files: beryl-settings.spec Log Message: Fix image path in beryl-settings-simple Index: beryl-settings.spec =================================================================== RCS file: /cvs/extras/rpms/beryl-settings/FC-6/beryl-settings.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- beryl-settings.spec 6 Feb 2007 16:44:00 -0000 1.8 +++ beryl-settings.spec 7 Feb 2007 16:15:19 -0000 1.9 @@ -3,7 +3,7 @@ License: GPL Group: User Interface/Desktops Version: 0.1.9999.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Beryl OpenGL window and compositing manager GUI config utility BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -48,6 +48,9 @@ %prep %setup -q -a 1 -a 2 +### FIXME: fixed upstream, drop this from next release build +perl -pi -e 's#/share/bsm--/#/share/beryl-settings-simple/#g' \ + beryl-settings-simple-0.1.9999.1/src/beryl-settings-simple.in %build # beryl-settings-bindings @@ -131,6 +134,9 @@ %changelog +* Wed Feb 07 2007 Jarod Wilson 0.1.9999.1-4 +- Fix image path in beryl-settings-simple + * Tue Feb 06 2007 Jarod Wilson 0.1.9999.1-3 - Get rid of duplicate desktop entries From fedora-extras-commits at redhat.com Wed Feb 7 16:44:59 2007 From: fedora-extras-commits at redhat.com (Pierre Ossman (drzeus)) Date: Wed, 7 Feb 2007 11:44:59 -0500 Subject: rpms/pulseaudio/devel pulseaudio-0.9.5-userconf.patch, NONE, 1.1 pulseaudio.spec, 1.2, 1.3 Message-ID: <200702071644.l17GixGQ018647@cvs-int.fedora.redhat.com> Author: drzeus Update of /cvs/extras/rpms/pulseaudio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18617 Modified Files: pulseaudio.spec Added Files: pulseaudio-0.9.5-userconf.patch Log Message: Add esound compatibility packet and backported fix for unopenable user configs. pulseaudio-0.9.5-userconf.patch: --- NEW FILE pulseaudio-0.9.5-userconf.patch --- Index: /trunk/src/pulsecore/core-util.c =================================================================== --- /trunk/src/pulsecore/core-util.c (revision 1418) +++ /trunk/src/pulsecore/core-util.c (revision 1423) @@ -185,5 +185,5 @@ } #else - pa_log_warn("secure directory creation not supported on Win32."); + pa_log_warn("secure directory creation not supported on Win32."); #endif @@ -954,5 +954,6 @@ #endif - if ((f = fopen(fn, mode)) || errno != ENOENT) { + f = fopen(fn, mode); + if (f != NULL) { if (result) *result = pa_xstrdup(fn); @@ -961,4 +962,9 @@ } + if (errno != ENOENT) { + pa_log_warn("WARNING: failed to open configuration file '%s': %s", + lfn, pa_cstrerror(errno)); + } + pa_xfree(lfn); } Index: pulseaudio.spec =================================================================== RCS file: /cvs/extras/rpms/pulseaudio/devel/pulseaudio.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pulseaudio.spec 23 Oct 2006 09:07:38 -0000 1.2 +++ pulseaudio.spec 7 Feb 2007 16:44:27 -0000 1.3 @@ -3,7 +3,7 @@ Name: pulseaudio Summary: Improved Linux sound server Version: 0.9.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Daemons Source0: http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz @@ -24,12 +24,23 @@ #BuildRequires: xorg-x11-devel Patch1: pulseaudio-0.9.2-nochown.patch +Patch2: pulseaudio-0.9.5-userconf.patch %description PulseAudio is a sound server for Linux and other Unix like operating systems. It is intended to be an improved drop-in replacement for the Enlightened Sound Daemon (ESOUND). +%package esound-compat +Summary: PulseAudio EsounD daemon compatibility script +Group: System Environment/Daemons +Requires: %{name} = %{version}-%{release} +Conflicts: esound + +%description esound-compat +A compatibility script that allows applications to call /usr/bin/esd +and start PulseAudio with EsounD protocol modules. + %package module-lirc Summary: LIRC support for the PulseAudio sound server Group: System Environment/Daemons @@ -132,6 +143,7 @@ %prep %setup -q %patch1 -p1 +%patch2 -p2 %build %configure --disable-ltdl-install --disable-static --disable-rpath --with-system-user=pulse --with-system-group=pulse --with-realtime-group=pulse-rt --with-access-group=pulse-access @@ -146,6 +158,8 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a chmod 755 $RPM_BUILD_ROOT%{_bindir}/pulseaudio +ln -s esdcompat $RPM_BUILD_ROOT%{_bindir}/esd + %clean rm -rf $RPM_BUILD_ROOT @@ -183,7 +197,6 @@ %config(noreplace) %{_sysconfdir}/pulse/daemon.conf %config(noreplace) %{_sysconfdir}/pulse/default.pa %attr(4755,root,root) %{_bindir}/pulseaudio -%{_bindir}/esdcompat %{_libdir}/libpulsecore.so.* %dir %{_libdir}/pulse-%{drvver}/ %dir %{_libdir}/pulse-%{drvver}/modules/ @@ -247,6 +260,11 @@ %{_libdir}/pulse-%{drvver}/modules/module-tunnel-source.so %{_libdir}/pulse-%{drvver}/modules/module-volume-restore.so +%files esound-compat +%defattr(-,root,root) +%{_bindir}/esdcompat +%{_bindir}/esd + %files module-lirc %defattr(-,root,root) %{_libdir}/pulse-%{drvver}/modules/module-lirc.so @@ -317,6 +335,12 @@ %{_libdir}/libpulsedsp.so %changelog +* Mon Feb 5 2007 Pierre Ossman 0.9.5-3 +- Add esound-compat subpackage that allows PulseAudio to be a drop-in + replacement for esd (based on patch by Matthias Clasen). +- Backport patch allows startup to continue even when the users' + config cannot be read. + * Wed Oct 23 2006 Pierre Ossman 0.9.5-2 - Create user and groups for daemon. From fedora-extras-commits at redhat.com Wed Feb 7 17:04:49 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Wed, 7 Feb 2007 12:04:49 -0500 Subject: rpms/powerman/devel powerman-1.0.25-optflags.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 powerman.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200702071704.l17H4niE022197@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/powerman/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22173 Modified Files: .cvsignore powerman.spec sources Added Files: powerman-1.0.25-optflags.patch Log Message: New upstream release, powerman v1.0.25 powerman-1.0.25-optflags.patch: --- NEW FILE powerman-1.0.25-optflags.patch --- diff -urp powerman-1.0.25/Makefile powerman-1.0.25-optflags/Makefile --- powerman-1.0.25/Makefile 2006-08-16 17:22:55.000000000 -0400 +++ powerman-1.0.25-optflags/Makefile 2007-02-04 13:18:54.000000000 -0500 @@ -11,7 +11,7 @@ initrddir= /etc/rc.d/init.d VERSION = $(shell perl -ne 'print,exit if s/^\s*VERSION:\s*(\S*).*/\1/i' META) all clean: - (cd src && $(MAKE) $@ VERSION=$(VERSION)) + (cd src && $(MAKE) $@ VERSION=$(VERSION) EXTRA_CFLAGS="$(EXTRA_CFLAGS)") (cd test && $(MAKE) $@) install: all diff -urp powerman-1.0.25/src/Makefile powerman-1.0.25-optflags/src/Makefile --- powerman-1.0.25/src/Makefile 2006-08-16 17:22:55.000000000 -0400 +++ powerman-1.0.25-optflags/src/Makefile 2007-02-04 13:21:37.000000000 -0500 @@ -10,6 +10,8 @@ YACC= bison DEFS= -DHAVE_CONFIG_H -DPOWERMAN_VERSION=\"$(VERSION)\" CFLAGS= -g -Wall $(DEFS) +EXTRA_CFLAGS= +CFLAGS+= $(EXTRA_CFLAGS) #CFLAGS+= -pg LDADD= -lfl -lwrap -lnsl -lutil @@ -27,7 +29,7 @@ powermand: $(SERVER_OBJS) $(CC) $(CFLAGS) -o $@ $(SERVER_OBJS) $(LDADD) powerman: $(CLIENT_OBJS) - $(CC) -o $@ $(CLIENT_OBJS) $(LDADD) + $(CC) $(CFLAGS) -o $@ $(CLIENT_OBJS) $(LDADD) parse_lex.c: parse.lex $(LEX) -oparse_lex.c parse.lex Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/powerman/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Jun 2006 14:50:53 -0000 1.2 +++ .cvsignore 7 Feb 2007 17:04:16 -0000 1.3 @@ -1 +1,2 @@ powerman-1.0.24.tar.bz2 +powerman-1.0.25.tar.bz2 Index: powerman.spec =================================================================== RCS file: /cvs/extras/rpms/powerman/devel/powerman.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- powerman.spec 5 Sep 2006 14:49:28 -0000 1.3 +++ powerman.spec 7 Feb 2007 17:04:16 -0000 1.4 @@ -1,16 +1,21 @@ Name: powerman -Version: 1.0.24 -Release: 3%{?dist} +Version: 1.0.25 +Release: 1%{?dist} Summary: PowerMan - Power to the Cluster Group: Applications/System License: GPL Url: http://sourceforge.net/projects/powerman Source0: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2 -Source1: icebox4.dev +Patch1: powerman-1.0.25-optflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: tcp_wrappers flex bison +BuildRequires: flex bison +%if "%{?fedora}" <= "6" +BuildRequires: tcp_wrappers +%else +BuildRequires: tcp_wrappers-devel +%endif %description PowerMan is a tool for manipulating remote power control (RPC) devices from a @@ -19,10 +24,12 @@ %prep %setup -q +# Honor $RPM_OPT_FLAGS +%patch1 -p1 -b .optflags %build # parallel makes often fail -VERSION=%{version} CFLAGS="$RPM_OPT_FLAGS" make +make -e VERSION=%{version} EXTRA_CFLAGS="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT @@ -30,8 +37,6 @@ # work around a problem in the install make file target rm $RPM_BUILD_ROOT/%{_bindir}/pm pushd $RPM_BUILD_ROOT/%{_bindir};ln -s powerman pm; popd -# add Linux Networx IceBox v4 device file -install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/ # install a default config file cp examples/%{name}.conf-small \ $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf @@ -72,6 +77,10 @@ %{_initrddir}/%{name} %changelog +* Mon Feb 05 2007 Jarod Wilson 1.0.25-1 +- New upstream release +- Fixed up compile flags + * Tue Sep 05 2006 Jarod Wilson 1.0.24-3 - Rebuild for new glibc Index: sources =================================================================== RCS file: /cvs/extras/rpms/powerman/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Jun 2006 14:50:53 -0000 1.2 +++ sources 7 Feb 2007 17:04:16 -0000 1.3 @@ -1 +1 @@ -a903511e470cb3be005075ebc739048e powerman-1.0.24.tar.bz2 +22af8e73d79cb7810e3b0ae3b1c16564 powerman-1.0.25.tar.bz2 From fedora-extras-commits at redhat.com Wed Feb 7 17:07:19 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Wed, 7 Feb 2007 12:07:19 -0500 Subject: rpms/powerman/FC-6 powerman-1.0.25-optflags.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 powerman.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200702071707.l17H7JQK022287@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/powerman/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22263 Modified Files: .cvsignore powerman.spec sources Added Files: powerman-1.0.25-optflags.patch Log Message: New upstream release, powerman v1.0.25 powerman-1.0.25-optflags.patch: --- NEW FILE powerman-1.0.25-optflags.patch --- diff -urp powerman-1.0.25/Makefile powerman-1.0.25-optflags/Makefile --- powerman-1.0.25/Makefile 2006-08-16 17:22:55.000000000 -0400 +++ powerman-1.0.25-optflags/Makefile 2007-02-04 13:18:54.000000000 -0500 @@ -11,7 +11,7 @@ initrddir= /etc/rc.d/init.d VERSION = $(shell perl -ne 'print,exit if s/^\s*VERSION:\s*(\S*).*/\1/i' META) all clean: - (cd src && $(MAKE) $@ VERSION=$(VERSION)) + (cd src && $(MAKE) $@ VERSION=$(VERSION) EXTRA_CFLAGS="$(EXTRA_CFLAGS)") (cd test && $(MAKE) $@) install: all diff -urp powerman-1.0.25/src/Makefile powerman-1.0.25-optflags/src/Makefile --- powerman-1.0.25/src/Makefile 2006-08-16 17:22:55.000000000 -0400 +++ powerman-1.0.25-optflags/src/Makefile 2007-02-04 13:21:37.000000000 -0500 @@ -10,6 +10,8 @@ YACC= bison DEFS= -DHAVE_CONFIG_H -DPOWERMAN_VERSION=\"$(VERSION)\" CFLAGS= -g -Wall $(DEFS) +EXTRA_CFLAGS= +CFLAGS+= $(EXTRA_CFLAGS) #CFLAGS+= -pg LDADD= -lfl -lwrap -lnsl -lutil @@ -27,7 +29,7 @@ powermand: $(SERVER_OBJS) $(CC) $(CFLAGS) -o $@ $(SERVER_OBJS) $(LDADD) powerman: $(CLIENT_OBJS) - $(CC) -o $@ $(CLIENT_OBJS) $(LDADD) + $(CC) $(CFLAGS) -o $@ $(CLIENT_OBJS) $(LDADD) parse_lex.c: parse.lex $(LEX) -oparse_lex.c parse.lex Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/powerman/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Jun 2006 14:50:53 -0000 1.2 +++ .cvsignore 7 Feb 2007 17:06:47 -0000 1.3 @@ -1 +1,2 @@ powerman-1.0.24.tar.bz2 +powerman-1.0.25.tar.bz2 Index: powerman.spec =================================================================== RCS file: /cvs/extras/rpms/powerman/FC-6/powerman.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- powerman.spec 5 Sep 2006 14:49:28 -0000 1.3 +++ powerman.spec 7 Feb 2007 17:06:47 -0000 1.4 @@ -1,16 +1,21 @@ Name: powerman -Version: 1.0.24 -Release: 3%{?dist} +Version: 1.0.25 +Release: 1%{?dist} Summary: PowerMan - Power to the Cluster Group: Applications/System License: GPL Url: http://sourceforge.net/projects/powerman Source0: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2 -Source1: icebox4.dev +Patch1: powerman-1.0.25-optflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: tcp_wrappers flex bison +BuildRequires: flex bison +%if "%{?fedora}" <= "6" +BuildRequires: tcp_wrappers +%else +BuildRequires: tcp_wrappers-devel +%endif %description PowerMan is a tool for manipulating remote power control (RPC) devices from a @@ -19,10 +24,12 @@ %prep %setup -q +# Honor $RPM_OPT_FLAGS +%patch1 -p1 -b .optflags %build # parallel makes often fail -VERSION=%{version} CFLAGS="$RPM_OPT_FLAGS" make +make -e VERSION=%{version} EXTRA_CFLAGS="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT @@ -30,8 +37,6 @@ # work around a problem in the install make file target rm $RPM_BUILD_ROOT/%{_bindir}/pm pushd $RPM_BUILD_ROOT/%{_bindir};ln -s powerman pm; popd -# add Linux Networx IceBox v4 device file -install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/ # install a default config file cp examples/%{name}.conf-small \ $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf @@ -72,6 +77,10 @@ %{_initrddir}/%{name} %changelog +* Mon Feb 05 2007 Jarod Wilson 1.0.25-1 +- New upstream release +- Fixed up compile flags + * Tue Sep 05 2006 Jarod Wilson 1.0.24-3 - Rebuild for new glibc Index: sources =================================================================== RCS file: /cvs/extras/rpms/powerman/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Jun 2006 14:50:53 -0000 1.2 +++ sources 7 Feb 2007 17:06:47 -0000 1.3 @@ -1 +1 @@ -a903511e470cb3be005075ebc739048e powerman-1.0.24.tar.bz2 +22af8e73d79cb7810e3b0ae3b1c16564 powerman-1.0.25.tar.bz2 From fedora-extras-commits at redhat.com Wed Feb 7 17:13:14 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Wed, 7 Feb 2007 12:13:14 -0500 Subject: rpms/powerman/FC-6 powerman.spec,1.4,1.5 Message-ID: <200702071713.l17HDEWf022433@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/powerman/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22392 Modified Files: powerman.spec Log Message: Release bump to fix devel upgrade path Index: powerman.spec =================================================================== RCS file: /cvs/extras/rpms/powerman/FC-6/powerman.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- powerman.spec 7 Feb 2007 17:06:47 -0000 1.4 +++ powerman.spec 7 Feb 2007 17:12:41 -0000 1.5 @@ -1,6 +1,6 @@ Name: powerman Version: 1.0.25 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PowerMan - Power to the Cluster Group: Applications/System @@ -77,6 +77,9 @@ %{_initrddir}/%{name} %changelog +* Wed Feb 07 2007 Jarod Wilson 1.0.25-2 +- Release bump to fix devel upgrade path + * Mon Feb 05 2007 Jarod Wilson 1.0.25-1 - New upstream release - Fixed up compile flags From fedora-extras-commits at redhat.com Wed Feb 7 17:13:24 2007 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Wed, 7 Feb 2007 12:13:24 -0500 Subject: rpms/ufraw/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 ufraw.spec, 1.10, 1.11 Message-ID: <200702071713.l17HDOf2022438@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/ufraw/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22399 Modified Files: .cvsignore sources ufraw.spec Log Message: version 0.10 add BR: perl, exiv2-devel, gettext split standalone tools and GIMP plugin in Rawhide Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ufraw/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 28 Aug 2006 14:32:44 -0000 1.5 +++ .cvsignore 7 Feb 2007 17:12:51 -0000 1.6 @@ -1 +1 @@ -ufraw-0.9.1.tar.gz +ufraw-0.10.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/ufraw/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 28 Aug 2006 14:32:44 -0000 1.5 +++ sources 7 Feb 2007 17:12:51 -0000 1.6 @@ -1 +1 @@ -7388ed97a156ea6a7272513a1dc8f8d5 ufraw-0.9.1.tar.gz +12d9bfdb8ed22e28129a729847ba6664 ufraw-0.10.tar.gz Index: ufraw.spec =================================================================== RCS file: /cvs/extras/rpms/ufraw/devel/ufraw.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ufraw.spec 28 Aug 2006 15:49:40 -0000 1.10 +++ ufraw.spec 7 Feb 2007 17:12:51 -0000 1.11 @@ -1,9 +1,19 @@ %define gimptool gimptool-2.0 %define gimpplugindir %(%gimptool --gimpplugindir)/plug-ins -Summary: GIMP plugin to retrieve raw image data from digital cameras +%if 0%{?fedora}%{?redhat} == 0 || 0%{?fedora} > 6 || 0%{?redhat} > 5 +%define splitpackage 0%{!?_without_splitpackage:1} +%else +%define splitpackage 0%{?_with_splitpackage:1} +%endif + +%if %splitpackage +%define spkg 1 +%endif + +Summary: Tool to retrieve raw image data from digital cameras Name: ufraw -Version: 0.9.1 +Version: 0.10 Release: 1%{?dist} Group: Applications/Multimedia License: GPL @@ -13,40 +23,121 @@ BuildRequires: gimp >= 2.0 BuildRequires: gtk2-devel >= 2.6.0 BuildRequires: lcms-devel -BuildRequires: libexif-devel +BuildRequires: libexif-devel >= 0.6.13 +BuildRequires: exiv2-devel >= 0.10 BuildRequires: libtiff-devel BuildRequires: libjpeg-devel BuildRequires: pkgconfig +BuildRequires: perl +BuildRequires: gettext +Requires(post): GConf2 +Requires(preun): GConf2 +Requires(post): desktop-file-utils +Requires(postun): desktop-file-utils +Requires(post): shared-mime-info +Requires(postun): shared-mime-info BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n) +%if %splitpackage +Requires: ufraw-common = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: ufraw < 0.10 +Conflicts: ufraw < 0.10 +%endif %description -UFRaw is a GIMP plug-in for opening digital cameras raw format images. +UFRaw is a tool for opening raw format images of digital cameras. + +%if %splitpackage +%package common +Summary: Common files needed by UFRaw +Group: Applications/Multimedia +Obsoletes: ufraw < 0.10 +Conflicts: ufraw < 0.10 + +%description common +The ufraw-common files includes common files for UFRaw, e.g. language support. + +%package gimp +Summary: GIMP plugin to retrieve raw image data from digital cameras +Group: Applications/Multimedia +Requires: ufraw-common = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: ufraw < 0.10 +Conflicts: ufraw < 0.10 + +%description gimp +The ufraw-gimp package contains a GIMP plugin for opening raw format images of +digital cameras. +%endif %prep +cat << EOF + +Building UFRaw with these settings: +splitpackage: %splitpackage + +EOF %setup -q %build -%configure -make +%configure --with-exiv2 --with-libexif --enable-mime --enable-extras +make schemasdir=%{_sysconfdir}/gconf/schemas %install rm -rf %buildroot -make DESTDIR=%buildroot install +make DESTDIR=%buildroot schemasdir=%{_sysconfdir}/gconf/schemas install + +%find_lang %{name} %clean rm -rf %buildroot -%files -%defattr(-, root, root) +%post %{?spkg:common} +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` +gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/ufraw.schemas >& /dev/null +update-mime-database >& /dev/null || : +%if ! %splitpackage +%post +%endif +update-desktop-database >& /dev/null || : + +%preun %{?spkg:common} +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` +gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/ufraw.schemas >& /dev/null || : + +%postun %{?spkg:common} +update-mime-database >& /dev/null || : +%if ! %splitpackage +%postun +%endif +update-desktop-database >& /dev/null || : + +%files %{?spkg:common} -f %{name}.lang +%defattr(-, root, root, -) %doc COPYING README +%{_datadir}/mime/packages/ufraw-mime.xml +%{_sysconfdir}/gconf/schemas/ufraw.schemas + +%if %splitpackage +%files +%defattr(-, root, root, -) +%endif %_bindir/* %_datadir/pixmaps/* %_datadir/applications/*.desktop %_mandir/man1/* + +%if %splitpackage +%files gimp +%defattr(-, root, root, -) +%endif %dir %{gimpplugindir} %{gimpplugindir}/ufraw-gimp %changelog +* Wed Feb 07 2007 Nils Philippsen - 0.10-1 +- version 0.10 +- add BR: perl, exiv2-devel, gettext +- split standalone tools and GIMP plugin in Rawhide + * Mon Aug 28 2006 Nils Philippsen - 0.9.1-1 - version 0.9.1 - require gimp >= 2.0 for building From fedora-extras-commits at redhat.com Wed Feb 7 17:14:17 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Wed, 7 Feb 2007 12:14:17 -0500 Subject: rpms/powerman/FC-5 powerman-1.0.25-optflags.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 powerman.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200702071714.l17HEHxj022548@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/powerman/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22520 Modified Files: .cvsignore powerman.spec sources Added Files: powerman-1.0.25-optflags.patch Log Message: New upstream release, powerman v1.0.25 powerman-1.0.25-optflags.patch: --- NEW FILE powerman-1.0.25-optflags.patch --- diff -urp powerman-1.0.25/Makefile powerman-1.0.25-optflags/Makefile --- powerman-1.0.25/Makefile 2006-08-16 17:22:55.000000000 -0400 +++ powerman-1.0.25-optflags/Makefile 2007-02-04 13:18:54.000000000 -0500 @@ -11,7 +11,7 @@ initrddir= /etc/rc.d/init.d VERSION = $(shell perl -ne 'print,exit if s/^\s*VERSION:\s*(\S*).*/\1/i' META) all clean: - (cd src && $(MAKE) $@ VERSION=$(VERSION)) + (cd src && $(MAKE) $@ VERSION=$(VERSION) EXTRA_CFLAGS="$(EXTRA_CFLAGS)") (cd test && $(MAKE) $@) install: all diff -urp powerman-1.0.25/src/Makefile powerman-1.0.25-optflags/src/Makefile --- powerman-1.0.25/src/Makefile 2006-08-16 17:22:55.000000000 -0400 +++ powerman-1.0.25-optflags/src/Makefile 2007-02-04 13:21:37.000000000 -0500 @@ -10,6 +10,8 @@ YACC= bison DEFS= -DHAVE_CONFIG_H -DPOWERMAN_VERSION=\"$(VERSION)\" CFLAGS= -g -Wall $(DEFS) +EXTRA_CFLAGS= +CFLAGS+= $(EXTRA_CFLAGS) #CFLAGS+= -pg LDADD= -lfl -lwrap -lnsl -lutil @@ -27,7 +29,7 @@ powermand: $(SERVER_OBJS) $(CC) $(CFLAGS) -o $@ $(SERVER_OBJS) $(LDADD) powerman: $(CLIENT_OBJS) - $(CC) -o $@ $(CLIENT_OBJS) $(LDADD) + $(CC) $(CFLAGS) -o $@ $(CLIENT_OBJS) $(LDADD) parse_lex.c: parse.lex $(LEX) -oparse_lex.c parse.lex Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/powerman/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Jun 2006 14:50:53 -0000 1.2 +++ .cvsignore 7 Feb 2007 17:13:45 -0000 1.3 @@ -1 +1,2 @@ powerman-1.0.24.tar.bz2 +powerman-1.0.25.tar.bz2 Index: powerman.spec =================================================================== RCS file: /cvs/extras/rpms/powerman/FC-5/powerman.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- powerman.spec 24 Jul 2006 17:25:02 -0000 1.2 +++ powerman.spec 7 Feb 2007 17:13:45 -0000 1.3 @@ -1,16 +1,21 @@ Name: powerman -Version: 1.0.24 -Release: 2%{?dist} +Version: 1.0.25 +Release: 1%{?dist} Summary: PowerMan - Power to the Cluster Group: Applications/System License: GPL Url: http://sourceforge.net/projects/powerman Source0: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2 -Source1: icebox4.dev +Patch1: powerman-1.0.25-optflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: tcp_wrappers flex bison +BuildRequires: flex bison +%if "%{?fedora}" <= "6" +BuildRequires: tcp_wrappers +%else +BuildRequires: tcp_wrappers-devel +%endif %description PowerMan is a tool for manipulating remote power control (RPC) devices from a @@ -19,10 +24,12 @@ %prep %setup -q +# Honor $RPM_OPT_FLAGS +%patch1 -p1 -b .optflags %build # parallel makes often fail -VERSION=%{version} CFLAGS="$RPM_OPT_FLAGS" make +make -e VERSION=%{version} EXTRA_CFLAGS="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT @@ -30,8 +37,6 @@ # work around a problem in the install make file target rm $RPM_BUILD_ROOT/%{_bindir}/pm pushd $RPM_BUILD_ROOT/%{_bindir};ln -s powerman pm; popd -# add Linux Networx IceBox v4 device file -install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/ # install a default config file cp examples/%{name}.conf-small \ $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf @@ -72,6 +77,13 @@ %{_initrddir}/%{name} %changelog +* Mon Feb 05 2007 Jarod Wilson 1.0.25-1 +- New upstream release +- Fixed up compile flags + +* Tue Sep 05 2006 Jarod Wilson 1.0.24-3 +- Rebuild for new glibc + * Mon Jul 24 2006 Jarod Wilson 1.0.24-2 - Update BuildRequires for updated (minimal-er) mock buildroots Index: sources =================================================================== RCS file: /cvs/extras/rpms/powerman/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Jun 2006 14:50:53 -0000 1.2 +++ sources 7 Feb 2007 17:13:45 -0000 1.3 @@ -1 +1 @@ -a903511e470cb3be005075ebc739048e powerman-1.0.24.tar.bz2 +22af8e73d79cb7810e3b0ae3b1c16564 powerman-1.0.25.tar.bz2 From fedora-extras-commits at redhat.com Wed Feb 7 17:16:02 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Wed, 7 Feb 2007 12:16:02 -0500 Subject: rpms/powerman/devel powerman.spec,1.4,1.5 Message-ID: <200702071716.l17HG24Z022634@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/powerman/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22613 Modified Files: powerman.spec Log Message: Release bump to fix devel upgrade path Index: powerman.spec =================================================================== RCS file: /cvs/extras/rpms/powerman/devel/powerman.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- powerman.spec 7 Feb 2007 17:04:16 -0000 1.4 +++ powerman.spec 7 Feb 2007 17:15:30 -0000 1.5 @@ -1,6 +1,6 @@ Name: powerman Version: 1.0.25 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PowerMan - Power to the Cluster Group: Applications/System @@ -77,6 +77,9 @@ %{_initrddir}/%{name} %changelog +* Wed Feb 07 2007 Jarod Wilson 1.0.25-2 +- Release bump to fix devel upgrade path + * Mon Feb 05 2007 Jarod Wilson 1.0.25-1 - New upstream release - Fixed up compile flags From fedora-extras-commits at redhat.com Wed Feb 7 17:56:26 2007 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Wed, 7 Feb 2007 12:56:26 -0500 Subject: rpms/bonnie++/devel bonnie++.spec,1.10,1.11 Message-ID: <200702071756.l17HuQfP023058@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/bonnie++/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23034 Modified Files: bonnie++.spec Log Message: Testing commit Index: bonnie++.spec =================================================================== RCS file: /cvs/extras/rpms/bonnie++/devel/bonnie++.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- bonnie++.spec 14 Sep 2006 15:17:41 -0000 1.10 +++ bonnie++.spec 7 Feb 2007 17:55:53 -0000 1.11 @@ -22,7 +22,6 @@ Do not leave bonnie++ installed on a production system. Use only while you test servers. - %prep %setup -q -n bonnie++-1.03a %patch -p0 From fedora-extras-commits at redhat.com Wed Feb 7 18:00:55 2007 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Wed, 7 Feb 2007 13:00:55 -0500 Subject: rpms/bonnie++ pkg.acl,NONE,1.1 Message-ID: <200702071800.l17I0tDW023095@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/bonnie++ In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23087 Added Files: pkg.acl Log Message: add pkg.acl for testing purposes --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Wed Feb 7 18:04:37 2007 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Wed, 7 Feb 2007 13:04:37 -0500 Subject: rpms/bonnie++/devel bonnie++.spec,1.11,1.12 Message-ID: <200702071804.l17I4bFY026497@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/bonnie++/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26477 Modified Files: bonnie++.spec Log Message: Reverting Index: bonnie++.spec =================================================================== RCS file: /cvs/extras/rpms/bonnie++/devel/bonnie++.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- bonnie++.spec 7 Feb 2007 17:55:53 -0000 1.11 +++ bonnie++.spec 7 Feb 2007 18:04:05 -0000 1.12 @@ -22,6 +22,7 @@ Do not leave bonnie++ installed on a production system. Use only while you test servers. + %prep %setup -q -n bonnie++-1.03a %patch -p0 From fedora-extras-commits at redhat.com Wed Feb 7 18:09:24 2007 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Wed, 7 Feb 2007 13:09:24 -0500 Subject: rpms/bonnie++/devel bonnie++.spec,1.12,1.13 Message-ID: <200702071809.l17I9OEZ026572@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/bonnie++/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26551 Modified Files: bonnie++.spec Log Message: Testing again Index: bonnie++.spec =================================================================== RCS file: /cvs/extras/rpms/bonnie++/devel/bonnie++.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- bonnie++.spec 7 Feb 2007 18:04:05 -0000 1.12 +++ bonnie++.spec 7 Feb 2007 18:08:52 -0000 1.13 @@ -22,7 +22,6 @@ Do not leave bonnie++ installed on a production system. Use only while you test servers. - %prep %setup -q -n bonnie++-1.03a %patch -p0 From fedora-extras-commits at redhat.com Wed Feb 7 18:28:20 2007 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 7 Feb 2007 13:28:20 -0500 Subject: rpms/amarok/FC-5 .cvsignore, 1.28, 1.29 amarok.spec, 1.64, 1.65 sources, 1.28, 1.29 Message-ID: <200702071828.l17ISKCM026742@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26704/FC-5 Modified Files: .cvsignore amarok.spec sources Log Message: update in FC-6 and FC-5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-5/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 31 Oct 2006 11:01:33 -0000 1.28 +++ .cvsignore 7 Feb 2007 18:27:48 -0000 1.29 @@ -1 +1 @@ -amarok-1.4.4.tar.bz2 +amarok-1.4.5.tar.bz2 Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-5/amarok.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- amarok.spec 1 Nov 2006 16:28:46 -0000 1.64 +++ amarok.spec 7 Feb 2007 18:27:48 -0000 1.65 @@ -3,7 +3,7 @@ Name: amarok Summary: Media player for KDE -Version: 1.4.4 +Version: 1.4.5 Release: 1%{?dist} Group: Applications/Multimedia @@ -37,7 +37,7 @@ ## Gstreamer engine #BuildRequires: gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel # Helix engine on archs where it is available -%ifnarch ppc64 x86_64 s390 s390x ia64 +%ifnarch ppc64 x86_64 s390 s390x ia64 sparc sparc64 BuildRequires: HelixPlayer %endif @@ -85,8 +85,6 @@ %build unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh -# work around an improper ${kdelibsuff} -export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include %configure \ --disable-debug \ --disable-rpath \ @@ -96,7 +94,7 @@ --with-ifp \ --with-libgpod \ --without-mp4v2 \ -%ifnarch ppc64 x86_64 s390 s390x ia64 +%ifnarch ppc64 x86_64 s390 s390x ia64 sparc sparc64 --with-helix=%{_libdir}/helix \ %endif # --enable-final \ @@ -119,8 +117,6 @@ desktop-file-install --vendor "" \ --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \ --delete-original \ - --add-category Application \ - --add-category X-Fedora \ $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop #rm -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/amarokapp.desktop @@ -222,7 +218,7 @@ #%{_datadir}/services/amarok_gst10engine_plugin.desktop #%{_libdir}/kde3/libamarok_gst10engine_plugin.* # Helix engine -%ifnarch ppc64 x86_64 s390 s390x ia64 +%ifnarch ppc64 x86_64 s390 s390x ia64 sparc sparc64 %{_libdir}/kde3/libamarok_helixengine_plugin.* %{_datadir}/services/amarok_helixengine_plugin.desktop %endif @@ -233,11 +229,33 @@ %files visualisation %defattr(-,root,root) %{_bindir}/amarok_libvisual -%{_bindir}/amarok_xmmswrapper2 %changelog +* Sat Feb 03 2007 Aurelien Bompard 1.4.5-1 +- version 1.4.5 +- drop patch0 and patch1 (merged upstream) + +* Thu Jan 25 2007 Aurelien Bompard 1.4.4-7 +- add patch to enable building with libgpod >= 0.4.2, thanks go to Todd Zullinger + +* Wed Jan 17 2007 Aurelien Bompard 1.4.4-6 +- rebuild for new libgpod + +* Thu Jan 11 2007 Aurelien Bompard 1.4.4-5 +- HelixPlayer is not available on Sparc, exclude it from this arch too + (#221058) + +* Tue Dec 19 2006 Aurelien Bompard 1.4.4-4 +- add patch to make lastfm work with xine-lib 1.1.3 (sent by upstream) + +* Sat Dec 09 2006 Aurelien Bompard 1.4.4-3 +- rebuild + +* Wed Dec 06 2006 Aurelien Bompard 1.4.4-2 +- rebuild + * Fri Oct 27 2006 Aurelien Bompard 1.4.4-1 - version 1.4.4 - enable xine support since xine is now in Fedora Index: sources =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-5/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 31 Oct 2006 11:01:33 -0000 1.28 +++ sources 7 Feb 2007 18:27:48 -0000 1.29 @@ -1 +1 @@ -56a9aec42088c338b81252f8e0651781 amarok-1.4.4.tar.bz2 +1dac1cb5ac9c9cdabdab5f69b39e92c8 amarok-1.4.5.tar.bz2 From fedora-extras-commits at redhat.com Wed Feb 7 18:28:22 2007 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 7 Feb 2007 13:28:22 -0500 Subject: rpms/amarok/FC-6 .cvsignore, 1.28, 1.29 amarok.spec, 1.70, 1.71 sources, 1.28, 1.29 Message-ID: <200702071828.l17ISMB8026747@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26704/FC-6 Modified Files: .cvsignore amarok.spec sources Log Message: update in FC-6 and FC-5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-6/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 31 Oct 2006 11:01:42 -0000 1.28 +++ .cvsignore 7 Feb 2007 18:27:50 -0000 1.29 @@ -1 +1 @@ -amarok-1.4.4.tar.bz2 +amarok-1.4.5.tar.bz2 Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-6/amarok.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- amarok.spec 25 Jan 2007 19:12:29 -0000 1.70 +++ amarok.spec 7 Feb 2007 18:27:50 -0000 1.71 @@ -3,16 +3,14 @@ Name: amarok Summary: Media player for KDE -Version: 1.4.4 -Release: 7%{?dist} +Version: 1.4.5 +Release: 1%{?dist} Group: Applications/Multimedia License: GPL Url: http://amarok.kde.org # http://download.kde.org/download.php?url=stable/amarok/1.4.3/src Source0: http://mirrors.isc.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2 -Patch0: amarok-1.4.4-lastfm+xine-lib-1.1.3.patch -Patch1: amarok-1.4.4-libgpod-0.4.2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdemultimedia-devel >= 6:3.2 @@ -82,15 +80,11 @@ %prep %setup -q -%patch0 -p1 -b .lastfm -%patch1 -p1 -b .libgpod %build unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh -# work around an improper ${kdelibsuff} -export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include %configure \ --disable-debug \ --disable-rpath \ @@ -123,8 +117,6 @@ desktop-file-install --vendor "" \ --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \ --delete-original \ - --add-category Application \ - --add-category X-Fedora \ $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop #rm -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/amarokapp.desktop @@ -237,11 +229,14 @@ %files visualisation %defattr(-,root,root) %{_bindir}/amarok_libvisual -%{_bindir}/amarok_xmmswrapper2 %changelog +* Sat Feb 03 2007 Aurelien Bompard 1.4.5-1 +- version 1.4.5 +- drop patch0 and patch1 (merged upstream) + * Thu Jan 25 2007 Aurelien Bompard 1.4.4-7 - add patch to enable building with libgpod >= 0.4.2, thanks go to Todd Zullinger Index: sources =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-6/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 31 Oct 2006 11:01:42 -0000 1.28 +++ sources 7 Feb 2007 18:27:50 -0000 1.29 @@ -1 +1 @@ -56a9aec42088c338b81252f8e0651781 amarok-1.4.4.tar.bz2 +1dac1cb5ac9c9cdabdab5f69b39e92c8 amarok-1.4.5.tar.bz2 From fedora-extras-commits at redhat.com Wed Feb 7 18:37:23 2007 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Wed, 7 Feb 2007 13:37:23 -0500 Subject: rpms/bonnie++ pkg.acl,1.1,NONE Message-ID: <200702071837.l17IbNDv026967@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/bonnie++ In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26960 Removed Files: pkg.acl Log Message: remove pgk.acl, it was only a test --- pkg.acl DELETED --- From fedora-extras-commits at redhat.com Wed Feb 7 19:09:57 2007 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Wed, 7 Feb 2007 14:09:57 -0500 Subject: rpms/sage/devel .cvsignore, 1.2, 1.3 sage.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200702071909.l17J9vjK030531@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/sage/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30510 Modified Files: .cvsignore sage.spec sources Log Message: Update to 0.2.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sage/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Jul 2006 19:29:34 -0000 1.2 +++ .cvsignore 7 Feb 2007 19:09:25 -0000 1.3 @@ -1 +1 @@ -sage-0.1.2.tar.gz +sage-0.2.0.tar.gz Index: sage.spec =================================================================== RCS file: /cvs/extras/rpms/sage/devel/sage.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sage.spec 28 Aug 2006 16:10:17 -0000 1.3 +++ sage.spec 7 Feb 2007 19:09:25 -0000 1.4 @@ -1,6 +1,6 @@ Name: sage -Version: 0.1.2 -Release: 5%{?dist} +Version: 0.2.0 +Release: 1%{?dist} Summary: OpenGL extensions library using SDL Group: Development/Libraries @@ -76,6 +76,9 @@ %changelog +* Thu Dec 14 2006 Wart 0.2.0-1 +- Update to 0.2.0 + * Mon Aug 28 2006 Wart 0.1.2-5 - Rebuild for Fedora Extras Index: sources =================================================================== RCS file: /cvs/extras/rpms/sage/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Jul 2006 19:29:34 -0000 1.2 +++ sources 7 Feb 2007 19:09:25 -0000 1.3 @@ -1 +1 @@ -4eea72b30a88dbe5d512009913462fc3 sage-0.1.2.tar.gz +fbeb372c8096ea9cbdeb5152900bb313 sage-0.2.0.tar.gz From fedora-extras-commits at redhat.com Wed Feb 7 19:16:41 2007 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Wed, 7 Feb 2007 14:16:41 -0500 Subject: rpms/sage/devel sage.spec,1.4,1.5 Message-ID: <200702071916.l17JGf9s030690@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/sage/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30637 Modified Files: sage.spec Log Message: Fix timestamp in changelog Index: sage.spec =================================================================== RCS file: /cvs/extras/rpms/sage/devel/sage.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sage.spec 7 Feb 2007 19:09:25 -0000 1.4 +++ sage.spec 7 Feb 2007 19:16:09 -0000 1.5 @@ -76,7 +76,7 @@ %changelog -* Thu Dec 14 2006 Wart 0.2.0-1 +* Wed Feb 7 2007 Wart 0.2.0-1 - Update to 0.2.0 * Mon Aug 28 2006 Wart 0.1.2-5 From fedora-extras-commits at redhat.com Wed Feb 7 19:30:13 2007 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Wed, 7 Feb 2007 14:30:13 -0500 Subject: rpms/sage/FC-6 .cvsignore, 1.2, 1.3 sage.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200702071930.l17JUDQb031587@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/sage/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31502 Modified Files: .cvsignore sage.spec sources Log Message: Update to 0.2.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sage/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Jul 2006 19:29:34 -0000 1.2 +++ .cvsignore 7 Feb 2007 19:29:41 -0000 1.3 @@ -1 +1 @@ -sage-0.1.2.tar.gz +sage-0.2.0.tar.gz Index: sage.spec =================================================================== RCS file: /cvs/extras/rpms/sage/FC-6/sage.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sage.spec 28 Aug 2006 16:10:17 -0000 1.3 +++ sage.spec 7 Feb 2007 19:29:41 -0000 1.4 @@ -1,6 +1,6 @@ Name: sage -Version: 0.1.2 -Release: 5%{?dist} +Version: 0.2.0 +Release: 1%{?dist} Summary: OpenGL extensions library using SDL Group: Development/Libraries @@ -76,6 +76,9 @@ %changelog +* Wed Feb 7 2007 Wart 0.2.0-1 +- Update to 0.2.0 + * Mon Aug 28 2006 Wart 0.1.2-5 - Rebuild for Fedora Extras Index: sources =================================================================== RCS file: /cvs/extras/rpms/sage/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Jul 2006 19:29:34 -0000 1.2 +++ sources 7 Feb 2007 19:29:41 -0000 1.3 @@ -1 +1 @@ -4eea72b30a88dbe5d512009913462fc3 sage-0.1.2.tar.gz +fbeb372c8096ea9cbdeb5152900bb313 sage-0.2.0.tar.gz From fedora-extras-commits at redhat.com Wed Feb 7 19:56:51 2007 From: fedora-extras-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 7 Feb 2007 14:56:51 -0500 Subject: rpms/perl-Mozilla-LDAP/devel perl-Mozilla-LDAP.spec,1.1,1.2 Message-ID: <200702071956.l17Jupkj031939@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/extras/rpms/perl-Mozilla-LDAP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31917 Modified Files: perl-Mozilla-LDAP.spec Log Message: remove only perl(Mozilla::LDAP::Entry) from Provides, leave in perl(Mozilla::LDAP::Entry) = 1.5 Index: perl-Mozilla-LDAP.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Mozilla-LDAP/devel/perl-Mozilla-LDAP.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Mozilla-LDAP.spec 10 Jan 2007 23:33:01 -0000 1.1 +++ perl-Mozilla-LDAP.spec 7 Feb 2007 19:56:18 -0000 1.2 @@ -5,7 +5,7 @@ Summary: LDAP Perl module that wraps the Mozilla C SDK Name: perl-Mozilla-LDAP Version: 1.5 -Release: 8%{?dist} +Release: 9%{?dist} License: MPL Group: Development/Libraries URL: http://www.mozilla.org/directory/perldap.html @@ -27,7 +27,7 @@ cat << \EOF > %{name}-prov #!/bin/sh %{__perl_provides} $* |\ - sed -e '/perl(Mozilla::LDAP::Entry)/d' + sed -e '/perl(Mozilla::LDAP::Entry)$/d' EOF %define __perl_provides %{_builddir}/perl-mozldap-%{version}/%{name}-prov @@ -86,6 +86,10 @@ %doc CREDITS ChangeLog README MPL-1.1.txt %changelog +* Wed Jan 10 2007 Rich Megginson - 1.5-9 +- remove only perl(Mozilla::LDAP::Entry) from Provides, leave in +- perl(Mozilla::LDAP::Entry) = 1.5 + * Wed Jan 10 2007 Rich Megginson - 1.5-8 - add perl_requires filter for the Entry module - add the MPL-1.1.txt file to the DOCs From fedora-extras-commits at redhat.com Wed Feb 7 19:58:26 2007 From: fedora-extras-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 7 Feb 2007 14:58:26 -0500 Subject: rpms/perl-Mozilla-LDAP/FC-6 perl-Mozilla-LDAP.spec,1.1,1.2 Message-ID: <200702071958.l17JwQ8q032015@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/extras/rpms/perl-Mozilla-LDAP/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31960 Modified Files: perl-Mozilla-LDAP.spec Log Message: remove only perl(Mozilla::LDAP::Entry) from Provides, leave in perl(Mozilla::LDAP::Entry) = 1.5 Index: perl-Mozilla-LDAP.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Mozilla-LDAP/FC-6/perl-Mozilla-LDAP.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Mozilla-LDAP.spec 10 Jan 2007 23:33:01 -0000 1.1 +++ perl-Mozilla-LDAP.spec 7 Feb 2007 19:57:53 -0000 1.2 @@ -5,7 +5,7 @@ Summary: LDAP Perl module that wraps the Mozilla C SDK Name: perl-Mozilla-LDAP Version: 1.5 -Release: 8%{?dist} +Release: 9%{?dist} License: MPL Group: Development/Libraries URL: http://www.mozilla.org/directory/perldap.html @@ -27,7 +27,7 @@ cat << \EOF > %{name}-prov #!/bin/sh %{__perl_provides} $* |\ - sed -e '/perl(Mozilla::LDAP::Entry)/d' + sed -e '/perl(Mozilla::LDAP::Entry)$/d' EOF %define __perl_provides %{_builddir}/perl-mozldap-%{version}/%{name}-prov @@ -86,6 +86,10 @@ %doc CREDITS ChangeLog README MPL-1.1.txt %changelog +* Wed Jan 10 2007 Rich Megginson - 1.5-9 +- remove only perl(Mozilla::LDAP::Entry) from Provides, leave in +- perl(Mozilla::LDAP::Entry) = 1.5 + * Wed Jan 10 2007 Rich Megginson - 1.5-8 - add perl_requires filter for the Entry module - add the MPL-1.1.txt file to the DOCs From fedora-extras-commits at redhat.com Wed Feb 7 19:59:37 2007 From: fedora-extras-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 7 Feb 2007 14:59:37 -0500 Subject: rpms/perl-Mozilla-LDAP/FC-5 perl-Mozilla-LDAP.spec,1.1,1.2 Message-ID: <200702071959.l17JxbnH032098@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/extras/rpms/perl-Mozilla-LDAP/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32073 Modified Files: perl-Mozilla-LDAP.spec Log Message: remove only perl(Mozilla::LDAP::Entry) from Provides, leave in perl(Mozilla::LDAP::Entry) = 1.5 Index: perl-Mozilla-LDAP.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Mozilla-LDAP/FC-5/perl-Mozilla-LDAP.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Mozilla-LDAP.spec 10 Jan 2007 23:33:01 -0000 1.1 +++ perl-Mozilla-LDAP.spec 7 Feb 2007 19:59:04 -0000 1.2 @@ -5,7 +5,7 @@ Summary: LDAP Perl module that wraps the Mozilla C SDK Name: perl-Mozilla-LDAP Version: 1.5 -Release: 8%{?dist} +Release: 9%{?dist} License: MPL Group: Development/Libraries URL: http://www.mozilla.org/directory/perldap.html @@ -27,7 +27,7 @@ cat << \EOF > %{name}-prov #!/bin/sh %{__perl_provides} $* |\ - sed -e '/perl(Mozilla::LDAP::Entry)/d' + sed -e '/perl(Mozilla::LDAP::Entry)$/d' EOF %define __perl_provides %{_builddir}/perl-mozldap-%{version}/%{name}-prov @@ -86,6 +86,10 @@ %doc CREDITS ChangeLog README MPL-1.1.txt %changelog +* Wed Jan 10 2007 Rich Megginson - 1.5-9 +- remove only perl(Mozilla::LDAP::Entry) from Provides, leave in +- perl(Mozilla::LDAP::Entry) = 1.5 + * Wed Jan 10 2007 Rich Megginson - 1.5-8 - add perl_requires filter for the Entry module - add the MPL-1.1.txt file to the DOCs From fedora-extras-commits at redhat.com Wed Feb 7 20:03:00 2007 From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat)) Date: Wed, 7 Feb 2007 15:03:00 -0500 Subject: rpms/ktorrent/devel ktorrent.spec,1.22,1.23 Message-ID: <200702072003.l17K301e003076@cvs-int.fedora.redhat.com> Author: liquidat Update of /cvs/extras/rpms/ktorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3056 Modified Files: ktorrent.spec Log Message: Fixed plugins bug. Index: ktorrent.spec =================================================================== RCS file: /cvs/extras/rpms/ktorrent/devel/ktorrent.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- ktorrent.spec 5 Feb 2007 23:48:00 -0000 1.22 +++ ktorrent.spec 7 Feb 2007 20:02:28 -0000 1.23 @@ -2,7 +2,7 @@ Name: ktorrent Version: 2.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A BitTorrent program for KDE Group: Applications/Internet License: GPL @@ -24,6 +24,7 @@ %setup -q %build +make -f admin/Makefile.common %configure --disable-rpath make %{?_smp_mflags} @@ -66,7 +67,6 @@ %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README TODO %exclude %{_libdir}/lib*.la -%exclude %{_libdir}/kde3/kt*.la %{_bindir}/ktcachecheck %{_bindir}/ktorrent %{_bindir}/kttorinfo @@ -75,16 +75,27 @@ %{_libdir}/libktorrent.so %{_libdir}/libktorrent-2.1.so %{_libdir}/kde3/ktinfowidgetplugin.so +%{_libdir}/kde3/ktinfowidgetplugin.la %{_libdir}/kde3/ktipfilterplugin.so +%{_libdir}/kde3/ktipfilterplugin.la %{_libdir}/kde3/ktlogviewerplugin.so +%{_libdir}/kde3/ktlogviewerplugin.la %{_libdir}/kde3/ktpartfileimportplugin.so +%{_libdir}/kde3/ktpartfileimportplugin.la %{_libdir}/kde3/ktrssfeedplugin.so +%{_libdir}/kde3/ktrssfeedplugin.la %{_libdir}/kde3/ktscanfolderplugin.so +%{_libdir}/kde3/ktscanfolderplugin.la %{_libdir}/kde3/ktschedulerplugin.so +%{_libdir}/kde3/ktschedulerplugin.la %{_libdir}/kde3/ktsearchplugin.so +%{_libdir}/kde3/ktsearchplugin.la %{_libdir}/kde3/ktupnpplugin.so +%{_libdir}/kde3/ktupnpplugin.la %{_libdir}/kde3/ktwebinterfaceplugin.so +%{_libdir}/kde3/ktwebinterfaceplugin.la %{_libdir}/kde3/ktzeroconfplugin.so +%{_libdir}/kde3/ktzeroconfplugin.la %{_datadir}/applications/kde/ktorrent.desktop %{_datadir}/apps/ktorrent %{_datadir}/config.kcfg/ktlogviewerplugin.kcfg @@ -125,6 +136,9 @@ %{_datadir}/services/ktzeroconfplugin.desktop %changelog +* Wed Feb 07 2007 Roland Wolters 2.1-5 +- fixed plugins bug + * Tue Feb 06 2007 Roland Wolters 2.1-4 - added avahi-devel dependecy From fedora-extras-commits at redhat.com Wed Feb 7 20:18:01 2007 From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat)) Date: Wed, 7 Feb 2007 15:18:01 -0500 Subject: rpms/ktorrent/devel ktorrent.spec,1.23,1.24 Message-ID: <200702072018.l17KI1FF003261@cvs-int.fedora.redhat.com> Author: liquidat Update of /cvs/extras/rpms/ktorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3240 Modified Files: ktorrent.spec Log Message: Fixed autoconf dependency. Index: ktorrent.spec =================================================================== RCS file: /cvs/extras/rpms/ktorrent/devel/ktorrent.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- ktorrent.spec 7 Feb 2007 20:02:28 -0000 1.23 +++ ktorrent.spec 7 Feb 2007 20:17:29 -0000 1.24 @@ -2,7 +2,7 @@ Name: ktorrent Version: 2.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A BitTorrent program for KDE Group: Applications/Internet License: GPL @@ -10,7 +10,7 @@ Source0: http://ktorrent.org/downloads/2.1/ktorrent-2.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: qt-devel kdelibs-devel desktop-file-utils gettext gmp-devel avahi-devel +BuildRequires: qt-devel kdelibs-devel desktop-file-utils gettext gmp-devel avahi-devel autoconf Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -136,8 +136,9 @@ %{_datadir}/services/ktzeroconfplugin.desktop %changelog -* Wed Feb 07 2007 Roland Wolters 2.1-5 +* Wed Feb 07 2007 Roland Wolters 2.1-6 - fixed plugins bug +- fixed configure warnings * Tue Feb 06 2007 Roland Wolters 2.1-4 - added avahi-devel dependecy From fedora-extras-commits at redhat.com Wed Feb 7 20:56:06 2007 From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat)) Date: Wed, 7 Feb 2007 15:56:06 -0500 Subject: rpms/ktorrent/devel ktorrent.spec,1.24,1.25 Message-ID: <200702072056.l17Ku6ng003850@cvs-int.fedora.redhat.com> Author: liquidat Update of /cvs/extras/rpms/ktorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3826 Modified Files: ktorrent.spec Log Message: spec file adjustments Index: ktorrent.spec =================================================================== RCS file: /cvs/extras/rpms/ktorrent/devel/ktorrent.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- ktorrent.spec 7 Feb 2007 20:17:29 -0000 1.24 +++ ktorrent.spec 7 Feb 2007 20:55:34 -0000 1.25 @@ -2,7 +2,7 @@ Name: ktorrent Version: 2.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A BitTorrent program for KDE Group: Applications/Internet License: GPL @@ -10,10 +10,7 @@ Source0: http://ktorrent.org/downloads/2.1/ktorrent-2.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: qt-devel kdelibs-devel desktop-file-utils gettext gmp-devel avahi-devel autoconf - -Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils +BuildRequires: qt-devel kdelibs-devel gettext gmp-devel avahi-devel automake desktop-file-utils %description KTorrent is a BitTorrent program for KDE. Its main features are native KDE @@ -22,9 +19,9 @@ %prep %setup -q +make -f admin/Makefile.common %build -make -f admin/Makefile.common %configure --disable-rpath make %{?_smp_mflags} @@ -136,6 +133,9 @@ %{_datadir}/services/ktzeroconfplugin.desktop %changelog +* Wed Feb 07 2007 Roland Wolters 2.1-7 +- spec-file adjustments + * Wed Feb 07 2007 Roland Wolters 2.1-6 - fixed plugins bug - fixed configure warnings From fedora-extras-commits at redhat.com Wed Feb 7 21:18:28 2007 From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat)) Date: Wed, 7 Feb 2007 16:18:28 -0500 Subject: rpms/ktorrent/FC-6 ktorrent.spec,1.19,1.20 Message-ID: <200702072118.l17LISaq007382@cvs-int.fedora.redhat.com> Author: liquidat Update of /cvs/extras/rpms/ktorrent/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7358 Modified Files: ktorrent.spec Log Message: Plugin-Bug, spec-file-adjustments. Index: ktorrent.spec =================================================================== RCS file: /cvs/extras/rpms/ktorrent/FC-6/ktorrent.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- ktorrent.spec 5 Feb 2007 23:44:44 -0000 1.19 +++ ktorrent.spec 7 Feb 2007 21:17:55 -0000 1.20 @@ -2,7 +2,7 @@ Name: ktorrent Version: 2.1 -Release: 4%{?dist} +Release: 7%{?dist} Summary: A BitTorrent program for KDE Group: Applications/Internet License: GPL @@ -10,10 +10,7 @@ Source0: http://ktorrent.org/downloads/2.1/ktorrent-2.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: qt-devel kdelibs-devel desktop-file-utils gettext gmp-devel avahi-devel - -Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils +BuildRequires: qt-devel kdelibs-devel gettext gmp-devel avahi-devel automake desktop-file-utils %description KTorrent is a BitTorrent program for KDE. Its main features are native KDE @@ -22,6 +19,7 @@ %prep %setup -q +make -f admin/Makefile.common %build %configure --disable-rpath @@ -66,7 +64,6 @@ %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README TODO %exclude %{_libdir}/lib*.la -%exclude %{_libdir}/kde3/kt*.la %{_bindir}/ktcachecheck %{_bindir}/ktorrent %{_bindir}/kttorinfo @@ -75,16 +72,27 @@ %{_libdir}/libktorrent.so %{_libdir}/libktorrent-2.1.so %{_libdir}/kde3/ktinfowidgetplugin.so +%{_libdir}/kde3/ktinfowidgetplugin.la %{_libdir}/kde3/ktipfilterplugin.so +%{_libdir}/kde3/ktipfilterplugin.la %{_libdir}/kde3/ktlogviewerplugin.so +%{_libdir}/kde3/ktlogviewerplugin.la %{_libdir}/kde3/ktpartfileimportplugin.so +%{_libdir}/kde3/ktpartfileimportplugin.la %{_libdir}/kde3/ktrssfeedplugin.so +%{_libdir}/kde3/ktrssfeedplugin.la %{_libdir}/kde3/ktscanfolderplugin.so +%{_libdir}/kde3/ktscanfolderplugin.la %{_libdir}/kde3/ktschedulerplugin.so +%{_libdir}/kde3/ktschedulerplugin.la %{_libdir}/kde3/ktsearchplugin.so +%{_libdir}/kde3/ktsearchplugin.la %{_libdir}/kde3/ktupnpplugin.so +%{_libdir}/kde3/ktupnpplugin.la %{_libdir}/kde3/ktwebinterfaceplugin.so +%{_libdir}/kde3/ktwebinterfaceplugin.la %{_libdir}/kde3/ktzeroconfplugin.so +%{_libdir}/kde3/ktzeroconfplugin.la %{_datadir}/applications/kde/ktorrent.desktop %{_datadir}/apps/ktorrent %{_datadir}/config.kcfg/ktlogviewerplugin.kcfg @@ -125,6 +133,13 @@ %{_datadir}/services/ktzeroconfplugin.desktop %changelog +* Wed Feb 07 2007 Roland Wolters 2.1-7 +- spec-file adjustments + +* Wed Feb 07 2007 Roland Wolters 2.1-6 +- fixed plugins bug +- fixed configure warnings + * Tue Feb 06 2007 Roland Wolters 2.1-4 - added avahi-devel dependecy From fedora-extras-commits at redhat.com Wed Feb 7 21:20:12 2007 From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat)) Date: Wed, 7 Feb 2007 16:20:12 -0500 Subject: rpms/ktorrent/FC-5 ktorrent.spec,1.13,1.14 Message-ID: <200702072120.l17LKCeu007455@cvs-int.fedora.redhat.com> Author: liquidat Update of /cvs/extras/rpms/ktorrent/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7435 Modified Files: ktorrent.spec Log Message: Plugin-Bug, spec-file-adjustments. Index: ktorrent.spec =================================================================== RCS file: /cvs/extras/rpms/ktorrent/FC-5/ktorrent.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ktorrent.spec 5 Feb 2007 23:43:17 -0000 1.13 +++ ktorrent.spec 7 Feb 2007 21:19:40 -0000 1.14 @@ -2,7 +2,7 @@ Name: ktorrent Version: 2.1 -Release: 4%{?dist} +Release: 7%{?dist} Summary: A BitTorrent program for KDE Group: Applications/Internet License: GPL @@ -10,10 +10,7 @@ Source0: http://ktorrent.org/downloads/2.1/ktorrent-2.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: qt-devel kdelibs-devel desktop-file-utils gettext gmp-devel avahi-devel - -Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils +BuildRequires: qt-devel kdelibs-devel gettext gmp-devel avahi-devel automake desktop-file-utils %description KTorrent is a BitTorrent program for KDE. Its main features are native KDE @@ -22,6 +19,7 @@ %prep %setup -q +make -f admin/Makefile.common %build %configure --disable-rpath @@ -66,7 +64,6 @@ %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README TODO %exclude %{_libdir}/lib*.la -%exclude %{_libdir}/kde3/kt*.la %{_bindir}/ktcachecheck %{_bindir}/ktorrent %{_bindir}/kttorinfo @@ -75,16 +72,27 @@ %{_libdir}/libktorrent.so %{_libdir}/libktorrent-2.1.so %{_libdir}/kde3/ktinfowidgetplugin.so +%{_libdir}/kde3/ktinfowidgetplugin.la %{_libdir}/kde3/ktipfilterplugin.so +%{_libdir}/kde3/ktipfilterplugin.la %{_libdir}/kde3/ktlogviewerplugin.so +%{_libdir}/kde3/ktlogviewerplugin.la %{_libdir}/kde3/ktpartfileimportplugin.so +%{_libdir}/kde3/ktpartfileimportplugin.la %{_libdir}/kde3/ktrssfeedplugin.so +%{_libdir}/kde3/ktrssfeedplugin.la %{_libdir}/kde3/ktscanfolderplugin.so +%{_libdir}/kde3/ktscanfolderplugin.la %{_libdir}/kde3/ktschedulerplugin.so +%{_libdir}/kde3/ktschedulerplugin.la %{_libdir}/kde3/ktsearchplugin.so +%{_libdir}/kde3/ktsearchplugin.la %{_libdir}/kde3/ktupnpplugin.so +%{_libdir}/kde3/ktupnpplugin.la %{_libdir}/kde3/ktwebinterfaceplugin.so +%{_libdir}/kde3/ktwebinterfaceplugin.la %{_libdir}/kde3/ktzeroconfplugin.so +%{_libdir}/kde3/ktzeroconfplugin.la %{_datadir}/applications/kde/ktorrent.desktop %{_datadir}/apps/ktorrent %{_datadir}/config.kcfg/ktlogviewerplugin.kcfg @@ -125,6 +133,13 @@ %{_datadir}/services/ktzeroconfplugin.desktop %changelog +* Wed Feb 07 2007 Roland Wolters 2.1-7 +- spec-file adjustments + +* Wed Feb 07 2007 Roland Wolters 2.1-6 +- fixed plugins bug +- fixed configure warnings + * Tue Feb 06 2007 Roland Wolters 2.1-4 - added avahi-devel dependecy From fedora-extras-commits at redhat.com Wed Feb 7 22:25:37 2007 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 7 Feb 2007 17:25:37 -0500 Subject: rpms/amarok/FC-5 amarok.spec,1.65,1.66 Message-ID: <200702072225.l17MPbk6011559@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11538 Modified Files: amarok.spec Log Message: libgpod is not recent enough on FC-5 Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-5/amarok.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- amarok.spec 7 Feb 2007 18:27:48 -0000 1.65 +++ amarok.spec 7 Feb 2007 22:25:05 -0000 1.66 @@ -4,7 +4,7 @@ Name: amarok Summary: Media player for KDE Version: 1.4.5 -Release: 1%{?dist} +Release: 1%{?dist}.1 Group: Applications/Multimedia License: GPL @@ -193,9 +193,11 @@ # SMB %{_datadir}/services/amarok_smb-device.desktop %{_libdir}/kde3/libamarok_smb-device.* +%if "%fedora" >= "6" # IPod %{_datadir}/services/amarok_ipod-mediadevice.desktop %{_libdir}/kde3/libamarok_ipod-mediadevice.* +%endif # VFAT %{_datadir}/services/amarok_generic-mediadevice.desktop %{_libdir}/kde3/libamarok_generic-mediadevice.* @@ -233,6 +235,9 @@ %changelog +* Wed Feb 07 2007 Aurelien Bompard 1.4.5-1.1 +- libgpod is not recent enough in FC5 + * Sat Feb 03 2007 Aurelien Bompard 1.4.5-1 - version 1.4.5 - drop patch0 and patch1 (merged upstream) From fedora-extras-commits at redhat.com Wed Feb 7 22:48:04 2007 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Wed, 7 Feb 2007 17:48:04 -0500 Subject: rpms/smolt/devel smolt.spec,1.9,1.10 sources,1.5,1.6 Message-ID: <200702072248.l17Mm41J011824@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/smolt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11783/devel Modified Files: smolt.spec sources Log Message: upstream released new version better firstboot support better client handler more stats in smoon (server) Index: smolt.spec =================================================================== RCS file: /cvs/extras/rpms/smolt/devel/smolt.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- smolt.spec 31 Jan 2007 16:58:05 -0000 1.9 +++ smolt.spec 7 Feb 2007 22:47:32 -0000 1.10 @@ -1,6 +1,6 @@ Name: smolt Summary: Fedora hardware profiler -Version: 0.6.2 +Version: 0.7 Release: 1%{?dist} License: GPL Group: Applications/Internet @@ -9,14 +9,11 @@ # Note: This is a link to the gzip, you can't download it directly # This will get fixed as soon as hosted can create attachments directly -Source: https://hosted.fedoraproject.org/projects/smolt/attachment/wiki/WikiStart/%{name}-%{version}.tar.bz2 +Source: https://hosted.fedoraproject.org/projects/smolt/attachment/wiki/WikiStart/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: dbus-python -%ifnarch sparc sparc64 -Requires: /usr/bin/lsb_release -%endif # If firstboot is installed #Requires: firstboot @@ -59,11 +56,11 @@ %install %{__rm} -rf %{buildroot} -%{__install} -d -m 0755 hardware/ %{buildroot}/%{_datadir}/%{name}/server/ -%{__cp} -adv hardware/* %{buildroot}/%{_datadir}/%{name}/server/ +%{__install} -d -m 0755 smoon/ %{buildroot}/%{_datadir}/%{name}/smoon/ +%{__cp} -adv smoon/* %{buildroot}/%{_datadir}/%{name}/smoon/ -%{__install} -d -m 0755 hw-client/ %{buildroot}/%{_datadir}/%{name}/client/ -%{__cp} -adv hw-client/* %{buildroot}/%{_datadir}/%{name}/client/ +%{__install} -d -m 0755 client/ %{buildroot}/%{_datadir}/%{name}/client/ +%{__cp} -adv client/* %{buildroot}/%{_datadir}/%{name}/client/ %{__mkdir} -p %{buildroot}/%{_sysconfdir}/sysconfig/ %{__mkdir} -p %{buildroot}/%{_bindir} @@ -71,10 +68,8 @@ %{__cp} -adv firstboot/smolt.py %{buildroot}/%{_datadir}/firstboot/modules/ touch %{buildroot}/%{_sysconfdir}/sysconfig/hw-uuid -ln -s %{_datadir}/%{name}/client/readProfile.py %{buildroot}/%{_bindir}/smoltPrint ln -s %{_datadir}/%{name}/client/sendProfile.py %{buildroot}/%{_bindir}/smoltSendProfile %{__chmod} +x %{buildroot}/%{_datadir}/%{name}/client/sendProfile.py -%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/client/readProfile.py %clean rm -rf %{buildroot} @@ -97,13 +92,16 @@ %files server %defattr(-,root,root,-) -%{_datadir}/%{name}/server +%{_datadir}/%{name}/smoon %files firstboot %defattr(-,root,root,-) %{_datadir}/firstboot/modules/smolt.py* %changelog +* Wed Feb 07 2007 Mike McGrath 0.7-1 +- Upstream released new version + * Tue Jan 31 2007 Mike McGrath 0.6.2-1 - Upstream released new version (bug in firstboot) Index: sources =================================================================== RCS file: /cvs/extras/rpms/smolt/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 31 Jan 2007 16:58:05 -0000 1.5 +++ sources 7 Feb 2007 22:47:32 -0000 1.6 @@ -1 +1 @@ -80e076abfb3b5fb7d31a75d69c0b8621 smolt-0.6.2.tar.bz2 +b3876205ca06ecc64b73364ca70e1f5b smolt-0.7.tar.gz From fedora-extras-commits at redhat.com Wed Feb 7 22:48:02 2007 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Wed, 7 Feb 2007 17:48:02 -0500 Subject: rpms/smolt/FC-6 smolt.spec,1.9,1.10 sources,1.5,1.6 Message-ID: <200702072248.l17Mm2ZU011820@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/smolt/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11783/FC-6 Modified Files: smolt.spec sources Log Message: upstream released new version better firstboot support better client handler more stats in smoon (server) Index: smolt.spec =================================================================== RCS file: /cvs/extras/rpms/smolt/FC-6/smolt.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- smolt.spec 31 Jan 2007 16:58:05 -0000 1.9 +++ smolt.spec 7 Feb 2007 22:47:29 -0000 1.10 @@ -1,6 +1,6 @@ Name: smolt Summary: Fedora hardware profiler -Version: 0.6.2 +Version: 0.7 Release: 1%{?dist} License: GPL Group: Applications/Internet @@ -9,14 +9,11 @@ # Note: This is a link to the gzip, you can't download it directly # This will get fixed as soon as hosted can create attachments directly -Source: https://hosted.fedoraproject.org/projects/smolt/attachment/wiki/WikiStart/%{name}-%{version}.tar.bz2 +Source: https://hosted.fedoraproject.org/projects/smolt/attachment/wiki/WikiStart/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: dbus-python -%ifnarch sparc sparc64 -Requires: /usr/bin/lsb_release -%endif # If firstboot is installed #Requires: firstboot @@ -59,11 +56,11 @@ %install %{__rm} -rf %{buildroot} -%{__install} -d -m 0755 hardware/ %{buildroot}/%{_datadir}/%{name}/server/ -%{__cp} -adv hardware/* %{buildroot}/%{_datadir}/%{name}/server/ +%{__install} -d -m 0755 smoon/ %{buildroot}/%{_datadir}/%{name}/smoon/ +%{__cp} -adv smoon/* %{buildroot}/%{_datadir}/%{name}/smoon/ -%{__install} -d -m 0755 hw-client/ %{buildroot}/%{_datadir}/%{name}/client/ -%{__cp} -adv hw-client/* %{buildroot}/%{_datadir}/%{name}/client/ +%{__install} -d -m 0755 client/ %{buildroot}/%{_datadir}/%{name}/client/ +%{__cp} -adv client/* %{buildroot}/%{_datadir}/%{name}/client/ %{__mkdir} -p %{buildroot}/%{_sysconfdir}/sysconfig/ %{__mkdir} -p %{buildroot}/%{_bindir} @@ -71,10 +68,8 @@ %{__cp} -adv firstboot/smolt.py %{buildroot}/%{_datadir}/firstboot/modules/ touch %{buildroot}/%{_sysconfdir}/sysconfig/hw-uuid -ln -s %{_datadir}/%{name}/client/readProfile.py %{buildroot}/%{_bindir}/smoltPrint ln -s %{_datadir}/%{name}/client/sendProfile.py %{buildroot}/%{_bindir}/smoltSendProfile %{__chmod} +x %{buildroot}/%{_datadir}/%{name}/client/sendProfile.py -%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/client/readProfile.py %clean rm -rf %{buildroot} @@ -97,13 +92,16 @@ %files server %defattr(-,root,root,-) -%{_datadir}/%{name}/server +%{_datadir}/%{name}/smoon %files firstboot %defattr(-,root,root,-) %{_datadir}/firstboot/modules/smolt.py* %changelog +* Wed Feb 07 2007 Mike McGrath 0.7-1 +- Upstream released new version + * Tue Jan 31 2007 Mike McGrath 0.6.2-1 - Upstream released new version (bug in firstboot) Index: sources =================================================================== RCS file: /cvs/extras/rpms/smolt/FC-6/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 31 Jan 2007 16:58:05 -0000 1.5 +++ sources 7 Feb 2007 22:47:29 -0000 1.6 @@ -1 +1 @@ -80e076abfb3b5fb7d31a75d69c0b8621 smolt-0.6.2.tar.bz2 +b3876205ca06ecc64b73364ca70e1f5b smolt-0.7.tar.gz From fedora-extras-commits at redhat.com Wed Feb 7 23:13:53 2007 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 7 Feb 2007 18:13:53 -0500 Subject: rpms/dumpasn1/devel dumpasn1.spec,1.4,1.5 sources,1.4,1.5 Message-ID: <200702072313.l17NDrg5015505@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/dumpasn1/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15481 Modified Files: dumpasn1.spec sources Log Message: * Thu Feb 8 2007 Ville Skytt?? - 20060622-2 - Update dumpasn1.cfg to 20070127. Index: dumpasn1.spec =================================================================== RCS file: /cvs/extras/rpms/dumpasn1/devel/dumpasn1.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dumpasn1.spec 27 Aug 2006 21:34:24 -0000 1.4 +++ dumpasn1.spec 7 Feb 2007 23:13:21 -0000 1.5 @@ -1,6 +1,6 @@ Name: dumpasn1 Version: 20060622 -Release: 1%{?dist} +Release: 2%{?dist} Summary: ASN.1 object dump utility Group: Development/Tools @@ -51,6 +51,9 @@ %changelog +* Thu Feb 8 2007 Ville Skytt?? - 20060622-2 +- Update dumpasn1.cfg to 20070127. + * Tue Aug 22 2006 Ville Skytt?? - 20060622-1 - Update to 20060622. Index: sources =================================================================== RCS file: /cvs/extras/rpms/dumpasn1/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 27 Aug 2006 21:34:24 -0000 1.4 +++ sources 7 Feb 2007 23:13:21 -0000 1.5 @@ -1,3 +1,3 @@ 4d3bff6213cc455af94846a0485ca743 dumpasn1_20030222-1.diff.gz 0855c6f21a9e2c7f984b1e48ce9c1f58 dumpasn1.c -ffb5d3c3f7b5216149dcc7bbf462408c dumpasn1.cfg +e7a73cf31b9082199fe213f57bb6e89a dumpasn1.cfg From fedora-extras-commits at redhat.com Thu Feb 8 00:03:07 2007 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Wed, 7 Feb 2007 19:03:07 -0500 Subject: rpms/mock/devel .cvsignore, 1.13, 1.14 mock.spec, 1.29, 1.30 sources, 1.16, 1.17 Message-ID: <200702080003.l18037WN019517@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/extras/rpms/mock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19493 Modified Files: .cvsignore mock.spec sources Log Message: bump Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mock/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 9 Jan 2007 15:39:35 -0000 1.13 +++ .cvsignore 8 Feb 2007 00:02:35 -0000 1.14 @@ -1 +1 @@ -mock-0.6.10.tar.gz +mock-0.6.11.tar.gz Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/devel/mock.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- mock.spec 9 Jan 2007 15:39:35 -0000 1.29 +++ mock.spec 8 Feb 2007 00:02:35 -0000 1.30 @@ -1,6 +1,6 @@ Summary: Builds packages inside chroots Name: mock -Version: 0.6.10 +Version: 0.6.11 Release: 1%{?dist} License: GPL Group: Development/Tools @@ -67,6 +67,10 @@ %{_libdir}/libselinux-mock.so %changelog +* Tue Feb 6 2007 Clark Williams - 0.6.11-1 +- added error() calls to print command output on failed commands +- added installdeps command for long-term chroot management + * Mon Jan 8 2007 Clark Williams - 0.6.10-1 - Added Josh Boyer's EPEL config files Index: sources =================================================================== RCS file: /cvs/extras/rpms/mock/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 9 Jan 2007 15:39:35 -0000 1.16 +++ sources 8 Feb 2007 00:02:35 -0000 1.17 @@ -1 +1 @@ -cb97e374c38faf681c5530440273adf2 mock-0.6.10.tar.gz +d62f66fde1442df2dcffd72a3978ef03 mock-0.6.11.tar.gz From fedora-extras-commits at redhat.com Thu Feb 8 00:24:13 2007 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Wed, 7 Feb 2007 19:24:13 -0500 Subject: rpms/mock/FC-6 mock.spec,1.28,1.29 sources,1.15,1.16 Message-ID: <200702080024.l180OD6g019731@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/extras/rpms/mock/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19710 Modified Files: mock.spec sources Log Message: bump on fc6 too Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/FC-6/mock.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- mock.spec 15 Jan 2007 15:46:10 -0000 1.28 +++ mock.spec 8 Feb 2007 00:23:40 -0000 1.29 @@ -1,6 +1,6 @@ Summary: Builds packages inside chroots Name: mock -Version: 0.6.10 +Version: 0.6.11 Release: 1%{?dist} License: GPL Group: Development/Tools @@ -67,6 +67,10 @@ %{_libdir}/libselinux-mock.so %changelog +* Tue Feb 6 2007 Clark Williams - 0.6.11-1 +- added error() calls to print command output on failed commands +- added installdeps command for long-term chroot management + * Mon Jan 8 2007 Clark Williams - 0.6.10-1 - Added Josh Boyer's EPEL config files Index: sources =================================================================== RCS file: /cvs/extras/rpms/mock/FC-6/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 15 Jan 2007 15:46:10 -0000 1.15 +++ sources 8 Feb 2007 00:23:40 -0000 1.16 @@ -1 +1 @@ -cb97e374c38faf681c5530440273adf2 mock-0.6.10.tar.gz +d62f66fde1442df2dcffd72a3978ef03 mock-0.6.11.tar.gz From fedora-extras-commits at redhat.com Thu Feb 8 00:40:16 2007 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Wed, 7 Feb 2007 19:40:16 -0500 Subject: rpms/wfut/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 wfut.spec, 1.1, 1.2 Message-ID: <200702080040.l180eGid019919@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/wfut/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19893 Modified Files: .cvsignore sources wfut.spec Log Message: Update to 1.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wfut/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 4 Sep 2006 01:32:20 -0000 1.2 +++ .cvsignore 8 Feb 2007 00:39:44 -0000 1.3 @@ -1 +1 @@ -WFUT-1.0-SNAPSHOT-src.tar.gz +WFUT-1.1.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wfut/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 4 Sep 2006 01:32:20 -0000 1.2 +++ sources 8 Feb 2007 00:39:44 -0000 1.3 @@ -1 +1 @@ -23d40558c121d5c52917846a36d48b80 WFUT-1.0-SNAPSHOT-src.tar.gz +72bed202a37f2aaee536a6264a4957f2 WFUT-1.1.0.tar.gz Index: wfut.spec =================================================================== RCS file: /cvs/extras/rpms/wfut/devel/wfut.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wfut.spec 4 Sep 2006 01:32:20 -0000 1.1 +++ wfut.spec 8 Feb 2007 00:39:44 -0000 1.2 @@ -1,12 +1,12 @@ Name: wfut -Version: 1.0 -Release: 3%{?dist} +Version: 1.1.0 +Release: 1%{?dist} Summary: Software updater tool for WorldForge applications Group: Development/Libraries License: GPL URL: http://www.worldforge.org -Source0: http://white.worldforge.org/downloads/WFUT/srcs/WFUT-1.0-SNAPSHOT-src.tar.gz +Source0: http://dl.sourceforge.net/worldforge/srcs/WFUT-1.1.0.tar.gz Source1: wfut.desktop Source2: wfut.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -18,7 +18,7 @@ %prep -%setup -q -n WFUT-1.0-SNAPSHOT +%setup -q -n WFUT-%{version} %build @@ -73,6 +73,10 @@ %changelog +* Wed Feb 7 2007 Wart 1.1.0-1 +- Update to 1.1.0 +- Upstream moved sources to SourceForge + * Thu Aug 17 2006 Wart 1.0-3 - Remove unnecessary startup script. - Added .desktop file From fedora-extras-commits at redhat.com Thu Feb 8 00:50:53 2007 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 7 Feb 2007 19:50:53 -0500 Subject: rpms/inkscape/devel inkscape-0.45-python.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 inkscape.spec, 1.34, 1.35 sources, 1.10, 1.11 inkscape-0.44.1-latex.patch, 1.1, NONE Message-ID: <200702080050.l180orpT020203@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/inkscape/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20003 Modified Files: .cvsignore inkscape.spec sources Added Files: inkscape-0.45-python.patch Removed Files: inkscape-0.44.1-latex.patch Log Message: - Update to 0.45 - Enabled inkboard, perl and python extensions - Added patch for correct python autodetection - LaTex patch integrated upstreamed, removed - Some rpmlint cleanups inkscape-0.45-python.patch: --- NEW FILE inkscape-0.45-python.patch --- --- inkscape-0.45/configure.orig 2007-02-07 12:08:44.000000000 -0800 +++ inkscape-0.45/configure 2007-02-07 12:22:34.000000000 -0800 @@ -10769,7 +10769,7 @@ if test "$?" -gt "0"; then with_python="no" else - checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null` + checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('DBLIB'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null` if test "$?" -gt "0"; then with_python="no" else Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/inkscape/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 7 Sep 2006 09:59:41 -0000 1.10 +++ .cvsignore 8 Feb 2007 00:50:21 -0000 1.11 @@ -1 +1 @@ -inkscape-0.44.1.tar.gz +inkscape-0.45.tar.gz Index: inkscape.spec =================================================================== RCS file: /cvs/extras/rpms/inkscape/devel/inkscape.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- inkscape.spec 6 Dec 2006 11:32:59 -0000 1.34 +++ inkscape.spec 8 Feb 2007 00:50:21 -0000 1.35 @@ -1,14 +1,16 @@ +%define _with_inkboard 1 + Name: inkscape -Version: 0.44.1 -Release: 2%{?dist} +Version: 0.45 +Release: 1%{?dist} Summary: Vector-based drawing program using SVG Group: Applications/Productivity License: GPL URL: http://inkscape.sourceforge.net/ Source0: http://download.sourceforge.net/inkscape/inkscape-%{version}.tar.gz -Patch0: inkscape-0.44.1-latex.patch -Patch1: inkscape-0.44.1-psinput.patch +Patch0: inkscape-0.44.1-psinput.patch +Patch1: inkscape-0.45-python.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: atk-devel @@ -18,30 +20,26 @@ BuildRequires: gettext BuildRequires: gtkmm24-devel BuildRequires: gtkspell-devel -BuildRequires: libart_lgpl-devel >= 2.3.10 -BuildRequires: libgnomeprintui22-devel >= 2.2.0 BuildRequires: gnome-vfs2-devel >= 2.0 BuildRequires: libpng-devel >= 1.2 -BuildRequires: libsigc++20-devel -BuildRequires: libxml2-devel >= 2.4.24 -BuildRequires: libxslt-devel +BuildRequires: libsigc++20-devel >= 2.0.12 +BuildRequires: libxml2-devel >= 2.6.11 +BuildRequires: libxslt-devel >= 1.0.15 BuildRequires: pango-devel BuildRequires: pkgconfig -BuildRequires: lcms-devel >= 1.13 -BuildRequires: boost-devel >= 1.33.1 -%{?_with_perl: BuildRequires: perl-XML-Parser, perl-libxml-enno} -%{?_with_python: BuildRequires: python-devel} -%{?_with_inkboard: BuildRequires: loudmouth-devel >= 1.0} -%{?_with_gnomeprint: BuildRequires: libgnomeprint22-devel >= 2.2.0} +BuildRequires: lcms-devel >= 1.13 +BuildRequires: cairo-devel +BuildRequires: openssl-devel +BuildRequires: dos2unix +BuildRequires: perl-XML-Parser +BuildRequires: python-devel +%{?_with_inkboard:BuildRequires: loudmouth-devel >= 1.0} -Requires: pstoedit +Requires: pstoedit Requires(post): desktop-file-utils Requires(postun): desktop-file-utils -Provides: perl(SpSVG) -Provides: perl(SVG) - %description Inkscape is a vector-based drawing program, like CorelDraw?? or Adobe @@ -59,8 +57,11 @@ %prep %setup -q -%patch0 -p1 -b .latex -%patch1 -p1 -b .psinput +%patch0 -p1 -b .psinput +%patch1 -p1 -b .python +find -type f -regex '.*\.\(cpp\|h\)' -perm +111 -exec chmod -x {} ';' +find share/extensions/ -type f -regex '.*\.py' -perm +111 -exec chmod -x {} ';' +dos2unix share/extensions/*.py %build @@ -68,20 +69,11 @@ --disable-dependency-tracking \ --with-xinerama \ --enable-static=no \ -%if "%{?_with_python}" --with-python \ -%endif -%if "%{?_with_perl}" --with-perl \ -%endif --with-gnome-vfs \ --with-inkjar \ -%if "%{?_with_inkboard}" --enable-inkboard \ -%endif -%if "%{?_with_gnomeprint}" ---with-gnome-print \ -%endif --enable-lcms make %{?_smp_mflags} @@ -93,6 +85,9 @@ %find_lang %{name} find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' +rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/outline2svg.* +rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/txt2svg.* + desktop-file-install --vendor fedora --delete-original \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ @@ -123,6 +118,13 @@ %changelog +* Wed Feb 7 2007 Denis Leroy - 0.45-1 +- Update to 0.45 +- Enabled inkboard, perl and python extensions +- Added patch for correct python autodetection +- LaTex patch integrated upstreamed, removed +- Some rpmlint cleanups + * Wed Dec 6 2006 Denis Leroy - 0.44.1-2 - Added patches to fix LaTex import (#217699) - Added patch to base postscript import on pstoedit plot-svg Index: sources =================================================================== RCS file: /cvs/extras/rpms/inkscape/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 7 Sep 2006 09:59:41 -0000 1.10 +++ sources 8 Feb 2007 00:50:21 -0000 1.11 @@ -1 +1 @@ -ae2929f70403004038963ef2448728f3 inkscape-0.44.1.tar.gz +82d7cff90a7de42460e65d289e0d4d33 inkscape-0.45.tar.gz --- inkscape-0.44.1-latex.patch DELETED --- From fedora-extras-commits at redhat.com Thu Feb 8 01:07:37 2007 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Wed, 7 Feb 2007 20:07:37 -0500 Subject: rpms/wfut/FC-6 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 wfut.spec, 1.1, 1.2 Message-ID: <200702080107.l1817bUw023762@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/wfut/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23734 Modified Files: .cvsignore sources wfut.spec Log Message: Update to 1.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wfut/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 4 Sep 2006 01:32:20 -0000 1.2 +++ .cvsignore 8 Feb 2007 01:07:04 -0000 1.3 @@ -1 +1 @@ -WFUT-1.0-SNAPSHOT-src.tar.gz +WFUT-1.1.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wfut/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 4 Sep 2006 01:32:20 -0000 1.2 +++ sources 8 Feb 2007 01:07:04 -0000 1.3 @@ -1 +1 @@ -23d40558c121d5c52917846a36d48b80 WFUT-1.0-SNAPSHOT-src.tar.gz +72bed202a37f2aaee536a6264a4957f2 WFUT-1.1.0.tar.gz Index: wfut.spec =================================================================== RCS file: /cvs/extras/rpms/wfut/FC-6/wfut.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wfut.spec 4 Sep 2006 01:32:20 -0000 1.1 +++ wfut.spec 8 Feb 2007 01:07:04 -0000 1.2 @@ -1,12 +1,12 @@ Name: wfut -Version: 1.0 -Release: 3%{?dist} +Version: 1.1.0 +Release: 1%{?dist} Summary: Software updater tool for WorldForge applications Group: Development/Libraries License: GPL URL: http://www.worldforge.org -Source0: http://white.worldforge.org/downloads/WFUT/srcs/WFUT-1.0-SNAPSHOT-src.tar.gz +Source0: http://dl.sourceforge.net/worldforge/srcs/WFUT-1.1.0.tar.gz Source1: wfut.desktop Source2: wfut.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -18,7 +18,7 @@ %prep -%setup -q -n WFUT-1.0-SNAPSHOT +%setup -q -n WFUT-%{version} %build @@ -73,6 +73,10 @@ %changelog +* Wed Feb 7 2007 Wart 1.1.0-1 +- Update to 1.1.0 +- Upstream moved sources to SourceForge + * Thu Aug 17 2006 Wart 1.0-3 - Remove unnecessary startup script. - Added .desktop file From fedora-extras-commits at redhat.com Thu Feb 8 02:43:04 2007 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 7 Feb 2007 21:43:04 -0500 Subject: rpms/inkscape/devel inkscape-0.45-python.patch,1.1,1.2 Message-ID: <200702080243.l182h41v027562@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/inkscape/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27542 Modified Files: inkscape-0.45-python.patch Log Message: Adjusted python patch for python 2.5 inkscape-0.45-python.patch: Index: inkscape-0.45-python.patch =================================================================== RCS file: /cvs/extras/rpms/inkscape/devel/inkscape-0.45-python.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- inkscape-0.45-python.patch 8 Feb 2007 00:50:21 -0000 1.1 +++ inkscape-0.45-python.patch 8 Feb 2007 02:42:32 -0000 1.2 @@ -9,3 +9,28 @@ if test "$?" -gt "0"; then with_python="no" else +--- inkscape-0.45/src/extension/script/inkscape_py_wrap.cpp.orig 2007-02-07 17:11:42.000000000 -0800 ++++ inkscape-0.45/src/extension/script/inkscape_py_wrap.cpp 2007-02-07 18:19:21.000000000 -0800 +@@ -802,7 +802,7 @@ + obj = pyobj; + if (PyCFunction_Check(obj)) { + /* here we get the method pointer for callbacks */ +- char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); ++ const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); + c = doc ? strstr(doc, "swig_ptr: ") : 0; + if (c) { + c += 10; +@@ -977,11 +977,11 @@ + swig_type_info **types_initial) { + int i; + for (i = 0; methods[i].ml_name; ++i) { +- char *c = methods[i].ml_doc; ++ const char *c = methods[i].ml_doc; + if (c && (c = strstr(c, "swig_ptr: "))) { + int j; + swig_const_info *ci = 0; +- char *name = c + 10; ++ const char *name = c + 10; + for (j = 0; const_table[j].type; j++) { + if (strncmp(const_table[j].name, name, + strlen(const_table[j].name)) == 0) { From fedora-extras-commits at redhat.com Thu Feb 8 03:19:08 2007 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Wed, 7 Feb 2007 22:19:08 -0500 Subject: rpms/mew/FC-6 .cvsignore,1.4,1.5 mew.spec,1.7,1.8 sources,1.4,1.5 Message-ID: <200702080319.l183J8Ns031187@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/mew/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31164 Modified Files: .cvsignore mew.spec sources Log Message: * Wed Feb 7 2007 Akira TAGOH - 5.2-1 - New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mew/FC-6/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 19 Jul 2006 04:29:44 -0000 1.4 +++ .cvsignore 8 Feb 2007 03:18:36 -0000 1.5 @@ -4,3 +4,4 @@ mew-4.1.tar.gz mew-4.2.tar.gz mew-5.1.tar.gz +mew-5.2.tar.gz Index: mew.spec =================================================================== RCS file: /cvs/extras/rpms/mew/FC-6/mew.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mew.spec 19 Dec 2006 08:53:26 -0000 1.7 +++ mew.spec 8 Feb 2007 03:18:36 -0000 1.8 @@ -4,8 +4,8 @@ %define xemacsver 21.4.11 Name: mew -Version: 5.1 -Release: 3%{?dist} +Version: 5.2 +Release: 1%{?dist} License: BSD-like URL: http://www.mew.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -177,6 +177,9 @@ %changelog +* Wed Feb 7 2007 Akira TAGOH - 5.2-1 +- New upstream release. + * Tue Dec 19 2006 Akira TAGOh - 5.1-3 - makes it failsafe to run install-info. (#219402) Index: sources =================================================================== RCS file: /cvs/extras/rpms/mew/FC-6/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 19 Jul 2006 04:29:44 -0000 1.4 +++ sources 8 Feb 2007 03:18:36 -0000 1.5 @@ -1 +1 @@ -0c913a789142f98623180eb111e28b07 mew-5.1.tar.gz +be0ac05179daed9b7c1329c9264d0f17 mew-5.2.tar.gz From fedora-extras-commits at redhat.com Thu Feb 8 05:29:23 2007 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 8 Feb 2007 00:29:23 -0500 Subject: rpms/mew/FC-5 .cvsignore,1.4,1.5 mew.spec,1.4,1.5 sources,1.4,1.5 Message-ID: <200702080529.l185TN4J006352@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/mew/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6331 Modified Files: .cvsignore mew.spec sources Log Message: * Wed Feb 7 2007 Akira TAGOH - 5.2-1 - New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mew/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 19 Jul 2006 04:37:48 -0000 1.4 +++ .cvsignore 8 Feb 2007 05:28:50 -0000 1.5 @@ -4,3 +4,4 @@ mew-4.1.tar.gz mew-4.2.tar.gz mew-5.1.tar.gz +mew-5.2.tar.gz Index: mew.spec =================================================================== RCS file: /cvs/extras/rpms/mew/FC-5/mew.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mew.spec 19 Jul 2006 04:37:48 -0000 1.4 +++ mew.spec 8 Feb 2007 05:28:50 -0000 1.5 @@ -4,7 +4,7 @@ %define xemacsver 21.4.11 Name: mew -Version: 5.1 +Version: 5.2 Release: 1%{?dist} License: BSD-like URL: http://www.mew.org/ @@ -35,7 +35,7 @@ %package xemacs Summary: Mew - Messaging in the Emacs World for XEmacs Group: Applications/Internet -Requires: xemacs-common +Requires: xemacs-common xemacs-packages-extra Requires: %{name}-common = %{version} Conflicts: xemacs <= 21.1.14-24 @@ -47,9 +47,10 @@ %package common -Summary: Mew - Common files of Messagin in the Emacs World -Group: Applications/Internet -Prereq(post,postun): /sbin/install-info +Summary: Mew - Common files of Messagin in the Emacs World +Group: Applications/Internet +Prereq(post): /sbin/install-info +Prereq(preun): /sbin/install-info %description common Messaging in the Emacs World. It provides a very easy user interface @@ -133,16 +134,16 @@ %post common /sbin/install-info %{_infodir}/mew.info \ - %{_infodir}/dir --section="Message User Agent" + %{_infodir}/dir --section="Message User Agent" || : /sbin/install-info %{_infodir}/mew.jis.info \ - %{_infodir}/dir --section="Message User Agent" + %{_infodir}/dir --section="Message User Agent" || : %preun common if [ "$1" = 0 ]; then /sbin/install-info --delete %{_infodir}/mew.info \ - %{_infodir}/dir --section="Message User Agent" + %{_infodir}/dir --section="Message User Agent" || : /sbin/install-info --delete %{_infodir}/mew.jis.info \ - %{_infodir}/dir --section="Message User Agent" + %{_infodir}/dir --section="Message User Agent" || : fi @@ -176,6 +177,16 @@ %changelog +* Wed Feb 7 2007 Akira TAGOH - 5.2-1 +- New upstream release. + +* Tue Dec 19 2006 Akira TAGOh - 5.1-3 +- makes it failsafe to run install-info. (#219402) + +* Mon Sep 11 2006 Akira TAGOH - 5.1-2 +- rebuilt +- add xemacs-packages-extra to BR and R. + * Wed Jul 19 2006 Akira TAGOH - 5.1-1 - New upstream release. - mew-2.2-makefile.patch: removed. Index: sources =================================================================== RCS file: /cvs/extras/rpms/mew/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 19 Jul 2006 04:37:48 -0000 1.4 +++ sources 8 Feb 2007 05:28:50 -0000 1.5 @@ -1 +1 @@ -0c913a789142f98623180eb111e28b07 mew-5.1.tar.gz +be0ac05179daed9b7c1329c9264d0f17 mew-5.2.tar.gz From fedora-extras-commits at redhat.com Thu Feb 8 09:32:34 2007 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Thu, 8 Feb 2007 04:32:34 -0500 Subject: rpms/exim/devel exim-greylist.conf.inc,1.4,1.5 Message-ID: <200702080932.l189WYQa021663@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21637 Modified Files: exim-greylist.conf.inc Log Message: Improve error handling if the database goes AWOL. Record the _original_ {IP,HELO} as known resender. Index: exim-greylist.conf.inc =================================================================== RCS file: /cvs/extras/rpms/exim/devel/exim-greylist.conf.inc,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- exim-greylist.conf.inc 7 Feb 2007 12:45:33 -0000 1.4 +++ exim-greylist.conf.inc 8 Feb 2007 09:32:02 -0000 1.5 @@ -56,7 +56,7 @@ WHERE helo='${quote_sqlite:$sender_helo_name}' \ AND host='$sender_host_address'; - # Generate the mail identity (as described above) + # Generate a hashed 'identity' for the mail, as described above. warn set acl_m_greyident = ${hash{20}{62}{$sender_address$recipients$h_message-id:}} # Attempt to look up this mail in the greylist database. If it's there, @@ -65,23 +65,39 @@ warn set acl_m_greyexpiry = ${lookup sqlite {GREYDB SELECT expire FROM greylist \ WHERE id='${quote_sqlite:$acl_m_greyident}';}{$value}} - # If the mail isn't already the database, defer it with an appropriate - # message, and add it. Do the addition to the greylist database as a - # hackish side-effect of the log-message. This is where the 5 minute - # timeout is set ($tod_epoch + 300), should you wish to change it. - defer condition = ${if eq {$acl_m_greyexpiry}{} {1}} - log_message = Greylisted $h_message-id: for offences: ${sg {$acl_m_greylistreasons}{\n}{,}}\ - ${lookup sqlite {GREYDB INSERT INTO greylist \ + # If the mail isn't already the database -- i.e. if the $acl_m_greyexpiry + # variable we just looked up is empty -- then try to add it now. This is + # where the 5 minute timeout is set ($tod_epoch + 300), should you wish + # to change it. + warn condition = ${if eq {$acl_m_greyexpiry}{} {1}} + set acl_m_dontcare = ${lookup sqlite {GREYDB INSERT INTO greylist \ VALUES ( '$acl_m_greyident', \ - '${eval10:$tod_epoch+300}', \ + '${eval10:$tod_epoch+30}', \ '$sender_host_address', \ '${quote_sqlite:$sender_helo_name}' );}} + + # Be paranoid, and check if the insertion succeeded (by doing another lookup). + # Otherwise, if there's a database error we might end up deferring for ever. + defer condition = ${if eq {$acl_m_greyexpiry}{} {1}} + condition = ${lookup sqlite {GREYDB SELECT expire FROM greylist \ + WHERE id='${quote_sqlite:$acl_m_greyident}';} {1}} message = Your mail was considered suspicious for the following reason(s):\n$acl_m_greylistreasons \ The mail has been greylisted for 5 minutes, after which it should be accepted. \ We apologise for the inconvenience. Your mail system should keep the mail on \ its queue and retry. When that happens, your system will be added to the list \ genuine mail systems, and mail from it should not be greylisted any more. \ In the event of problems, please contact postmaster@$qualify_domain + log_message = Greylisted <$h_message-id:> from <$sender_address> for offences: ${sg {$acl_m_greylistreasons}{\n}{,}} + + # Handle the error case (which should never happen, but would be bad if it did). + # First by whining about it in the logs, so the admin can deal with it... + warn condition = ${if eq {$acl_m_greyexpiry}{} {1}} + log_message = Greylist insertion failed. Bypassing greylist. + # ... and then by just accepting the message. + accept condition = ${if eq {$acl_m_greyexpiry}{} {1}} + + # OK, we've dealt with the "new" messages. Now we deal with messages which + # _were_ already in the database... # If the message was already listed but its time hasn't yet expired, keep rejecting it defer condition = ${if > {$acl_m_greyexpiry}{$tod_epoch}} @@ -90,11 +106,15 @@ Reason(s) for greylisting: \n$acl_m_greylistreasons # The message was listed but it's been more than five minutes. Accept it now and whitelist - # the sending host by its { IP, HELO } so that we don't delay its mail again. The addition - # to the database is again done as a hackish side-effect; this time a side-effect of - # evaluating a condition which comes out as '1' whether the database bit succeeds or not. - accept condition = ${lookup sqlite {GREYDB INSERT INTO resenders \ - VALUES ( '$sender_host_address', \ - '${quote_sqlite:$sender_helo_name}', \ - '$tod_epoch' ); }{1}{1}} + # the _original_ sending host by its { IP, HELO } so that we don't delay its mail again. + warn set acl_m_orighost = ${lookup sqlite {GREYDB SELECT host FROM greylist \ + WHERE id='${quote_sqlite:$acl_m_greyident}';}{$value}} + set acl_m_orighelo = ${lookup sqlite {GREYDB SELECT helo FROM greylist \ + WHERE id='${quote_sqlite:$acl_m_greyident}';}{$value}} + set acl_m_dontcare = ${lookup sqlite {GREYDB INSERT INTO resenders \ + VALUES ( '$acl_m_orighost', \ + '${quote_sqlite:$acl_m_orighelo}', \ + '$tod_epoch' ); }} + logwrite = Added host $acl_m_orighost with HELO '$acl_m_orighelo' to known resenders + accept From fedora-extras-commits at redhat.com Thu Feb 8 10:31:56 2007 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Thu, 8 Feb 2007 05:31:56 -0500 Subject: rpms/exim/devel exim-greylist.conf.inc,1.5,1.6 Message-ID: <200702081031.l18AVuwE025390@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25373 Modified Files: exim-greylist.conf.inc Log Message: oops. Back to 300 seconds Index: exim-greylist.conf.inc =================================================================== RCS file: /cvs/extras/rpms/exim/devel/exim-greylist.conf.inc,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- exim-greylist.conf.inc 8 Feb 2007 09:32:02 -0000 1.5 +++ exim-greylist.conf.inc 8 Feb 2007 10:31:24 -0000 1.6 @@ -72,7 +72,7 @@ warn condition = ${if eq {$acl_m_greyexpiry}{} {1}} set acl_m_dontcare = ${lookup sqlite {GREYDB INSERT INTO greylist \ VALUES ( '$acl_m_greyident', \ - '${eval10:$tod_epoch+30}', \ + '${eval10:$tod_epoch+300}', \ '$sender_host_address', \ '${quote_sqlite:$sender_helo_name}' );}} From fedora-extras-commits at redhat.com Thu Feb 8 10:32:46 2007 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Thu, 8 Feb 2007 05:32:46 -0500 Subject: rpms/exim/devel exim-4.66-greylist-conf.patch,1.1,1.2 Message-ID: <200702081032.l18AWkYY025423@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25393 Modified Files: exim-4.66-greylist-conf.patch Log Message: require helo, show how to greylist for no rdns exim-4.66-greylist-conf.patch: Index: exim-4.66-greylist-conf.patch =================================================================== RCS file: /cvs/extras/rpms/exim/devel/exim-4.66-greylist-conf.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- exim-4.66-greylist-conf.patch 7 Feb 2007 12:57:15 -0000 1.1 +++ exim-4.66-greylist-conf.patch 8 Feb 2007 10:32:13 -0000 1.2 @@ -1,6 +1,44 @@ ---- exim-4.66/src/configure.default.grey 2007-02-07 12:01:16.000000000 +0000 -+++ exim-4.66/src/configure.default 2007-02-07 12:09:06.000000000 +0000 -@@ -435,7 +435,8 @@ acl_check_rcpt: +--- exim-4.66/src/configure.default.grey 2007-02-07 13:07:40.000000000 +0000 ++++ exim-4.66/src/configure.default 2007-02-08 10:16:17.000000000 +0000 +@@ -105,6 +105,7 @@ hostlist relay_from_hosts = 127.0.0.1 + # manual for details. The lists above are used in the access control lists for + # checking incoming messages. The names of these ACLs are defined here: + ++acl_smtp_mail = acl_check_mail + acl_smtp_rcpt = acl_check_rcpt + acl_smtp_data = acl_check_data + acl_smtp_mime = acl_check_mime +@@ -318,6 +319,29 @@ timeout_frozen_after = 7d + + begin acl + ++ ++# This access control list is used for the MAIL command in an incoming ++# SMTP message. ++ ++acl_check_mail: ++ ++ # Hosts are required to say HELO (or EHLO) before sending mail. ++ # So don't allow them to use the MAIL command if they haven't ++ # done so. ++ ++ deny condition = ${if eq{$sender_helo_name}{} {1}} ++ message = Nice boys say HELO first ++ ++ # Use the lack of reverse DNS to trigger greylisting. Some people ++ # even reject for it but that would be a little excessive. ++ ++ warn condition = ${if eq{$sender_host_name}{} {1}} ++ set acl_m_greylistreasons = Host $sender_host_address lacks reverse DNS\n$acl_m_greylistreasons ++ ++ accept ++ ++ ++ + # This access control list is used for every RCPT command in an incoming + # SMTP message. The tests are run in order until the address is either + # accepted or denied. +@@ -435,7 +459,8 @@ acl_check_rcpt: # There are no default checks on DNS black lists because the domains that # contain these lists are changing all the time. However, here are two # examples of how you can get Exim to perform a DNS black list lookup at this @@ -10,7 +48,7 @@ # # deny message = rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text # dnslists = black.list.example -@@ -443,6 +444,10 @@ acl_check_rcpt: +@@ -443,6 +468,10 @@ acl_check_rcpt: # warn dnslists = black.list.example # add_header = X-Warning: $sender_host_address is in a black list at $dnslist_domain # log_message = found in $dnslist_domain @@ -21,7 +59,7 @@ ############################################################################# ############################################################################# -@@ -456,6 +461,10 @@ acl_check_rcpt: +@@ -456,6 +485,10 @@ acl_check_rcpt: # require verify = csa ############################################################################# @@ -32,7 +70,7 @@ # At this point, the address has passed all the checks that have been # configured, so we accept it unconditionally. -@@ -481,6 +490,12 @@ acl_check_data: +@@ -481,6 +514,12 @@ acl_check_data: # deny condition = ${if !def:h_Message-ID: {1}} # message = RFC2822 says that all mail SHOULD have a Message-ID header.\n\ # Most messages without it are spam, so your mail has been rejected. @@ -45,7 +83,7 @@ # Deny if the message contains a virus. Before enabling this check, you # must install a virus scanner and set the av_scanner option above. -@@ -515,8 +530,30 @@ acl_check_data: +@@ -515,8 +554,30 @@ acl_check_data: # message = Your message scored $spam_score SpamAssassin point. Report follows:\n\ # $spam_report From fedora-extras-commits at redhat.com Thu Feb 8 10:38:27 2007 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Thu, 8 Feb 2007 05:38:27 -0500 Subject: rpms/exim/devel exim.spec,1.36,1.37 Message-ID: <200702081038.l18AcRr0025467@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25447 Modified Files: exim.spec Log Message: build with updated greylist bits Index: exim.spec =================================================================== RCS file: /cvs/extras/rpms/exim/devel/exim.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- exim.spec 7 Feb 2007 12:18:24 -0000 1.36 +++ exim.spec 8 Feb 2007 10:37:55 -0000 1.37 @@ -12,7 +12,7 @@ Summary: The exim mail transfer agent Name: exim Version: 4.66 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Url: http://www.exim.org/ Group: System Environment/Daemons @@ -445,6 +445,10 @@ %{_sysconfdir}/cron.daily/greylist-tidy.sh %changelog +* Thu Feb 8 2007 David Woodhouse 4.66-3 +- Improve documentation and error handling in greylist ACL. +- Require HELO before mail + * Wed Feb 7 2007 David Woodhouse 4.66-2 - Add example of greylisting implementation in Exim ACLs From fedora-extras-commits at redhat.com Thu Feb 8 10:41:32 2007 From: fedora-extras-commits at redhat.com (Thorsten Scherf (tscherf)) Date: Thu, 8 Feb 2007 05:41:32 -0500 Subject: rpms/prelude-manager/devel prelude-manager.spec,1.1,1.2 Message-ID: <200702081041.l18AfWA9025581@cvs-int.fedora.redhat.com> Author: tscherf Update of /cvs/extras/rpms/prelude-manager/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25559 Modified Files: prelude-manager.spec Log Message: Trac #153 Fix Index: prelude-manager.spec =================================================================== RCS file: /cvs/extras/rpms/prelude-manager/devel/prelude-manager.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- prelude-manager.spec 8 Jan 2007 16:03:24 -0000 1.1 +++ prelude-manager.spec 8 Feb 2007 10:41:00 -0000 1.2 @@ -1,6 +1,6 @@ Name: prelude-manager Version: 0.9.7.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Prelude-Manager Group: Applications/Internet @@ -100,6 +100,7 @@ rm -rf %{buildroot} mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version} mkdir -p %{buildroot}/%{_initrddir} +mkdir -p %{buildroot}/%{_var}/spool/prelude-manager/scheduler make install DESTDIR=%{buildroot} INSTALL="%{__install} -c -p" cp -p AUTHORS ChangeLog README NEWS COPYING HACKING.README \ %{buildroot}%{_defaultdocdir}/%{name}-%{version} @@ -143,6 +144,7 @@ %dir %{_libdir}/%{name}/decodes/ %{_libdir}/%{name}/decodes/*.so %dir %{_localstatedir}/spool/%{name}/ +%dir %{_localstatedir}/spool/%{name}/scheduler %dir %{_localstatedir}/run/%{name}/ %dir %{_datadir}/%{name}/ %dir %{_defaultdocdir}/%{name}-%{version}/ @@ -165,6 +167,9 @@ %changelog +* Thu Feb 08 2007 Thorsten Scherf 0.9.7.1-4 +- fixed Prelude trac #193 + * Sun Jan 07 2007 Thorsten Scherf 0.9.7.1-3 - added tcp-wrapper support - fixed dirowner and permissions problem From fedora-extras-commits at redhat.com Thu Feb 8 10:45:02 2007 From: fedora-extras-commits at redhat.com (Thorsten Scherf (tscherf)) Date: Thu, 8 Feb 2007 05:45:02 -0500 Subject: rpms/prelude-manager/FC-5 prelude-manager.spec,1.1,1.2 Message-ID: <200702081045.l18Aj22R025693@cvs-int.fedora.redhat.com> Author: tscherf Update of /cvs/extras/rpms/prelude-manager/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25672 Modified Files: prelude-manager.spec Log Message: Trac #153 Fix Index: prelude-manager.spec =================================================================== RCS file: /cvs/extras/rpms/prelude-manager/FC-5/prelude-manager.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- prelude-manager.spec 8 Jan 2007 16:03:24 -0000 1.1 +++ prelude-manager.spec 8 Feb 2007 10:44:30 -0000 1.2 @@ -1,6 +1,6 @@ Name: prelude-manager Version: 0.9.7.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Prelude-Manager Group: Applications/Internet @@ -100,6 +100,7 @@ rm -rf %{buildroot} mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version} mkdir -p %{buildroot}/%{_initrddir} +mkdir -p %{buildroot}/%{_var}/spool/prelude-manager/scheduler make install DESTDIR=%{buildroot} INSTALL="%{__install} -c -p" cp -p AUTHORS ChangeLog README NEWS COPYING HACKING.README \ %{buildroot}%{_defaultdocdir}/%{name}-%{version} @@ -143,6 +144,7 @@ %dir %{_libdir}/%{name}/decodes/ %{_libdir}/%{name}/decodes/*.so %dir %{_localstatedir}/spool/%{name}/ +%dir %{_localstatedir}/spool/%{name}/scheduler %dir %{_localstatedir}/run/%{name}/ %dir %{_datadir}/%{name}/ %dir %{_defaultdocdir}/%{name}-%{version}/ @@ -165,6 +167,9 @@ %changelog +* Thu Feb 08 2007 Thorsten Scherf 0.9.7.1-4 +- fixed Prelude trac #193 + * Sun Jan 07 2007 Thorsten Scherf 0.9.7.1-3 - added tcp-wrapper support - fixed dirowner and permissions problem From fedora-extras-commits at redhat.com Thu Feb 8 10:46:49 2007 From: fedora-extras-commits at redhat.com (Thorsten Scherf (tscherf)) Date: Thu, 8 Feb 2007 05:46:49 -0500 Subject: rpms/prelude-manager/FC-6 prelude-manager.spec,1.1,1.2 Message-ID: <200702081046.l18Akn2d025763@cvs-int.fedora.redhat.com> Author: tscherf Update of /cvs/extras/rpms/prelude-manager/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25746 Modified Files: prelude-manager.spec Log Message: Trac #153 Fix Index: prelude-manager.spec =================================================================== RCS file: /cvs/extras/rpms/prelude-manager/FC-6/prelude-manager.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- prelude-manager.spec 8 Jan 2007 16:03:24 -0000 1.1 +++ prelude-manager.spec 8 Feb 2007 10:46:17 -0000 1.2 @@ -1,6 +1,6 @@ Name: prelude-manager Version: 0.9.7.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Prelude-Manager Group: Applications/Internet @@ -100,6 +100,7 @@ rm -rf %{buildroot} mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version} mkdir -p %{buildroot}/%{_initrddir} +mkdir -p %{buildroot}/%{_var}/spool/prelude-manager/scheduler make install DESTDIR=%{buildroot} INSTALL="%{__install} -c -p" cp -p AUTHORS ChangeLog README NEWS COPYING HACKING.README \ %{buildroot}%{_defaultdocdir}/%{name}-%{version} @@ -143,6 +144,7 @@ %dir %{_libdir}/%{name}/decodes/ %{_libdir}/%{name}/decodes/*.so %dir %{_localstatedir}/spool/%{name}/ +%dir %{_localstatedir}/spool/%{name}/scheduler %dir %{_localstatedir}/run/%{name}/ %dir %{_datadir}/%{name}/ %dir %{_defaultdocdir}/%{name}-%{version}/ @@ -165,6 +167,9 @@ %changelog +* Thu Feb 08 2007 Thorsten Scherf 0.9.7.1-4 +- fixed Prelude trac #193 + * Sun Jan 07 2007 Thorsten Scherf 0.9.7.1-3 - added tcp-wrapper support - fixed dirowner and permissions problem From fedora-extras-commits at redhat.com Thu Feb 8 12:13:03 2007 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Thu, 8 Feb 2007 07:13:03 -0500 Subject: rpms/kicad/devel kicad-2006.08.28.rpm.opt.flags.diff, NONE, 1.1 kicad.spec, 1.5, 1.6 Message-ID: <200702081213.l18CD3fw000413@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/kicad/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv386 Modified Files: kicad.spec Added Files: kicad-2006.08.28.rpm.opt.flags.diff Log Message: - Add patch to build with RPM_OPT_FLAGS and remove -s from LDFLAGS Contribution of Ville Skytt?? Fix #227757 - Fix typo in french summary kicad-2006.08.28.rpm.opt.flags.diff: --- NEW FILE kicad-2006.08.28.rpm.opt.flags.diff --- --- kicad-dev/eeschema/makefile.gtk~ 2007-02-07 23:33:48.000000000 +0200 +++ kicad-dev/eeschema/makefile.gtk 2007-02-08 00:13:19.000000000 +0200 @@ -6,14 +6,14 @@ FINAL = 1 -LDFLAGS = -s +LDFLAGS = include ../libs.linux TARGET = eeschema -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) all: $(TARGET) --- kicad-dev/common/makefile.gtk~ 2006-06-02 13:45:44.000000000 +0300 +++ kicad-dev/common/makefile.gtk 2007-02-08 00:13:05.000000000 +0200 @@ -2,7 +2,7 @@ CC = gcc # Compiler flags. -CPPFLAGS = -Wall -O2 -I./ -I../include `wx-config --cflags` +CPPFLAGS = -Wall -O2 -I./ -I../include `wx-config --cflags` $(RPM_OPT_FLAGS) EDACPPFLAGS = $(CPPFLAGS) --- kicad-dev/pcbnew/makefile.gtk~ 2007-02-07 23:33:48.000000000 +0200 +++ kicad-dev/pcbnew/makefile.gtk 2007-02-08 00:13:00.000000000 +0200 @@ -4,9 +4,9 @@ # Compiler flags. -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) -LDFLAGS = -s +LDFLAGS = include ../libs.linux --- kicad-dev/cvpcb/makefile.gtk~ 2007-02-07 23:33:48.000000000 +0200 +++ kicad-dev/cvpcb/makefile.gtk 2007-02-08 00:12:50.000000000 +0200 @@ -8,9 +8,9 @@ # Compiler flags. -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) -LDFLAGS = -s +LDFLAGS = EDACPPFLAGS = $(CPPFLAGS) --- kicad-dev/kicad/makefile.gtk~ 2007-02-07 23:33:48.000000000 +0200 +++ kicad-dev/kicad/makefile.gtk 2007-02-08 00:12:43.000000000 +0200 @@ -7,8 +7,8 @@ FINAL = 1 # Compiler flags. -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` -LDFLAGS = -s +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) +LDFLAGS = include ../libs.linux --- kicad-dev/gerbview/makefile.gtk~ 2007-02-07 23:33:48.000000000 +0200 +++ kicad-dev/gerbview/makefile.gtk 2007-02-08 00:12:35.000000000 +0200 @@ -3,9 +3,9 @@ LD = gcc # Compiler flags. -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) -LDFLAGS = -s +LDFLAGS = include ../libs.linux --- kicad-dev/3d-viewer/makefile.gtk~ 2006-06-02 13:45:52.000000000 +0300 +++ kicad-dev/3d-viewer/makefile.gtk 2007-02-08 00:12:26.000000000 +0200 @@ -4,7 +4,7 @@ # Compiler flags. CPPFLAGS = -Wall -O2 -DPCBNEW -I../pcbnew -I ../include -I../common\ - `wx-config --cxxflags` + `wx-config --cxxflags` $(RPM_OPT_FLAGS) include ../libs.linux Index: kicad.spec =================================================================== RCS file: /cvs/extras/rpms/kicad/devel/kicad.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- kicad.spec 28 Dec 2006 22:01:28 -0000 1.5 +++ kicad.spec 8 Feb 2007 12:12:31 -0000 1.6 @@ -1,8 +1,8 @@ Name: kicad Version: 2006.08.28 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Electronic schematic diagrams and printed circuit board artwork -Summary(fr): Saisie de sch??ma ??lectronique et trac?? de cicrcuit imprim?? +Summary(fr): Saisie de sch??ma ??lectronique et trac?? de circuit imprim?? Group: Applications/Engineering License: GPL @@ -11,6 +11,7 @@ Source1: http://linuxelectronique.free.fr/download/kicad-src-extras-2006-08-28.tar.bz2 Source2: %{name}.desktop Patch: %{name}-%{version}.destdir.diff +Patch1: %{name}-%{version}.rpm.opt.flags.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: wxGTK @@ -53,6 +54,7 @@ done %patch0 -p1 +%patch1 -p1 %build @@ -243,6 +245,12 @@ %{_datadir}/pixmaps/kicad_icon.png %changelog +* Thu Feb 8 2007 Alain Portal 2006.08.28-4 + - Add patch to build with RPM_OPT_FLAGS and remove -s from LDFLAGS + Contribution of Ville Skytt?? + Fix #227757 + - Fix typo in french summary + * Thu Dec 28 2006 Jason L Tibbitts III 2006.08.28-3 - Rebuild with wxGTK 2.8. From fedora-extras-commits at redhat.com Thu Feb 8 12:18:52 2007 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Thu, 8 Feb 2007 07:18:52 -0500 Subject: rpms/kicad/FC-6 kicad-2006.08.28.rpm.opt.flags.diff, NONE, 1.1 kicad.spec, 1.4, 1.5 Message-ID: <200702081218.l18CIqeR000513@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/kicad/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv492 Modified Files: kicad.spec Added Files: kicad-2006.08.28.rpm.opt.flags.diff Log Message: - Add patch to build with RPM_OPT_FLAGS and remove -s from LDFLAGS Contribution of Ville Skytt?? Fix #227757 - Fix typo in french summary kicad-2006.08.28.rpm.opt.flags.diff: --- NEW FILE kicad-2006.08.28.rpm.opt.flags.diff --- --- kicad-dev/eeschema/makefile.gtk~ 2007-02-07 23:33:48.000000000 +0200 +++ kicad-dev/eeschema/makefile.gtk 2007-02-08 00:13:19.000000000 +0200 @@ -6,14 +6,14 @@ FINAL = 1 -LDFLAGS = -s +LDFLAGS = include ../libs.linux TARGET = eeschema -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) all: $(TARGET) --- kicad-dev/common/makefile.gtk~ 2006-06-02 13:45:44.000000000 +0300 +++ kicad-dev/common/makefile.gtk 2007-02-08 00:13:05.000000000 +0200 @@ -2,7 +2,7 @@ CC = gcc # Compiler flags. -CPPFLAGS = -Wall -O2 -I./ -I../include `wx-config --cflags` +CPPFLAGS = -Wall -O2 -I./ -I../include `wx-config --cflags` $(RPM_OPT_FLAGS) EDACPPFLAGS = $(CPPFLAGS) --- kicad-dev/pcbnew/makefile.gtk~ 2007-02-07 23:33:48.000000000 +0200 +++ kicad-dev/pcbnew/makefile.gtk 2007-02-08 00:13:00.000000000 +0200 @@ -4,9 +4,9 @@ # Compiler flags. -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) -LDFLAGS = -s +LDFLAGS = include ../libs.linux --- kicad-dev/cvpcb/makefile.gtk~ 2007-02-07 23:33:48.000000000 +0200 +++ kicad-dev/cvpcb/makefile.gtk 2007-02-08 00:12:50.000000000 +0200 @@ -8,9 +8,9 @@ # Compiler flags. -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) -LDFLAGS = -s +LDFLAGS = EDACPPFLAGS = $(CPPFLAGS) --- kicad-dev/kicad/makefile.gtk~ 2007-02-07 23:33:48.000000000 +0200 +++ kicad-dev/kicad/makefile.gtk 2007-02-08 00:12:43.000000000 +0200 @@ -7,8 +7,8 @@ FINAL = 1 # Compiler flags. -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` -LDFLAGS = -s +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) +LDFLAGS = include ../libs.linux --- kicad-dev/gerbview/makefile.gtk~ 2007-02-07 23:33:48.000000000 +0200 +++ kicad-dev/gerbview/makefile.gtk 2007-02-08 00:12:35.000000000 +0200 @@ -3,9 +3,9 @@ LD = gcc # Compiler flags. -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) -LDFLAGS = -s +LDFLAGS = include ../libs.linux --- kicad-dev/3d-viewer/makefile.gtk~ 2006-06-02 13:45:52.000000000 +0300 +++ kicad-dev/3d-viewer/makefile.gtk 2007-02-08 00:12:26.000000000 +0200 @@ -4,7 +4,7 @@ # Compiler flags. CPPFLAGS = -Wall -O2 -DPCBNEW -I../pcbnew -I ../include -I../common\ - `wx-config --cxxflags` + `wx-config --cxxflags` $(RPM_OPT_FLAGS) include ../libs.linux Index: kicad.spec =================================================================== RCS file: /cvs/extras/rpms/kicad/FC-6/kicad.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- kicad.spec 4 Oct 2006 22:28:36 -0000 1.4 +++ kicad.spec 8 Feb 2007 12:18:20 -0000 1.5 @@ -1,6 +1,6 @@ Name: kicad Version: 2006.08.28 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Electronic schematic diagrams and printed circuit board artwork Summary(fr): Saisie de sch??ma ??lectronique et trac?? de cicrcuit imprim?? @@ -11,6 +11,7 @@ Source1: http://linuxelectronique.free.fr/download/kicad-src-extras-2006-08-28.tar.bz2 Source2: %{name}.desktop Patch: %{name}-%{version}.destdir.diff +Patch1: %{name}-%{version}.rpm.opt.flags.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: wxGTK @@ -53,6 +54,7 @@ done %patch0 -p1 +%patch1 -p1 %build @@ -243,6 +245,12 @@ %{_datadir}/pixmaps/kicad_icon.png %changelog +* Thu Feb 8 2007 Alain Portal 2006.08.28-3 + - Add patch to build with RPM_OPT_FLAGS and remove -s from LDFLAGS + Contribution of Ville Skytt?? + Fix #227757 + - Fix typo in french summary + * Thu Oct 05 2006 Christian Iseli 2006.08.28-2 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 From fedora-extras-commits at redhat.com Thu Feb 8 12:20:10 2007 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Thu, 8 Feb 2007 07:20:10 -0500 Subject: rpms/kicad/FC-6 kicad.spec,1.5,1.6 Message-ID: <200702081220.l18CKApe000540@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/kicad/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv521 Modified Files: kicad.spec Log Message: Really fix typo :( Index: kicad.spec =================================================================== RCS file: /cvs/extras/rpms/kicad/FC-6/kicad.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- kicad.spec 8 Feb 2007 12:18:20 -0000 1.5 +++ kicad.spec 8 Feb 2007 12:19:38 -0000 1.6 @@ -2,7 +2,7 @@ Version: 2006.08.28 Release: 3%{?dist} Summary: Electronic schematic diagrams and printed circuit board artwork -Summary(fr): Saisie de sch??ma ??lectronique et trac?? de cicrcuit imprim?? +Summary(fr): Saisie de sch??ma ??lectronique et trac?? de circuit imprim?? Group: Applications/Engineering License: GPL From fedora-extras-commits at redhat.com Thu Feb 8 12:22:55 2007 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Thu, 8 Feb 2007 07:22:55 -0500 Subject: rpms/kicad/FC-5 kicad-2006.08.28.rpm.opt.flags.diff, NONE, 1.1 kicad.spec, 1.2, 1.3 Message-ID: <200702081222.l18CMtdC000631@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/kicad/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv609 Modified Files: kicad.spec Added Files: kicad-2006.08.28.rpm.opt.flags.diff Log Message: - Add patch to build with RPM_OPT_FLAGS and remove -s from LDFLAGS Contribution of Ville Skytt?? Fix #227757 - Fix typo in french summary kicad-2006.08.28.rpm.opt.flags.diff: --- NEW FILE kicad-2006.08.28.rpm.opt.flags.diff --- --- kicad-dev/eeschema/makefile.gtk~ 2007-02-07 23:33:48.000000000 +0200 +++ kicad-dev/eeschema/makefile.gtk 2007-02-08 00:13:19.000000000 +0200 @@ -6,14 +6,14 @@ FINAL = 1 -LDFLAGS = -s +LDFLAGS = include ../libs.linux TARGET = eeschema -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) all: $(TARGET) --- kicad-dev/common/makefile.gtk~ 2006-06-02 13:45:44.000000000 +0300 +++ kicad-dev/common/makefile.gtk 2007-02-08 00:13:05.000000000 +0200 @@ -2,7 +2,7 @@ CC = gcc # Compiler flags. -CPPFLAGS = -Wall -O2 -I./ -I../include `wx-config --cflags` +CPPFLAGS = -Wall -O2 -I./ -I../include `wx-config --cflags` $(RPM_OPT_FLAGS) EDACPPFLAGS = $(CPPFLAGS) --- kicad-dev/pcbnew/makefile.gtk~ 2007-02-07 23:33:48.000000000 +0200 +++ kicad-dev/pcbnew/makefile.gtk 2007-02-08 00:13:00.000000000 +0200 @@ -4,9 +4,9 @@ # Compiler flags. -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) -LDFLAGS = -s +LDFLAGS = include ../libs.linux --- kicad-dev/cvpcb/makefile.gtk~ 2007-02-07 23:33:48.000000000 +0200 +++ kicad-dev/cvpcb/makefile.gtk 2007-02-08 00:12:50.000000000 +0200 @@ -8,9 +8,9 @@ # Compiler flags. -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) -LDFLAGS = -s +LDFLAGS = EDACPPFLAGS = $(CPPFLAGS) --- kicad-dev/kicad/makefile.gtk~ 2007-02-07 23:33:48.000000000 +0200 +++ kicad-dev/kicad/makefile.gtk 2007-02-08 00:12:43.000000000 +0200 @@ -7,8 +7,8 @@ FINAL = 1 # Compiler flags. -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` -LDFLAGS = -s +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) +LDFLAGS = include ../libs.linux --- kicad-dev/gerbview/makefile.gtk~ 2007-02-07 23:33:48.000000000 +0200 +++ kicad-dev/gerbview/makefile.gtk 2007-02-08 00:12:35.000000000 +0200 @@ -3,9 +3,9 @@ LD = gcc # Compiler flags. -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) -LDFLAGS = -s +LDFLAGS = include ../libs.linux --- kicad-dev/3d-viewer/makefile.gtk~ 2006-06-02 13:45:52.000000000 +0300 +++ kicad-dev/3d-viewer/makefile.gtk 2007-02-08 00:12:26.000000000 +0200 @@ -4,7 +4,7 @@ # Compiler flags. CPPFLAGS = -Wall -O2 -DPCBNEW -I../pcbnew -I ../include -I../common\ - `wx-config --cxxflags` + `wx-config --cxxflags` $(RPM_OPT_FLAGS) include ../libs.linux Index: kicad.spec =================================================================== RCS file: /cvs/extras/rpms/kicad/FC-5/kicad.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kicad.spec 22 Sep 2006 14:00:19 -0000 1.2 +++ kicad.spec 8 Feb 2007 12:22:23 -0000 1.3 @@ -1,8 +1,8 @@ Name: kicad Version: 2006.08.28 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Electronic schematic diagrams and printed circuit board artwork -Summary(fr): Saisie de sch??ma ??lectronique et trac?? de cicrcuit imprim?? +Summary(fr): Saisie de sch??ma ??lectronique et trac?? de circuit imprim?? Group: Applications/Engineering License: GPL @@ -11,6 +11,7 @@ Source1: http://linuxelectronique.free.fr/download/kicad-src-extras-2006-08-28.tar.bz2 Source2: %{name}.desktop Patch: %{name}-%{version}.destdir.diff +Patch1: %{name}-%{version}.rpm.opt.flags.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: wxGTK @@ -53,6 +54,7 @@ done %patch0 -p1 +%patch1 -p1 %build @@ -243,6 +245,12 @@ %{_datadir}/pixmaps/kicad_icon.png %changelog +* Thu Feb 8 2007 Alain Portal 2006.08.28-2 + - Add patch to build with RPM_OPT_FLAGS and remove -s from LDFLAGS + Contribution of Ville Skytt?? + Fix #227757 + - Fix typo in french summary + * Fri Sep 22 2006 Alain Portal 2006.08.28-1 - New upstream version - Use macro style instead of variable style From fedora-extras-commits at redhat.com Thu Feb 8 12:26:03 2007 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Thu, 8 Feb 2007 07:26:03 -0500 Subject: rpms/kicad/FC-4 kicad-2006.08.28.rpm.opt.flags.diff, NONE, 1.1 kicad.spec, 1.2, 1.3 Message-ID: <200702081226.l18CQ3OR000712@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/kicad/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv684 Modified Files: kicad.spec Added Files: kicad-2006.08.28.rpm.opt.flags.diff Log Message: - Add patch to build with RPM_OPT_FLAGS and remove -s from LDFLAGS Contribution of Ville Skytt?? Fix #227757 - Fix typo in french summary kicad-2006.08.28.rpm.opt.flags.diff: --- NEW FILE kicad-2006.08.28.rpm.opt.flags.diff --- --- kicad-dev/eeschema/makefile.gtk~ 2007-02-07 23:33:48.000000000 +0200 +++ kicad-dev/eeschema/makefile.gtk 2007-02-08 00:13:19.000000000 +0200 @@ -6,14 +6,14 @@ FINAL = 1 -LDFLAGS = -s +LDFLAGS = include ../libs.linux TARGET = eeschema -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) all: $(TARGET) --- kicad-dev/common/makefile.gtk~ 2006-06-02 13:45:44.000000000 +0300 +++ kicad-dev/common/makefile.gtk 2007-02-08 00:13:05.000000000 +0200 @@ -2,7 +2,7 @@ CC = gcc # Compiler flags. -CPPFLAGS = -Wall -O2 -I./ -I../include `wx-config --cflags` +CPPFLAGS = -Wall -O2 -I./ -I../include `wx-config --cflags` $(RPM_OPT_FLAGS) EDACPPFLAGS = $(CPPFLAGS) --- kicad-dev/pcbnew/makefile.gtk~ 2007-02-07 23:33:48.000000000 +0200 +++ kicad-dev/pcbnew/makefile.gtk 2007-02-08 00:13:00.000000000 +0200 @@ -4,9 +4,9 @@ # Compiler flags. -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) -LDFLAGS = -s +LDFLAGS = include ../libs.linux --- kicad-dev/cvpcb/makefile.gtk~ 2007-02-07 23:33:48.000000000 +0200 +++ kicad-dev/cvpcb/makefile.gtk 2007-02-08 00:12:50.000000000 +0200 @@ -8,9 +8,9 @@ # Compiler flags. -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) -LDFLAGS = -s +LDFLAGS = EDACPPFLAGS = $(CPPFLAGS) --- kicad-dev/kicad/makefile.gtk~ 2007-02-07 23:33:48.000000000 +0200 +++ kicad-dev/kicad/makefile.gtk 2007-02-08 00:12:43.000000000 +0200 @@ -7,8 +7,8 @@ FINAL = 1 # Compiler flags. -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` -LDFLAGS = -s +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) +LDFLAGS = include ../libs.linux --- kicad-dev/gerbview/makefile.gtk~ 2007-02-07 23:33:48.000000000 +0200 +++ kicad-dev/gerbview/makefile.gtk 2007-02-08 00:12:35.000000000 +0200 @@ -3,9 +3,9 @@ LD = gcc # Compiler flags. -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) -LDFLAGS = -s +LDFLAGS = include ../libs.linux --- kicad-dev/3d-viewer/makefile.gtk~ 2006-06-02 13:45:52.000000000 +0300 +++ kicad-dev/3d-viewer/makefile.gtk 2007-02-08 00:12:26.000000000 +0200 @@ -4,7 +4,7 @@ # Compiler flags. CPPFLAGS = -Wall -O2 -DPCBNEW -I../pcbnew -I ../include -I../common\ - `wx-config --cxxflags` + `wx-config --cxxflags` $(RPM_OPT_FLAGS) include ../libs.linux Index: kicad.spec =================================================================== RCS file: /cvs/extras/rpms/kicad/FC-4/kicad.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kicad.spec 22 Sep 2006 13:59:46 -0000 1.2 +++ kicad.spec 8 Feb 2007 12:25:30 -0000 1.3 @@ -1,8 +1,8 @@ Name: kicad Version: 2006.08.28 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Electronic schematic diagrams and printed circuit board artwork -Summary(fr): Saisie de sch??ma ??lectronique et trac?? de cicrcuit imprim?? +Summary(fr): Saisie de sch??ma ??lectronique et trac?? de circuit imprim?? Group: Applications/Engineering License: GPL @@ -11,6 +11,7 @@ Source1: http://linuxelectronique.free.fr/download/kicad-src-extras-2006-08-28.tar.bz2 Source2: %{name}.desktop Patch: %{name}-%{version}.destdir.diff +Patch1: %{name}-%{version}.rpm.opt.flags.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: wxGTK @@ -53,6 +54,7 @@ done %patch0 -p1 +%patch1 -p1 %build @@ -243,6 +245,12 @@ %{_datadir}/pixmaps/kicad_icon.png %changelog +* Thu Feb 8 2007 Alain Portal 2006.08.28-2 + - Add patch to build with RPM_OPT_FLAGS and remove -s from LDFLAGS + Contribution of Ville Skytt?? + Fix #227757 + - Fix typo in french summary + * Fri Sep 22 2006 Alain Portal 2006.08.28-1 - New upstream version - Use macro style instead of variable style From fedora-extras-commits at redhat.com Thu Feb 8 13:21:36 2007 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Thu, 8 Feb 2007 08:21:36 -0500 Subject: rpms/kicad/devel kicad-2007.01.15.destdir.diff, NONE, 1.1 kicad-2007.01.15.rpm.opt.flags.diff, NONE, 1.1 .cvsignore, 1.3, 1.4 kicad.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200702081321.l18DLag4004462@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/kicad/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4435 Modified Files: .cvsignore kicad.spec sources Added Files: kicad-2007.01.15.destdir.diff kicad-2007.01.15.rpm.opt.flags.diff Log Message: New upstream version kicad-2007.01.15.destdir.diff: --- NEW FILE kicad-2007.01.15.destdir.diff --- diff -ru kicad-dev/cvpcb/makefile.gtk kicad-dev-fedora/cvpcb/makefile.gtk --- kicad-dev/cvpcb/makefile.gtk 2006-05-09 08:42:12.000000000 +0200 +++ kicad-dev-fedora/cvpcb/makefile.gtk 2007-02-07 16:39:09.000000000 +0100 @@ -31,9 +31,9 @@ $(LD) $(OBJECTS) $(LDFLAGS) $(LIBVIEWER3D) $(LIBS_WITH_GL) -o $(TARGET) -install: - cp -f $(TARGET) $(KICAD_BIN) - +install: + cp -f $(TARGET) $(DESTDIR)$(KICAD_BIN) + clean: rm *.o rm $(TARGET) diff -ru kicad-dev/eeschema/makefile.gtk kicad-dev-fedora/eeschema/makefile.gtk --- kicad-dev/eeschema/makefile.gtk 2006-06-02 13:45:48.000000000 +0200 +++ kicad-dev-fedora/eeschema/makefile.gtk 2007-02-07 16:39:35.000000000 +0100 @@ -31,7 +31,7 @@ install: - cp $(TARGET) $(KICAD_BIN) + cp $(TARGET) $(DESTDIR)$(KICAD_BIN) clean: diff -ru kicad-dev/gerbview/makefile.gtk kicad-dev-fedora/gerbview/makefile.gtk --- kicad-dev/gerbview/makefile.gtk 2006-06-02 13:45:54.000000000 +0200 +++ kicad-dev-fedora/gerbview/makefile.gtk 2007-02-07 16:39:47.000000000 +0100 @@ -21,10 +21,10 @@ $(TARGET): $(OBJECTS) makefile.gtk makefile.include $(EXTRALIBS) ../libs.linux - $(LD) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) - + $(LD) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) + install: - cp $(TARGET) $(KICAD_BIN) + cp $(TARGET) $(DESTDIR)$(KICAD_BIN) clean: diff -ru kicad-dev/kicad/makefile.gtk kicad-dev-fedora/kicad/makefile.gtk --- kicad-dev/kicad/makefile.gtk 2006-10-16 13:34:02.000000000 +0200 +++ kicad-dev-fedora/kicad/makefile.gtk 2007-02-07 16:40:08.000000000 +0100 @@ -26,7 +26,7 @@ $(LD) $(OBJECTS) $(LDFLAGS) $(LIBS) -o $(TARGET) install: - cp -f $(TARGET) $(KICAD_BIN) + cp -f $(TARGET) $(DESTDIR)$(KICAD_BIN) clean: rm -f *.o; diff -ru kicad-dev/libs.linux kicad-dev-fedora/libs.linux --- kicad-dev/libs.linux 2006-11-14 16:01:20.000000000 +0100 +++ kicad-dev-fedora/libs.linux 2007-02-07 17:03:43.000000000 +0100 @@ -1,6 +1,6 @@ #Configuration for build kicad -KICAD_BIN = /usr/local/kicad/linux +KICAD_BIN = /usr/bin SRCSUFF = .cpp @@ -11,10 +11,10 @@ # You must comment or uncomment this line for dynamic or static link # dynamic link is less difficult than static link # choose it if you have problems (libs not found, or unresolved references) ), or if kicad is running only on YOUR system. -KICAD_STATIC_LINK = 1 +# KICAD_STATIC_LINK = 1 # path and version definition for wxWidgets and mesa libs -MESALIBSPATH = /usr/local/lib +MESALIBSPATH = /usr/lib WXPATH = `wx-config --prefix`/lib PREFIX_WX_LIBS = lib`wx-config --basename` SUFFIX_WX_LIBSTD = `wx-config --utility=` @@ -69,11 +69,11 @@ endif -# attention ? l'ordre des libairies -LIBS = -L/usr/local/lib -L/usr/X11R6/lib\ +# attention ???l'ordre des libairies +LIBS = -L/usr/lib -L/usr/X11R6/lib\ $(EXTRALIBS) $(WXSYSLIB)\ $(LIBSTDC) -LIBS_WITH_GL = -L/usr/local/lib -L/usr/X11R6/lib\ +LIBS_WITH_GL = -L/usr/lib -L/usr/X11R6/lib\ $(EXTRALIBS) $(WXSYSLIB_WITH_GL)\ $(LIBSTDC) Seulement dans kicad-dev-fedora: libs.linux~ diff -ru kicad-dev/pcbnew/makefile.gtk kicad-dev-fedora/pcbnew/makefile.gtk --- kicad-dev/pcbnew/makefile.gtk 2006-06-02 13:45:50.000000000 +0200 +++ kicad-dev-fedora/pcbnew/makefile.gtk 2007-02-07 16:40:27.000000000 +0100 @@ -23,11 +23,11 @@ $(TARGET): $(OBJECTS) makefile.gtk makefile.include $(LIBVIEWER3D) $(EXTRALIBS) ../libs.linux $(LD) $(LDFLAGS) $(OBJECTS) $(LIBVIEWER3D) $(LIBS_WITH_GL)\ - -o $(TARGET) - - + -o $(TARGET) + + install: - cp $(TARGET) $(KICAD_BIN) + cp $(TARGET) $(DESTDIR)$(KICAD_BIN) clean: kicad-2007.01.15.rpm.opt.flags.diff: --- NEW FILE kicad-2007.01.15.rpm.opt.flags.diff --- diff -ru kicad-dev/3d-viewer/makefile.gtk kicad-dev-fedora/3d-viewer/makefile.gtk --- kicad-dev/3d-viewer/makefile.gtk 2006-06-02 13:45:52.000000000 +0200 +++ kicad-dev-fedora/3d-viewer/makefile.gtk 2007-02-08 13:53:45.000000000 +0100 @@ -4,7 +4,7 @@ # Compiler flags. CPPFLAGS = -Wall -O2 -DPCBNEW -I../pcbnew -I ../include -I../common\ - `wx-config --cxxflags` + `wx-config --cxxflags` $(RPM_OPT_FLAGS) include ../libs.linux diff -ru kicad-dev/common/makefile.gtk kicad-dev-fedora/common/makefile.gtk --- kicad-dev/common/makefile.gtk 2006-06-02 13:45:44.000000000 +0200 +++ kicad-dev-fedora/common/makefile.gtk 2007-02-08 13:54:14.000000000 +0100 @@ -2,7 +2,7 @@ CC = gcc # Compiler flags. -CPPFLAGS = -Wall -O2 -I./ -I../include `wx-config --cflags` +CPPFLAGS = -Wall -O2 -I./ -I../include `wx-config --cflags` $(RPM_OPT_FLAGS) EDACPPFLAGS = $(CPPFLAGS) diff -ru kicad-dev/cvpcb/makefile.gtk kicad-dev-fedora/cvpcb/makefile.gtk --- kicad-dev/cvpcb/makefile.gtk 2007-02-07 16:39:09.000000000 +0100 +++ kicad-dev-fedora/cvpcb/makefile.gtk 2007-02-08 13:54:41.000000000 +0100 @@ -8,9 +8,9 @@ # Compiler flags. -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) -LDFLAGS = -s +LDFLAGS = EDACPPFLAGS = $(CPPFLAGS) diff -ru kicad-dev/eeschema/makefile.gtk kicad-dev-fedora/eeschema/makefile.gtk --- kicad-dev/eeschema/makefile.gtk 2007-02-07 16:39:35.000000000 +0100 +++ kicad-dev-fedora/eeschema/makefile.gtk 2007-02-08 13:55:06.000000000 +0100 @@ -6,14 +6,14 @@ FINAL = 1 -LDFLAGS = -s +LDFLAGS = include ../libs.linux TARGET = eeschema -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) all: $(TARGET) diff -ru kicad-dev/gerbview/makefile.gtk kicad-dev-fedora/gerbview/makefile.gtk --- kicad-dev/gerbview/makefile.gtk 2007-02-07 16:39:47.000000000 +0100 +++ kicad-dev-fedora/gerbview/makefile.gtk 2007-02-08 13:55:23.000000000 +0100 @@ -3,9 +3,9 @@ LD = gcc # Compiler flags. -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) -LDFLAGS = -s +LDFLAGS = include ../libs.linux diff -ru kicad-dev/kicad/makefile.gtk kicad-dev-fedora/kicad/makefile.gtk --- kicad-dev/kicad/makefile.gtk 2007-02-07 16:40:08.000000000 +0100 +++ kicad-dev-fedora/kicad/makefile.gtk 2007-02-08 13:55:39.000000000 +0100 @@ -7,8 +7,8 @@ FINAL = 1 # Compiler flags. -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` -LDFLAGS = -s +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) +LDFLAGS = include ../libs.linux diff -ru kicad-dev/pcbnew/makefile.gtk kicad-dev-fedora/pcbnew/makefile.gtk --- kicad-dev/pcbnew/makefile.gtk 2007-02-07 16:40:27.000000000 +0100 +++ kicad-dev-fedora/pcbnew/makefile.gtk 2007-02-08 13:56:01.000000000 +0100 @@ -4,9 +4,9 @@ # Compiler flags. -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) -LDFLAGS = -s +LDFLAGS = include ../libs.linux Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kicad/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 22 Sep 2006 13:57:08 -0000 1.3 +++ .cvsignore 8 Feb 2007 13:21:04 -0000 1.4 @@ -1,2 +1,2 @@ -kicad-sources-2006-08-28.zip -kicad-src-extras-2006-08-28.tar.bz2 +kicad-sources-2007-01-15.zip +kicad-src-extras-2007-01-15.tar.bz2 Index: kicad.spec =================================================================== RCS file: /cvs/extras/rpms/kicad/devel/kicad.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- kicad.spec 8 Feb 2007 12:12:31 -0000 1.6 +++ kicad.spec 8 Feb 2007 13:21:04 -0000 1.7 @@ -1,14 +1,14 @@ Name: kicad -Version: 2006.08.28 -Release: 4%{?dist} +Version: 2007.01.15 +Release: 1%{?dist} Summary: Electronic schematic diagrams and printed circuit board artwork Summary(fr): Saisie de sch??ma ??lectronique et trac?? de circuit imprim?? Group: Applications/Engineering License: GPL Url: http://www.lis.inpg.fr/realise_au_lis/kicad/ -Source: ftp://iut-tice.ujf-grenoble.fr/cao/sources/kicad-sources-2006-08-28.zip -Source1: http://linuxelectronique.free.fr/download/kicad-src-extras-2006-08-28.tar.bz2 +Source: ftp://iut-tice.ujf-grenoble.fr/cao/sources/kicad-sources-2007-01-15.zip +Source1: http://linuxelectronique.free.fr/download/kicad-src-extras-2007-01-15.tar.bz2 Source2: %{name}.desktop Patch: %{name}-%{version}.destdir.diff Patch1: %{name}-%{version}.rpm.opt.flags.diff @@ -39,8 +39,8 @@ %prep %setup -q -n kicad-dev -a 1 -%{__cp} -a kicad-src-extras-2006-08-28/* . -%{__rm} -rf kicad-src-extras-2006-08-28 +%{__cp} -a kicad-src-extras-2007-01-15/* . +%{__rm} -rf kicad-src-extras-2007-01-15 # Convert MSDOS EOL to Unix EOL before applying patches @@ -59,18 +59,18 @@ %build # These files are not scripts -for f in {copyright,gpl,licendoc,README,version}.txt +for f in {copyright,gpl,licendoc,version}.txt do %{__chmod} -x $f done # Convert MSDOS EOL to Unix EOL -for f in {author,contrib,copyright,doc_conv_orcad*,gpl,licendoc,README}.txt +for f in {author,contrib,copyright,doc_conv_orcad*,gpl,licendoc}.txt do %{__sed} -i -e 's/\r$//' $f done -for f in help/fr/{contents.hhc,kicad.hhp,cvpcb/cvpcb.pdf,cvpcb/cvpcb-fr.html,eeschema/eeschema.html,eeschema/eeschema.pdf,file_formats/file_formats.html,gerbview/gerbview.html,kicad/kicad.html,pcbnew/pcbnew.html} +for f in help/fr/{contents.hhc,kicad.hhp,cvpcb/cvpcb-fr.html,eeschema/eeschema.html,eeschema/eeschema.pdf,file_formats/file_formats.html,gerbview/gerbview.html,kicad/kicad.html,pcbnew/pcbnew.html} do %{__sed} -i -e 's/\r$//' $f done @@ -85,7 +85,7 @@ %{__sed} -i -e 's/\r$//' $f done -for f in help/pt/{contents.hhc,kicad.hhp,cvpcb/cvpcb-pt.html,eeschema/eeschema-pt.html,file_formats/file_formats.html,gerbview/gerbview.html,kicad/kicad_pt_BR.html,pcbnew/pcbnew.html} +for f in help/pt/{contents.hhc,kicad.hhp,cvpcb/cvpcb-pt.html,eeschema/eeschema-pt.html,eeschema/eeschema_pt_BR.html,file_formats/file_formats.html,gerbview/gerbview.html,kicad/kicad_pt_BR.html,kicad/kicad-pt.html,pcbnew/pcbnew.html,pcbnew/pcbnew_pt_BR.html} do %{__sed} -i -e 's/\r$//' $f done @@ -234,8 +234,7 @@ %files -f %{name}.lang %defattr(-,root,root) %doc author.txt contrib.txt copyright.txt doc_conv_orcad_to_kicad_spanish.txt -%doc doc_conv_orcad_to_kicad.txt gpl.txt licendoc.txt lisezmoi.txt news.txt -%doc README.txt version.txt +%doc doc_conv_orcad_to_kicad.txt gpl.txt licendoc.txt news.txt version.txt %{_bindir}/* %{_libdir}/%{name}/ %{_libdir}/%{name}/plugins/ @@ -245,6 +244,9 @@ %{_datadir}/pixmaps/kicad_icon.png %changelog +* Thu Feb 8 2007 Alain Portal 2007.01.15-1 + - New upstream version + * Thu Feb 8 2007 Alain Portal 2006.08.28-4 - Add patch to build with RPM_OPT_FLAGS and remove -s from LDFLAGS Contribution of Ville Skytt?? Index: sources =================================================================== RCS file: /cvs/extras/rpms/kicad/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 22 Sep 2006 13:57:08 -0000 1.3 +++ sources 8 Feb 2007 13:21:04 -0000 1.4 @@ -1,2 +1,2 @@ -0695942d01c3d22f474728ba9081e559 kicad-sources-2006-08-28.zip -d85926d89becfcc344e299c81e91d293 kicad-src-extras-2006-08-28.tar.bz2 +61a0ba615b67af313d1214ed1a3d5a66 kicad-sources-2007-01-15.zip +3263536df405f0d282a61d894feb6f05 kicad-src-extras-2007-01-15.tar.bz2 From fedora-extras-commits at redhat.com Thu Feb 8 13:25:42 2007 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Thu, 8 Feb 2007 08:25:42 -0500 Subject: rpms/kicad/FC-6 kicad-2007.01.15.destdir.diff, NONE, 1.1 kicad-2007.01.15.rpm.opt.flags.diff, NONE, 1.1 .cvsignore, 1.3, 1.4 kicad.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200702081325.l18DPgqG004559@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/kicad/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4526 Modified Files: .cvsignore kicad.spec sources Added Files: kicad-2007.01.15.destdir.diff kicad-2007.01.15.rpm.opt.flags.diff Log Message: New upstream version kicad-2007.01.15.destdir.diff: --- NEW FILE kicad-2007.01.15.destdir.diff --- diff -ru kicad-dev/cvpcb/makefile.gtk kicad-dev-fedora/cvpcb/makefile.gtk --- kicad-dev/cvpcb/makefile.gtk 2006-05-09 08:42:12.000000000 +0200 +++ kicad-dev-fedora/cvpcb/makefile.gtk 2007-02-07 16:39:09.000000000 +0100 @@ -31,9 +31,9 @@ $(LD) $(OBJECTS) $(LDFLAGS) $(LIBVIEWER3D) $(LIBS_WITH_GL) -o $(TARGET) -install: - cp -f $(TARGET) $(KICAD_BIN) - +install: + cp -f $(TARGET) $(DESTDIR)$(KICAD_BIN) + clean: rm *.o rm $(TARGET) diff -ru kicad-dev/eeschema/makefile.gtk kicad-dev-fedora/eeschema/makefile.gtk --- kicad-dev/eeschema/makefile.gtk 2006-06-02 13:45:48.000000000 +0200 +++ kicad-dev-fedora/eeschema/makefile.gtk 2007-02-07 16:39:35.000000000 +0100 @@ -31,7 +31,7 @@ install: - cp $(TARGET) $(KICAD_BIN) + cp $(TARGET) $(DESTDIR)$(KICAD_BIN) clean: diff -ru kicad-dev/gerbview/makefile.gtk kicad-dev-fedora/gerbview/makefile.gtk --- kicad-dev/gerbview/makefile.gtk 2006-06-02 13:45:54.000000000 +0200 +++ kicad-dev-fedora/gerbview/makefile.gtk 2007-02-07 16:39:47.000000000 +0100 @@ -21,10 +21,10 @@ $(TARGET): $(OBJECTS) makefile.gtk makefile.include $(EXTRALIBS) ../libs.linux - $(LD) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) - + $(LD) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) + install: - cp $(TARGET) $(KICAD_BIN) + cp $(TARGET) $(DESTDIR)$(KICAD_BIN) clean: diff -ru kicad-dev/kicad/makefile.gtk kicad-dev-fedora/kicad/makefile.gtk --- kicad-dev/kicad/makefile.gtk 2006-10-16 13:34:02.000000000 +0200 +++ kicad-dev-fedora/kicad/makefile.gtk 2007-02-07 16:40:08.000000000 +0100 @@ -26,7 +26,7 @@ $(LD) $(OBJECTS) $(LDFLAGS) $(LIBS) -o $(TARGET) install: - cp -f $(TARGET) $(KICAD_BIN) + cp -f $(TARGET) $(DESTDIR)$(KICAD_BIN) clean: rm -f *.o; diff -ru kicad-dev/libs.linux kicad-dev-fedora/libs.linux --- kicad-dev/libs.linux 2006-11-14 16:01:20.000000000 +0100 +++ kicad-dev-fedora/libs.linux 2007-02-07 17:03:43.000000000 +0100 @@ -1,6 +1,6 @@ #Configuration for build kicad -KICAD_BIN = /usr/local/kicad/linux +KICAD_BIN = /usr/bin SRCSUFF = .cpp @@ -11,10 +11,10 @@ # You must comment or uncomment this line for dynamic or static link # dynamic link is less difficult than static link # choose it if you have problems (libs not found, or unresolved references) ), or if kicad is running only on YOUR system. -KICAD_STATIC_LINK = 1 +# KICAD_STATIC_LINK = 1 # path and version definition for wxWidgets and mesa libs -MESALIBSPATH = /usr/local/lib +MESALIBSPATH = /usr/lib WXPATH = `wx-config --prefix`/lib PREFIX_WX_LIBS = lib`wx-config --basename` SUFFIX_WX_LIBSTD = `wx-config --utility=` @@ -69,11 +69,11 @@ endif -# attention ? l'ordre des libairies -LIBS = -L/usr/local/lib -L/usr/X11R6/lib\ +# attention ???l'ordre des libairies +LIBS = -L/usr/lib -L/usr/X11R6/lib\ $(EXTRALIBS) $(WXSYSLIB)\ $(LIBSTDC) -LIBS_WITH_GL = -L/usr/local/lib -L/usr/X11R6/lib\ +LIBS_WITH_GL = -L/usr/lib -L/usr/X11R6/lib\ $(EXTRALIBS) $(WXSYSLIB_WITH_GL)\ $(LIBSTDC) Seulement dans kicad-dev-fedora: libs.linux~ diff -ru kicad-dev/pcbnew/makefile.gtk kicad-dev-fedora/pcbnew/makefile.gtk --- kicad-dev/pcbnew/makefile.gtk 2006-06-02 13:45:50.000000000 +0200 +++ kicad-dev-fedora/pcbnew/makefile.gtk 2007-02-07 16:40:27.000000000 +0100 @@ -23,11 +23,11 @@ $(TARGET): $(OBJECTS) makefile.gtk makefile.include $(LIBVIEWER3D) $(EXTRALIBS) ../libs.linux $(LD) $(LDFLAGS) $(OBJECTS) $(LIBVIEWER3D) $(LIBS_WITH_GL)\ - -o $(TARGET) - - + -o $(TARGET) + + install: - cp $(TARGET) $(KICAD_BIN) + cp $(TARGET) $(DESTDIR)$(KICAD_BIN) clean: kicad-2007.01.15.rpm.opt.flags.diff: --- NEW FILE kicad-2007.01.15.rpm.opt.flags.diff --- diff -ru kicad-dev/3d-viewer/makefile.gtk kicad-dev-fedora/3d-viewer/makefile.gtk --- kicad-dev/3d-viewer/makefile.gtk 2006-06-02 13:45:52.000000000 +0200 +++ kicad-dev-fedora/3d-viewer/makefile.gtk 2007-02-08 13:53:45.000000000 +0100 @@ -4,7 +4,7 @@ # Compiler flags. CPPFLAGS = -Wall -O2 -DPCBNEW -I../pcbnew -I ../include -I../common\ - `wx-config --cxxflags` + `wx-config --cxxflags` $(RPM_OPT_FLAGS) include ../libs.linux diff -ru kicad-dev/common/makefile.gtk kicad-dev-fedora/common/makefile.gtk --- kicad-dev/common/makefile.gtk 2006-06-02 13:45:44.000000000 +0200 +++ kicad-dev-fedora/common/makefile.gtk 2007-02-08 13:54:14.000000000 +0100 @@ -2,7 +2,7 @@ CC = gcc # Compiler flags. -CPPFLAGS = -Wall -O2 -I./ -I../include `wx-config --cflags` +CPPFLAGS = -Wall -O2 -I./ -I../include `wx-config --cflags` $(RPM_OPT_FLAGS) EDACPPFLAGS = $(CPPFLAGS) diff -ru kicad-dev/cvpcb/makefile.gtk kicad-dev-fedora/cvpcb/makefile.gtk --- kicad-dev/cvpcb/makefile.gtk 2007-02-07 16:39:09.000000000 +0100 +++ kicad-dev-fedora/cvpcb/makefile.gtk 2007-02-08 13:54:41.000000000 +0100 @@ -8,9 +8,9 @@ # Compiler flags. -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) -LDFLAGS = -s +LDFLAGS = EDACPPFLAGS = $(CPPFLAGS) diff -ru kicad-dev/eeschema/makefile.gtk kicad-dev-fedora/eeschema/makefile.gtk --- kicad-dev/eeschema/makefile.gtk 2007-02-07 16:39:35.000000000 +0100 +++ kicad-dev-fedora/eeschema/makefile.gtk 2007-02-08 13:55:06.000000000 +0100 @@ -6,14 +6,14 @@ FINAL = 1 -LDFLAGS = -s +LDFLAGS = include ../libs.linux TARGET = eeschema -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) all: $(TARGET) diff -ru kicad-dev/gerbview/makefile.gtk kicad-dev-fedora/gerbview/makefile.gtk --- kicad-dev/gerbview/makefile.gtk 2007-02-07 16:39:47.000000000 +0100 +++ kicad-dev-fedora/gerbview/makefile.gtk 2007-02-08 13:55:23.000000000 +0100 @@ -3,9 +3,9 @@ LD = gcc # Compiler flags. -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) -LDFLAGS = -s +LDFLAGS = include ../libs.linux diff -ru kicad-dev/kicad/makefile.gtk kicad-dev-fedora/kicad/makefile.gtk --- kicad-dev/kicad/makefile.gtk 2007-02-07 16:40:08.000000000 +0100 +++ kicad-dev-fedora/kicad/makefile.gtk 2007-02-08 13:55:39.000000000 +0100 @@ -7,8 +7,8 @@ FINAL = 1 # Compiler flags. -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` -LDFLAGS = -s +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) +LDFLAGS = include ../libs.linux diff -ru kicad-dev/pcbnew/makefile.gtk kicad-dev-fedora/pcbnew/makefile.gtk --- kicad-dev/pcbnew/makefile.gtk 2007-02-07 16:40:27.000000000 +0100 +++ kicad-dev-fedora/pcbnew/makefile.gtk 2007-02-08 13:56:01.000000000 +0100 @@ -4,9 +4,9 @@ # Compiler flags. -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) -LDFLAGS = -s +LDFLAGS = include ../libs.linux Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kicad/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 22 Sep 2006 13:57:08 -0000 1.3 +++ .cvsignore 8 Feb 2007 13:25:10 -0000 1.4 @@ -1,2 +1,2 @@ -kicad-sources-2006-08-28.zip -kicad-src-extras-2006-08-28.tar.bz2 +kicad-sources-2007-01-15.zip +kicad-src-extras-2007-01-15.tar.bz2 Index: kicad.spec =================================================================== RCS file: /cvs/extras/rpms/kicad/FC-6/kicad.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- kicad.spec 8 Feb 2007 12:19:38 -0000 1.6 +++ kicad.spec 8 Feb 2007 13:25:10 -0000 1.7 @@ -1,14 +1,14 @@ Name: kicad -Version: 2006.08.28 -Release: 3%{?dist} +Version: 2007.01.15 +Release: 1%{?dist} Summary: Electronic schematic diagrams and printed circuit board artwork Summary(fr): Saisie de sch??ma ??lectronique et trac?? de circuit imprim?? Group: Applications/Engineering License: GPL Url: http://www.lis.inpg.fr/realise_au_lis/kicad/ -Source: ftp://iut-tice.ujf-grenoble.fr/cao/sources/kicad-sources-2006-08-28.zip -Source1: http://linuxelectronique.free.fr/download/kicad-src-extras-2006-08-28.tar.bz2 +Source: ftp://iut-tice.ujf-grenoble.fr/cao/sources/kicad-sources-2007-01-15.zip +Source1: http://linuxelectronique.free.fr/download/kicad-src-extras-2007-01-15.tar.bz2 Source2: %{name}.desktop Patch: %{name}-%{version}.destdir.diff Patch1: %{name}-%{version}.rpm.opt.flags.diff @@ -39,8 +39,8 @@ %prep %setup -q -n kicad-dev -a 1 -%{__cp} -a kicad-src-extras-2006-08-28/* . -%{__rm} -rf kicad-src-extras-2006-08-28 +%{__cp} -a kicad-src-extras-2007-01-15/* . +%{__rm} -rf kicad-src-extras-2007-01-15 # Convert MSDOS EOL to Unix EOL before applying patches @@ -59,18 +59,18 @@ %build # These files are not scripts -for f in {copyright,gpl,licendoc,README,version}.txt +for f in {copyright,gpl,licendoc,version}.txt do %{__chmod} -x $f done # Convert MSDOS EOL to Unix EOL -for f in {author,contrib,copyright,doc_conv_orcad*,gpl,licendoc,README}.txt +for f in {author,contrib,copyright,doc_conv_orcad*,gpl,licendoc}.txt do %{__sed} -i -e 's/\r$//' $f done -for f in help/fr/{contents.hhc,kicad.hhp,cvpcb/cvpcb.pdf,cvpcb/cvpcb-fr.html,eeschema/eeschema.html,eeschema/eeschema.pdf,file_formats/file_formats.html,gerbview/gerbview.html,kicad/kicad.html,pcbnew/pcbnew.html} +for f in help/fr/{contents.hhc,kicad.hhp,cvpcb/cvpcb-fr.html,eeschema/eeschema.html,eeschema/eeschema.pdf,file_formats/file_formats.html,gerbview/gerbview.html,kicad/kicad.html,pcbnew/pcbnew.html} do %{__sed} -i -e 's/\r$//' $f done @@ -85,7 +85,7 @@ %{__sed} -i -e 's/\r$//' $f done -for f in help/pt/{contents.hhc,kicad.hhp,cvpcb/cvpcb-pt.html,eeschema/eeschema-pt.html,file_formats/file_formats.html,gerbview/gerbview.html,kicad/kicad_pt_BR.html,pcbnew/pcbnew.html} +for f in help/pt/{contents.hhc,kicad.hhp,cvpcb/cvpcb-pt.html,eeschema/eeschema-pt.html,eeschema/eeschema_pt_BR.html,file_formats/file_formats.html,gerbview/gerbview.html,kicad/kicad_pt_BR.html,kicad/kicad-pt.html,pcbnew/pcbnew.html,pcbnew/pcbnew_pt_BR.html} do %{__sed} -i -e 's/\r$//' $f done @@ -234,8 +234,7 @@ %files -f %{name}.lang %defattr(-,root,root) %doc author.txt contrib.txt copyright.txt doc_conv_orcad_to_kicad_spanish.txt -%doc doc_conv_orcad_to_kicad.txt gpl.txt licendoc.txt lisezmoi.txt news.txt -%doc README.txt version.txt +%doc doc_conv_orcad_to_kicad.txt gpl.txt licendoc.txt news.txt version.txt %{_bindir}/* %{_libdir}/%{name}/ %{_libdir}/%{name}/plugins/ @@ -245,6 +244,9 @@ %{_datadir}/pixmaps/kicad_icon.png %changelog +* Thu Feb 8 2007 Alain Portal 2007.01.15-1 + - New upstream version + * Thu Feb 8 2007 Alain Portal 2006.08.28-3 - Add patch to build with RPM_OPT_FLAGS and remove -s from LDFLAGS Contribution of Ville Skytt?? Index: sources =================================================================== RCS file: /cvs/extras/rpms/kicad/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 22 Sep 2006 13:57:08 -0000 1.3 +++ sources 8 Feb 2007 13:25:10 -0000 1.4 @@ -1,2 +1,2 @@ -0695942d01c3d22f474728ba9081e559 kicad-sources-2006-08-28.zip -d85926d89becfcc344e299c81e91d293 kicad-src-extras-2006-08-28.tar.bz2 +61a0ba615b67af313d1214ed1a3d5a66 kicad-sources-2007-01-15.zip +3263536df405f0d282a61d894feb6f05 kicad-src-extras-2007-01-15.tar.bz2 From fedora-extras-commits at redhat.com Thu Feb 8 13:29:34 2007 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Thu, 8 Feb 2007 08:29:34 -0500 Subject: rpms/kicad/FC-5 kicad-2007.01.15.destdir.diff, NONE, 1.1 kicad-2007.01.15.rpm.opt.flags.diff, NONE, 1.1 .cvsignore, 1.3, 1.4 kicad.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200702081329.l18DTYl7004651@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/kicad/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4624 Modified Files: .cvsignore kicad.spec sources Added Files: kicad-2007.01.15.destdir.diff kicad-2007.01.15.rpm.opt.flags.diff Log Message: New upstream version kicad-2007.01.15.destdir.diff: --- NEW FILE kicad-2007.01.15.destdir.diff --- diff -ru kicad-dev/cvpcb/makefile.gtk kicad-dev-fedora/cvpcb/makefile.gtk --- kicad-dev/cvpcb/makefile.gtk 2006-05-09 08:42:12.000000000 +0200 +++ kicad-dev-fedora/cvpcb/makefile.gtk 2007-02-07 16:39:09.000000000 +0100 @@ -31,9 +31,9 @@ $(LD) $(OBJECTS) $(LDFLAGS) $(LIBVIEWER3D) $(LIBS_WITH_GL) -o $(TARGET) -install: - cp -f $(TARGET) $(KICAD_BIN) - +install: + cp -f $(TARGET) $(DESTDIR)$(KICAD_BIN) + clean: rm *.o rm $(TARGET) diff -ru kicad-dev/eeschema/makefile.gtk kicad-dev-fedora/eeschema/makefile.gtk --- kicad-dev/eeschema/makefile.gtk 2006-06-02 13:45:48.000000000 +0200 +++ kicad-dev-fedora/eeschema/makefile.gtk 2007-02-07 16:39:35.000000000 +0100 @@ -31,7 +31,7 @@ install: - cp $(TARGET) $(KICAD_BIN) + cp $(TARGET) $(DESTDIR)$(KICAD_BIN) clean: diff -ru kicad-dev/gerbview/makefile.gtk kicad-dev-fedora/gerbview/makefile.gtk --- kicad-dev/gerbview/makefile.gtk 2006-06-02 13:45:54.000000000 +0200 +++ kicad-dev-fedora/gerbview/makefile.gtk 2007-02-07 16:39:47.000000000 +0100 @@ -21,10 +21,10 @@ $(TARGET): $(OBJECTS) makefile.gtk makefile.include $(EXTRALIBS) ../libs.linux - $(LD) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) - + $(LD) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) + install: - cp $(TARGET) $(KICAD_BIN) + cp $(TARGET) $(DESTDIR)$(KICAD_BIN) clean: diff -ru kicad-dev/kicad/makefile.gtk kicad-dev-fedora/kicad/makefile.gtk --- kicad-dev/kicad/makefile.gtk 2006-10-16 13:34:02.000000000 +0200 +++ kicad-dev-fedora/kicad/makefile.gtk 2007-02-07 16:40:08.000000000 +0100 @@ -26,7 +26,7 @@ $(LD) $(OBJECTS) $(LDFLAGS) $(LIBS) -o $(TARGET) install: - cp -f $(TARGET) $(KICAD_BIN) + cp -f $(TARGET) $(DESTDIR)$(KICAD_BIN) clean: rm -f *.o; diff -ru kicad-dev/libs.linux kicad-dev-fedora/libs.linux --- kicad-dev/libs.linux 2006-11-14 16:01:20.000000000 +0100 +++ kicad-dev-fedora/libs.linux 2007-02-07 17:03:43.000000000 +0100 @@ -1,6 +1,6 @@ #Configuration for build kicad -KICAD_BIN = /usr/local/kicad/linux +KICAD_BIN = /usr/bin SRCSUFF = .cpp @@ -11,10 +11,10 @@ # You must comment or uncomment this line for dynamic or static link # dynamic link is less difficult than static link # choose it if you have problems (libs not found, or unresolved references) ), or if kicad is running only on YOUR system. -KICAD_STATIC_LINK = 1 +# KICAD_STATIC_LINK = 1 # path and version definition for wxWidgets and mesa libs -MESALIBSPATH = /usr/local/lib +MESALIBSPATH = /usr/lib WXPATH = `wx-config --prefix`/lib PREFIX_WX_LIBS = lib`wx-config --basename` SUFFIX_WX_LIBSTD = `wx-config --utility=` @@ -69,11 +69,11 @@ endif -# attention ? l'ordre des libairies -LIBS = -L/usr/local/lib -L/usr/X11R6/lib\ +# attention ???l'ordre des libairies +LIBS = -L/usr/lib -L/usr/X11R6/lib\ $(EXTRALIBS) $(WXSYSLIB)\ $(LIBSTDC) -LIBS_WITH_GL = -L/usr/local/lib -L/usr/X11R6/lib\ +LIBS_WITH_GL = -L/usr/lib -L/usr/X11R6/lib\ $(EXTRALIBS) $(WXSYSLIB_WITH_GL)\ $(LIBSTDC) Seulement dans kicad-dev-fedora: libs.linux~ diff -ru kicad-dev/pcbnew/makefile.gtk kicad-dev-fedora/pcbnew/makefile.gtk --- kicad-dev/pcbnew/makefile.gtk 2006-06-02 13:45:50.000000000 +0200 +++ kicad-dev-fedora/pcbnew/makefile.gtk 2007-02-07 16:40:27.000000000 +0100 @@ -23,11 +23,11 @@ $(TARGET): $(OBJECTS) makefile.gtk makefile.include $(LIBVIEWER3D) $(EXTRALIBS) ../libs.linux $(LD) $(LDFLAGS) $(OBJECTS) $(LIBVIEWER3D) $(LIBS_WITH_GL)\ - -o $(TARGET) - - + -o $(TARGET) + + install: - cp $(TARGET) $(KICAD_BIN) + cp $(TARGET) $(DESTDIR)$(KICAD_BIN) clean: kicad-2007.01.15.rpm.opt.flags.diff: --- NEW FILE kicad-2007.01.15.rpm.opt.flags.diff --- diff -ru kicad-dev/3d-viewer/makefile.gtk kicad-dev-fedora/3d-viewer/makefile.gtk --- kicad-dev/3d-viewer/makefile.gtk 2006-06-02 13:45:52.000000000 +0200 +++ kicad-dev-fedora/3d-viewer/makefile.gtk 2007-02-08 13:53:45.000000000 +0100 @@ -4,7 +4,7 @@ # Compiler flags. CPPFLAGS = -Wall -O2 -DPCBNEW -I../pcbnew -I ../include -I../common\ - `wx-config --cxxflags` + `wx-config --cxxflags` $(RPM_OPT_FLAGS) include ../libs.linux diff -ru kicad-dev/common/makefile.gtk kicad-dev-fedora/common/makefile.gtk --- kicad-dev/common/makefile.gtk 2006-06-02 13:45:44.000000000 +0200 +++ kicad-dev-fedora/common/makefile.gtk 2007-02-08 13:54:14.000000000 +0100 @@ -2,7 +2,7 @@ CC = gcc # Compiler flags. -CPPFLAGS = -Wall -O2 -I./ -I../include `wx-config --cflags` +CPPFLAGS = -Wall -O2 -I./ -I../include `wx-config --cflags` $(RPM_OPT_FLAGS) EDACPPFLAGS = $(CPPFLAGS) diff -ru kicad-dev/cvpcb/makefile.gtk kicad-dev-fedora/cvpcb/makefile.gtk --- kicad-dev/cvpcb/makefile.gtk 2007-02-07 16:39:09.000000000 +0100 +++ kicad-dev-fedora/cvpcb/makefile.gtk 2007-02-08 13:54:41.000000000 +0100 @@ -8,9 +8,9 @@ # Compiler flags. -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) -LDFLAGS = -s +LDFLAGS = EDACPPFLAGS = $(CPPFLAGS) diff -ru kicad-dev/eeschema/makefile.gtk kicad-dev-fedora/eeschema/makefile.gtk --- kicad-dev/eeschema/makefile.gtk 2007-02-07 16:39:35.000000000 +0100 +++ kicad-dev-fedora/eeschema/makefile.gtk 2007-02-08 13:55:06.000000000 +0100 @@ -6,14 +6,14 @@ FINAL = 1 -LDFLAGS = -s +LDFLAGS = include ../libs.linux TARGET = eeschema -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) all: $(TARGET) diff -ru kicad-dev/gerbview/makefile.gtk kicad-dev-fedora/gerbview/makefile.gtk --- kicad-dev/gerbview/makefile.gtk 2007-02-07 16:39:47.000000000 +0100 +++ kicad-dev-fedora/gerbview/makefile.gtk 2007-02-08 13:55:23.000000000 +0100 @@ -3,9 +3,9 @@ LD = gcc # Compiler flags. -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) -LDFLAGS = -s +LDFLAGS = include ../libs.linux diff -ru kicad-dev/kicad/makefile.gtk kicad-dev-fedora/kicad/makefile.gtk --- kicad-dev/kicad/makefile.gtk 2007-02-07 16:40:08.000000000 +0100 +++ kicad-dev-fedora/kicad/makefile.gtk 2007-02-08 13:55:39.000000000 +0100 @@ -7,8 +7,8 @@ FINAL = 1 # Compiler flags. -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` -LDFLAGS = -s +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) +LDFLAGS = include ../libs.linux diff -ru kicad-dev/pcbnew/makefile.gtk kicad-dev-fedora/pcbnew/makefile.gtk --- kicad-dev/pcbnew/makefile.gtk 2007-02-07 16:40:27.000000000 +0100 +++ kicad-dev-fedora/pcbnew/makefile.gtk 2007-02-08 13:56:01.000000000 +0100 @@ -4,9 +4,9 @@ # Compiler flags. -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) -LDFLAGS = -s +LDFLAGS = include ../libs.linux Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kicad/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 22 Sep 2006 14:00:19 -0000 1.3 +++ .cvsignore 8 Feb 2007 13:29:02 -0000 1.4 @@ -1,2 +1,2 @@ -kicad-sources-2006-08-28.zip -kicad-src-extras-2006-08-28.tar.bz2 +kicad-sources-2007-01-15.zip +kicad-src-extras-2007-01-15.tar.bz2 Index: kicad.spec =================================================================== RCS file: /cvs/extras/rpms/kicad/FC-5/kicad.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kicad.spec 8 Feb 2007 12:22:23 -0000 1.3 +++ kicad.spec 8 Feb 2007 13:29:02 -0000 1.4 @@ -1,14 +1,14 @@ Name: kicad -Version: 2006.08.28 -Release: 2%{?dist} +Version: 2007.01.15 +Release: 1%{?dist} Summary: Electronic schematic diagrams and printed circuit board artwork Summary(fr): Saisie de sch??ma ??lectronique et trac?? de circuit imprim?? Group: Applications/Engineering License: GPL Url: http://www.lis.inpg.fr/realise_au_lis/kicad/ -Source: ftp://iut-tice.ujf-grenoble.fr/cao/sources/kicad-sources-2006-08-28.zip -Source1: http://linuxelectronique.free.fr/download/kicad-src-extras-2006-08-28.tar.bz2 +Source: ftp://iut-tice.ujf-grenoble.fr/cao/sources/kicad-sources-2007-01-15.zip +Source1: http://linuxelectronique.free.fr/download/kicad-src-extras-2007-01-15.tar.bz2 Source2: %{name}.desktop Patch: %{name}-%{version}.destdir.diff Patch1: %{name}-%{version}.rpm.opt.flags.diff @@ -39,8 +39,8 @@ %prep %setup -q -n kicad-dev -a 1 -%{__cp} -a kicad-src-extras-2006-08-28/* . -%{__rm} -rf kicad-src-extras-2006-08-28 +%{__cp} -a kicad-src-extras-2007-01-15/* . +%{__rm} -rf kicad-src-extras-2007-01-15 # Convert MSDOS EOL to Unix EOL before applying patches @@ -59,18 +59,18 @@ %build # These files are not scripts -for f in {copyright,gpl,licendoc,README,version}.txt +for f in {copyright,gpl,licendoc,version}.txt do %{__chmod} -x $f done # Convert MSDOS EOL to Unix EOL -for f in {author,contrib,copyright,doc_conv_orcad*,gpl,licendoc,README}.txt +for f in {author,contrib,copyright,doc_conv_orcad*,gpl,licendoc}.txt do %{__sed} -i -e 's/\r$//' $f done -for f in help/fr/{contents.hhc,kicad.hhp,cvpcb/cvpcb.pdf,cvpcb/cvpcb-fr.html,eeschema/eeschema.html,eeschema/eeschema.pdf,file_formats/file_formats.html,gerbview/gerbview.html,kicad/kicad.html,pcbnew/pcbnew.html} +for f in help/fr/{contents.hhc,kicad.hhp,cvpcb/cvpcb-fr.html,eeschema/eeschema.html,eeschema/eeschema.pdf,file_formats/file_formats.html,gerbview/gerbview.html,kicad/kicad.html,pcbnew/pcbnew.html} do %{__sed} -i -e 's/\r$//' $f done @@ -85,7 +85,7 @@ %{__sed} -i -e 's/\r$//' $f done -for f in help/pt/{contents.hhc,kicad.hhp,cvpcb/cvpcb-pt.html,eeschema/eeschema-pt.html,file_formats/file_formats.html,gerbview/gerbview.html,kicad/kicad_pt_BR.html,pcbnew/pcbnew.html} +for f in help/pt/{contents.hhc,kicad.hhp,cvpcb/cvpcb-pt.html,eeschema/eeschema-pt.html,eeschema/eeschema_pt_BR.html,file_formats/file_formats.html,gerbview/gerbview.html,kicad/kicad_pt_BR.html,kicad/kicad-pt.html,pcbnew/pcbnew.html,pcbnew/pcbnew_pt_BR.html} do %{__sed} -i -e 's/\r$//' $f done @@ -234,8 +234,7 @@ %files -f %{name}.lang %defattr(-,root,root) %doc author.txt contrib.txt copyright.txt doc_conv_orcad_to_kicad_spanish.txt -%doc doc_conv_orcad_to_kicad.txt gpl.txt licendoc.txt lisezmoi.txt news.txt -%doc README.txt version.txt +%doc doc_conv_orcad_to_kicad.txt gpl.txt licendoc.txt news.txt version.txt %{_bindir}/* %{_libdir}/%{name}/ %{_libdir}/%{name}/plugins/ @@ -245,6 +244,9 @@ %{_datadir}/pixmaps/kicad_icon.png %changelog +* Thu Feb 8 2007 Alain Portal 2007.01.15-1 + - New upstream version + * Thu Feb 8 2007 Alain Portal 2006.08.28-2 - Add patch to build with RPM_OPT_FLAGS and remove -s from LDFLAGS Contribution of Ville Skytt?? Index: sources =================================================================== RCS file: /cvs/extras/rpms/kicad/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 22 Sep 2006 14:00:19 -0000 1.3 +++ sources 8 Feb 2007 13:29:02 -0000 1.4 @@ -1,2 +1,2 @@ -0695942d01c3d22f474728ba9081e559 kicad-sources-2006-08-28.zip -d85926d89becfcc344e299c81e91d293 kicad-src-extras-2006-08-28.tar.bz2 +61a0ba615b67af313d1214ed1a3d5a66 kicad-sources-2007-01-15.zip +3263536df405f0d282a61d894feb6f05 kicad-src-extras-2007-01-15.tar.bz2 From fedora-extras-commits at redhat.com Thu Feb 8 13:32:07 2007 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Thu, 8 Feb 2007 08:32:07 -0500 Subject: rpms/kicad/FC-4 kicad-2007.01.15.destdir.diff, NONE, 1.1 kicad-2007.01.15.rpm.opt.flags.diff, NONE, 1.1 .cvsignore, 1.3, 1.4 kicad.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200702081332.l18DW7XR004762@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/kicad/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4733 Modified Files: .cvsignore kicad.spec sources Added Files: kicad-2007.01.15.destdir.diff kicad-2007.01.15.rpm.opt.flags.diff Log Message: New upstream version kicad-2007.01.15.destdir.diff: --- NEW FILE kicad-2007.01.15.destdir.diff --- diff -ru kicad-dev/cvpcb/makefile.gtk kicad-dev-fedora/cvpcb/makefile.gtk --- kicad-dev/cvpcb/makefile.gtk 2006-05-09 08:42:12.000000000 +0200 +++ kicad-dev-fedora/cvpcb/makefile.gtk 2007-02-07 16:39:09.000000000 +0100 @@ -31,9 +31,9 @@ $(LD) $(OBJECTS) $(LDFLAGS) $(LIBVIEWER3D) $(LIBS_WITH_GL) -o $(TARGET) -install: - cp -f $(TARGET) $(KICAD_BIN) - +install: + cp -f $(TARGET) $(DESTDIR)$(KICAD_BIN) + clean: rm *.o rm $(TARGET) diff -ru kicad-dev/eeschema/makefile.gtk kicad-dev-fedora/eeschema/makefile.gtk --- kicad-dev/eeschema/makefile.gtk 2006-06-02 13:45:48.000000000 +0200 +++ kicad-dev-fedora/eeschema/makefile.gtk 2007-02-07 16:39:35.000000000 +0100 @@ -31,7 +31,7 @@ install: - cp $(TARGET) $(KICAD_BIN) + cp $(TARGET) $(DESTDIR)$(KICAD_BIN) clean: diff -ru kicad-dev/gerbview/makefile.gtk kicad-dev-fedora/gerbview/makefile.gtk --- kicad-dev/gerbview/makefile.gtk 2006-06-02 13:45:54.000000000 +0200 +++ kicad-dev-fedora/gerbview/makefile.gtk 2007-02-07 16:39:47.000000000 +0100 @@ -21,10 +21,10 @@ $(TARGET): $(OBJECTS) makefile.gtk makefile.include $(EXTRALIBS) ../libs.linux - $(LD) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) - + $(LD) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) + install: - cp $(TARGET) $(KICAD_BIN) + cp $(TARGET) $(DESTDIR)$(KICAD_BIN) clean: diff -ru kicad-dev/kicad/makefile.gtk kicad-dev-fedora/kicad/makefile.gtk --- kicad-dev/kicad/makefile.gtk 2006-10-16 13:34:02.000000000 +0200 +++ kicad-dev-fedora/kicad/makefile.gtk 2007-02-07 16:40:08.000000000 +0100 @@ -26,7 +26,7 @@ $(LD) $(OBJECTS) $(LDFLAGS) $(LIBS) -o $(TARGET) install: - cp -f $(TARGET) $(KICAD_BIN) + cp -f $(TARGET) $(DESTDIR)$(KICAD_BIN) clean: rm -f *.o; diff -ru kicad-dev/libs.linux kicad-dev-fedora/libs.linux --- kicad-dev/libs.linux 2006-11-14 16:01:20.000000000 +0100 +++ kicad-dev-fedora/libs.linux 2007-02-07 17:03:43.000000000 +0100 @@ -1,6 +1,6 @@ #Configuration for build kicad -KICAD_BIN = /usr/local/kicad/linux +KICAD_BIN = /usr/bin SRCSUFF = .cpp @@ -11,10 +11,10 @@ # You must comment or uncomment this line for dynamic or static link # dynamic link is less difficult than static link # choose it if you have problems (libs not found, or unresolved references) ), or if kicad is running only on YOUR system. -KICAD_STATIC_LINK = 1 +# KICAD_STATIC_LINK = 1 # path and version definition for wxWidgets and mesa libs -MESALIBSPATH = /usr/local/lib +MESALIBSPATH = /usr/lib WXPATH = `wx-config --prefix`/lib PREFIX_WX_LIBS = lib`wx-config --basename` SUFFIX_WX_LIBSTD = `wx-config --utility=` @@ -69,11 +69,11 @@ endif -# attention ? l'ordre des libairies -LIBS = -L/usr/local/lib -L/usr/X11R6/lib\ +# attention ???l'ordre des libairies +LIBS = -L/usr/lib -L/usr/X11R6/lib\ $(EXTRALIBS) $(WXSYSLIB)\ $(LIBSTDC) -LIBS_WITH_GL = -L/usr/local/lib -L/usr/X11R6/lib\ +LIBS_WITH_GL = -L/usr/lib -L/usr/X11R6/lib\ $(EXTRALIBS) $(WXSYSLIB_WITH_GL)\ $(LIBSTDC) Seulement dans kicad-dev-fedora: libs.linux~ diff -ru kicad-dev/pcbnew/makefile.gtk kicad-dev-fedora/pcbnew/makefile.gtk --- kicad-dev/pcbnew/makefile.gtk 2006-06-02 13:45:50.000000000 +0200 +++ kicad-dev-fedora/pcbnew/makefile.gtk 2007-02-07 16:40:27.000000000 +0100 @@ -23,11 +23,11 @@ $(TARGET): $(OBJECTS) makefile.gtk makefile.include $(LIBVIEWER3D) $(EXTRALIBS) ../libs.linux $(LD) $(LDFLAGS) $(OBJECTS) $(LIBVIEWER3D) $(LIBS_WITH_GL)\ - -o $(TARGET) - - + -o $(TARGET) + + install: - cp $(TARGET) $(KICAD_BIN) + cp $(TARGET) $(DESTDIR)$(KICAD_BIN) clean: kicad-2007.01.15.rpm.opt.flags.diff: --- NEW FILE kicad-2007.01.15.rpm.opt.flags.diff --- diff -ru kicad-dev/3d-viewer/makefile.gtk kicad-dev-fedora/3d-viewer/makefile.gtk --- kicad-dev/3d-viewer/makefile.gtk 2006-06-02 13:45:52.000000000 +0200 +++ kicad-dev-fedora/3d-viewer/makefile.gtk 2007-02-08 13:53:45.000000000 +0100 @@ -4,7 +4,7 @@ # Compiler flags. CPPFLAGS = -Wall -O2 -DPCBNEW -I../pcbnew -I ../include -I../common\ - `wx-config --cxxflags` + `wx-config --cxxflags` $(RPM_OPT_FLAGS) include ../libs.linux diff -ru kicad-dev/common/makefile.gtk kicad-dev-fedora/common/makefile.gtk --- kicad-dev/common/makefile.gtk 2006-06-02 13:45:44.000000000 +0200 +++ kicad-dev-fedora/common/makefile.gtk 2007-02-08 13:54:14.000000000 +0100 @@ -2,7 +2,7 @@ CC = gcc # Compiler flags. -CPPFLAGS = -Wall -O2 -I./ -I../include `wx-config --cflags` +CPPFLAGS = -Wall -O2 -I./ -I../include `wx-config --cflags` $(RPM_OPT_FLAGS) EDACPPFLAGS = $(CPPFLAGS) diff -ru kicad-dev/cvpcb/makefile.gtk kicad-dev-fedora/cvpcb/makefile.gtk --- kicad-dev/cvpcb/makefile.gtk 2007-02-07 16:39:09.000000000 +0100 +++ kicad-dev-fedora/cvpcb/makefile.gtk 2007-02-08 13:54:41.000000000 +0100 @@ -8,9 +8,9 @@ # Compiler flags. -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) -LDFLAGS = -s +LDFLAGS = EDACPPFLAGS = $(CPPFLAGS) diff -ru kicad-dev/eeschema/makefile.gtk kicad-dev-fedora/eeschema/makefile.gtk --- kicad-dev/eeschema/makefile.gtk 2007-02-07 16:39:35.000000000 +0100 +++ kicad-dev-fedora/eeschema/makefile.gtk 2007-02-08 13:55:06.000000000 +0100 @@ -6,14 +6,14 @@ FINAL = 1 -LDFLAGS = -s +LDFLAGS = include ../libs.linux TARGET = eeschema -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) all: $(TARGET) diff -ru kicad-dev/gerbview/makefile.gtk kicad-dev-fedora/gerbview/makefile.gtk --- kicad-dev/gerbview/makefile.gtk 2007-02-07 16:39:47.000000000 +0100 +++ kicad-dev-fedora/gerbview/makefile.gtk 2007-02-08 13:55:23.000000000 +0100 @@ -3,9 +3,9 @@ LD = gcc # Compiler flags. -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) -LDFLAGS = -s +LDFLAGS = include ../libs.linux diff -ru kicad-dev/kicad/makefile.gtk kicad-dev-fedora/kicad/makefile.gtk --- kicad-dev/kicad/makefile.gtk 2007-02-07 16:40:08.000000000 +0100 +++ kicad-dev-fedora/kicad/makefile.gtk 2007-02-08 13:55:39.000000000 +0100 @@ -7,8 +7,8 @@ FINAL = 1 # Compiler flags. -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` -LDFLAGS = -s +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) +LDFLAGS = include ../libs.linux diff -ru kicad-dev/pcbnew/makefile.gtk kicad-dev-fedora/pcbnew/makefile.gtk --- kicad-dev/pcbnew/makefile.gtk 2007-02-07 16:40:27.000000000 +0100 +++ kicad-dev-fedora/pcbnew/makefile.gtk 2007-02-08 13:56:01.000000000 +0100 @@ -4,9 +4,9 @@ # Compiler flags. -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` +CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS) -LDFLAGS = -s +LDFLAGS = include ../libs.linux Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kicad/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 22 Sep 2006 13:59:46 -0000 1.3 +++ .cvsignore 8 Feb 2007 13:31:34 -0000 1.4 @@ -1,2 +1,2 @@ -kicad-sources-2006-08-28.zip -kicad-src-extras-2006-08-28.tar.bz2 +kicad-sources-2007-01-15.zip +kicad-src-extras-2007-01-15.tar.bz2 Index: kicad.spec =================================================================== RCS file: /cvs/extras/rpms/kicad/FC-4/kicad.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kicad.spec 8 Feb 2007 12:25:30 -0000 1.3 +++ kicad.spec 8 Feb 2007 13:31:34 -0000 1.4 @@ -1,14 +1,14 @@ Name: kicad -Version: 2006.08.28 -Release: 2%{?dist} +Version: 2007.01.15 +Release: 1%{?dist} Summary: Electronic schematic diagrams and printed circuit board artwork Summary(fr): Saisie de sch??ma ??lectronique et trac?? de circuit imprim?? Group: Applications/Engineering License: GPL Url: http://www.lis.inpg.fr/realise_au_lis/kicad/ -Source: ftp://iut-tice.ujf-grenoble.fr/cao/sources/kicad-sources-2006-08-28.zip -Source1: http://linuxelectronique.free.fr/download/kicad-src-extras-2006-08-28.tar.bz2 +Source: ftp://iut-tice.ujf-grenoble.fr/cao/sources/kicad-sources-2007-01-15.zip +Source1: http://linuxelectronique.free.fr/download/kicad-src-extras-2007-01-15.tar.bz2 Source2: %{name}.desktop Patch: %{name}-%{version}.destdir.diff Patch1: %{name}-%{version}.rpm.opt.flags.diff @@ -39,8 +39,8 @@ %prep %setup -q -n kicad-dev -a 1 -%{__cp} -a kicad-src-extras-2006-08-28/* . -%{__rm} -rf kicad-src-extras-2006-08-28 +%{__cp} -a kicad-src-extras-2007-01-15/* . +%{__rm} -rf kicad-src-extras-2007-01-15 # Convert MSDOS EOL to Unix EOL before applying patches @@ -59,18 +59,18 @@ %build # These files are not scripts -for f in {copyright,gpl,licendoc,README,version}.txt +for f in {copyright,gpl,licendoc,version}.txt do %{__chmod} -x $f done # Convert MSDOS EOL to Unix EOL -for f in {author,contrib,copyright,doc_conv_orcad*,gpl,licendoc,README}.txt +for f in {author,contrib,copyright,doc_conv_orcad*,gpl,licendoc}.txt do %{__sed} -i -e 's/\r$//' $f done -for f in help/fr/{contents.hhc,kicad.hhp,cvpcb/cvpcb.pdf,cvpcb/cvpcb-fr.html,eeschema/eeschema.html,eeschema/eeschema.pdf,file_formats/file_formats.html,gerbview/gerbview.html,kicad/kicad.html,pcbnew/pcbnew.html} +for f in help/fr/{contents.hhc,kicad.hhp,cvpcb/cvpcb-fr.html,eeschema/eeschema.html,eeschema/eeschema.pdf,file_formats/file_formats.html,gerbview/gerbview.html,kicad/kicad.html,pcbnew/pcbnew.html} do %{__sed} -i -e 's/\r$//' $f done @@ -85,7 +85,7 @@ %{__sed} -i -e 's/\r$//' $f done -for f in help/pt/{contents.hhc,kicad.hhp,cvpcb/cvpcb-pt.html,eeschema/eeschema-pt.html,file_formats/file_formats.html,gerbview/gerbview.html,kicad/kicad_pt_BR.html,pcbnew/pcbnew.html} +for f in help/pt/{contents.hhc,kicad.hhp,cvpcb/cvpcb-pt.html,eeschema/eeschema-pt.html,eeschema/eeschema_pt_BR.html,file_formats/file_formats.html,gerbview/gerbview.html,kicad/kicad_pt_BR.html,kicad/kicad-pt.html,pcbnew/pcbnew.html,pcbnew/pcbnew_pt_BR.html} do %{__sed} -i -e 's/\r$//' $f done @@ -234,8 +234,7 @@ %files -f %{name}.lang %defattr(-,root,root) %doc author.txt contrib.txt copyright.txt doc_conv_orcad_to_kicad_spanish.txt -%doc doc_conv_orcad_to_kicad.txt gpl.txt licendoc.txt lisezmoi.txt news.txt -%doc README.txt version.txt +%doc doc_conv_orcad_to_kicad.txt gpl.txt licendoc.txt news.txt version.txt %{_bindir}/* %{_libdir}/%{name}/ %{_libdir}/%{name}/plugins/ @@ -245,6 +244,9 @@ %{_datadir}/pixmaps/kicad_icon.png %changelog +* Thu Feb 8 2007 Alain Portal 2007.01.15-1 + - New upstream version + * Thu Feb 8 2007 Alain Portal 2006.08.28-2 - Add patch to build with RPM_OPT_FLAGS and remove -s from LDFLAGS Contribution of Ville Skytt?? Index: sources =================================================================== RCS file: /cvs/extras/rpms/kicad/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 22 Sep 2006 13:59:46 -0000 1.3 +++ sources 8 Feb 2007 13:31:34 -0000 1.4 @@ -1,2 +1,2 @@ -0695942d01c3d22f474728ba9081e559 kicad-sources-2006-08-28.zip -d85926d89becfcc344e299c81e91d293 kicad-src-extras-2006-08-28.tar.bz2 +61a0ba615b67af313d1214ed1a3d5a66 kicad-sources-2007-01-15.zip +3263536df405f0d282a61d894feb6f05 kicad-src-extras-2007-01-15.tar.bz2 From fedora-extras-commits at redhat.com Thu Feb 8 14:17:28 2007 From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp)) Date: Thu, 8 Feb 2007 09:17:28 -0500 Subject: rpms/espeak/devel .cvsignore, 1.5, 1.6 espeak.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200702081417.l18EHSab008387@cvs-int.fedora.redhat.com> Author: faucamp Update of /cvs/extras/rpms/espeak/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8343 Modified Files: .cvsignore espeak.spec sources Log Message: - Update to version 1.20 - Solves stack smash bug (RHBZ #227316) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/espeak/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 5 Feb 2007 09:47:16 -0000 1.5 +++ .cvsignore 8 Feb 2007 14:16:56 -0000 1.6 @@ -1 +1 @@ -espeak-1.19-source.zip +espeak-1.20-source.zip Index: espeak.spec =================================================================== RCS file: /cvs/extras/rpms/espeak/devel/espeak.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- espeak.spec 5 Feb 2007 09:47:16 -0000 1.5 +++ espeak.spec 8 Feb 2007 14:16:56 -0000 1.6 @@ -1,5 +1,5 @@ Name: espeak -Version: 1.19 +Version: 1.20 Release: 1%{?dist} Summary: Software speech synthesizer (text-to-speech) @@ -81,6 +81,10 @@ %changelog +* Thu Feb 08 2007 Francois Aucamp - 1.20-1 +- Update to version 1.20 +- Solves stack smash bug (RHBZ #227316) + * Fri Jan 26 2007 Francois Aucamp - 1.19-1 - Update to version 1.19 - Removed "espeak-1.18-makefile_lpthread" patch as it has been included upstream Index: sources =================================================================== RCS file: /cvs/extras/rpms/espeak/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 5 Feb 2007 09:47:16 -0000 1.5 +++ sources 8 Feb 2007 14:16:56 -0000 1.6 @@ -1 +1 @@ -49d70bd49f7cc7c1151f5973ee26c152 espeak-1.19-source.zip +47dbb852987d22892bcc1c71eff39d61 espeak-1.20-source.zip From fedora-extras-commits at redhat.com Thu Feb 8 15:03:32 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb)) Date: Thu, 8 Feb 2007 10:03:32 -0500 Subject: rpms/nas/devel nas.spec,1.6,1.7 Message-ID: <200702081503.l18F3WRa012169@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/nas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12150 Modified Files: nas.spec Log Message: fix bug 227759 Index: nas.spec =================================================================== RCS file: /cvs/extras/rpms/nas/devel/nas.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- nas.spec 11 Oct 2006 13:14:00 -0000 1.6 +++ nas.spec 8 Feb 2007 15:03:00 -0000 1.7 @@ -1,9 +1,9 @@ Name: nas Summary: The Network Audio System (NAS) Version: 1.8 -Release: 10%{?dist} +Release: 11%{?dist} BuildRequires: bison flex -%if "%{?fedora}" > "4" || "%{?rhel}" > "4" +%if 1 || "%{?fedora}" > "4" || "%{?rhel}" > "4" BuildRequires: imake libXaw-devel libXpm-devel libXp-devel libXext-devel libXt-devel %define libdir_x11 %{_libdir}/X11 %else @@ -57,6 +57,8 @@ %build xmkmf +find . -name Makefile \ +| xargs sed -i -e 's/^\(\s*CDEBUGFLAGS\s*=.*\)/\1 $(RPM_OPT_FLAGS)/' make %{?_smp_mflags} World @@ -113,6 +115,9 @@ %changelog +* Thu Feb 08 2007 Frank B??ttner - 1.8-11%{?dist} +- fix bug 227759 + * Tue Sep 19 2006 Rex Dieter - 1.8-10 - don't rely-on/use potentially broken %%_libdir/X11 symlink (#207180) From fedora-extras-commits at redhat.com Thu Feb 8 15:05:15 2007 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 8 Feb 2007 10:05:15 -0500 Subject: rpms/xlockmore/devel .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 xlockmore.spec, 1.12, 1.13 Message-ID: <200702081505.l18F5FgT012243@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/xlockmore/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12211 Modified Files: .cvsignore sources xlockmore.spec Log Message: * Tue Feb 08 2007 Adrian Reber - 5.23-1 - updated to 5.23 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xlockmore/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 1 May 2006 06:36:08 -0000 1.8 +++ .cvsignore 8 Feb 2007 15:04:42 -0000 1.9 @@ -1 +1 @@ -xlockmore-5.22.tar.bz2 +xlockmore-5.23.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xlockmore/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 1 May 2006 06:36:08 -0000 1.8 +++ sources 8 Feb 2007 15:04:42 -0000 1.9 @@ -1 +1 @@ -abf503b6b7af128312fa3f500e8a2121 xlockmore-5.22.tar.bz2 +bd962b1dfa55ede6137c100bde834ee1 xlockmore-5.23.tar.bz2 Index: xlockmore.spec =================================================================== RCS file: /cvs/extras/rpms/xlockmore/devel/xlockmore.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- xlockmore.spec 12 Sep 2006 08:11:39 -0000 1.12 +++ xlockmore.spec 8 Feb 2007 15:04:42 -0000 1.13 @@ -1,11 +1,11 @@ Summary: Screen lock and screen saver Name: xlockmore -Version: 5.22 -Release: 3%{?dist} +Version: 5.23 +Release: 1%{?dist} License: BSD Group: Amusements/Graphics URL: http://www.tux.org/~bagleyd/xlockmore.html -Source0: http://www.tux.org/~bagleyd/latest/xlockmore-5.22.tar.bz2 +Source0: http://www.tux.org/~bagleyd/latest/xlockmore-5.23.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pam-devel esound-devel BuildRequires: mesa-libGL-devel mesa-libGLU-devel @@ -105,6 +105,9 @@ %{_bindir}/xglock %changelog +* Tue Feb 08 2007 Adrian Reber - 5.23-1 +- updated to 5.23 + * Tue Sep 12 2006 Adrian Reber - 5.22-3 - rebuilt - swtiched to lesstif From fedora-extras-commits at redhat.com Thu Feb 8 15:15:21 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb)) Date: Thu, 8 Feb 2007 10:15:21 -0500 Subject: rpms/nas/FC-6 nas.spec,1.6,1.7 Message-ID: <200702081515.l18FFL1f012352@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/nas/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12331 Modified Files: nas.spec Log Message: fix bug 227759 Index: nas.spec =================================================================== RCS file: /cvs/extras/rpms/nas/FC-6/nas.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- nas.spec 11 Oct 2006 13:14:00 -0000 1.6 +++ nas.spec 8 Feb 2007 15:14:48 -0000 1.7 @@ -1,9 +1,9 @@ Name: nas Summary: The Network Audio System (NAS) Version: 1.8 -Release: 10%{?dist} +Release: 11%{?dist} BuildRequires: bison flex -%if "%{?fedora}" > "4" || "%{?rhel}" > "4" +%if 1 || "%{?fedora}" > "4" || "%{?rhel}" > "4" BuildRequires: imake libXaw-devel libXpm-devel libXp-devel libXext-devel libXt-devel %define libdir_x11 %{_libdir}/X11 %else @@ -57,6 +57,8 @@ %build xmkmf +find . -name Makefile \ +| xargs sed -i -e 's/^\(\s*CDEBUGFLAGS\s*=.*\)/\1 $(RPM_OPT_FLAGS)/' make %{?_smp_mflags} World @@ -113,6 +115,9 @@ %changelog +* Thu Feb 08 2007 Frank B??ttner - 1.8-11%{?dist} +- fix bug 227759 + * Tue Sep 19 2006 Rex Dieter - 1.8-10 - don't rely-on/use potentially broken %%_libdir/X11 symlink (#207180) From fedora-extras-commits at redhat.com Thu Feb 8 15:18:23 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb)) Date: Thu, 8 Feb 2007 10:18:23 -0500 Subject: rpms/nas/FC-5 nas.spec,1.5,1.6 Message-ID: <200702081518.l18FINIf012428@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/nas/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12400 Modified Files: nas.spec Log Message: fix bug 227759 Index: nas.spec =================================================================== RCS file: /cvs/extras/rpms/nas/FC-5/nas.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- nas.spec 11 Oct 2006 13:20:28 -0000 1.5 +++ nas.spec 8 Feb 2007 15:17:51 -0000 1.6 @@ -1,9 +1,9 @@ Name: nas Summary: The Network Audio System (NAS) Version: 1.8 -Release: 10%{?dist} +Release: 11%{?dist} BuildRequires: bison flex -%if "%{?fedora}" > "4" || "%{?rhel}" > "4" +%if 1 || "%{?fedora}" > "4" || "%{?rhel}" > "4" BuildRequires: imake libXaw-devel libXpm-devel libXp-devel libXext-devel libXt-devel %define libdir_x11 %{_libdir}/X11 %else @@ -57,6 +57,8 @@ %build xmkmf +find . -name Makefile \ +| xargs sed -i -e 's/^\(\s*CDEBUGFLAGS\s*=.*\)/\1 $(RPM_OPT_FLAGS)/' make %{?_smp_mflags} World @@ -113,8 +115,11 @@ %changelog +* Thu Feb 08 2007 Frank B??ttner - 1.8-11%{?dist} +- fix bug 227759 + * Tue Sep 19 2006 Rex Dieter - 1.8-10 -- don't rely-on/use (potentially broken) %%_libdir/X11 symlink (#207180) +- don't rely-on/use potentially broken %%_libdir/X11 symlink (#207180) * Mon Sep 11 2006 Frank B??ttner - 1.8-9%{?dist} - second rebuild for FC6 From fedora-extras-commits at redhat.com Thu Feb 8 15:21:15 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb)) Date: Thu, 8 Feb 2007 10:21:15 -0500 Subject: rpms/nas/FC-4 nas.spec,1.7,1.8 Message-ID: <200702081521.l18FLFLn012503@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/nas/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12478 Modified Files: nas.spec Log Message: fix bug 227759 Index: nas.spec =================================================================== RCS file: /cvs/extras/rpms/nas/FC-4/nas.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- nas.spec 11 Oct 2006 13:20:01 -0000 1.7 +++ nas.spec 8 Feb 2007 15:20:43 -0000 1.8 @@ -1,9 +1,9 @@ Name: nas Summary: The Network Audio System (NAS) Version: 1.8 -Release: 10%{?dist} +Release: 11%{?dist} BuildRequires: bison flex -%if "%{?fedora}" > "4" || "%{?rhel}" > "4" +%if 1 || "%{?fedora}" > "4" || "%{?rhel}" > "4" BuildRequires: imake libXaw-devel libXpm-devel libXp-devel libXext-devel libXt-devel %define libdir_x11 %{_libdir}/X11 %else @@ -57,6 +57,8 @@ %build xmkmf +find . -name Makefile \ +| xargs sed -i -e 's/^\(\s*CDEBUGFLAGS\s*=.*\)/\1 $(RPM_OPT_FLAGS)/' make %{?_smp_mflags} World @@ -113,8 +115,11 @@ %changelog +* Thu Feb 08 2007 Frank B??ttner - 1.8-11%{?dist} +- fix bug 227759 + * Tue Sep 19 2006 Rex Dieter - 1.8-10 -- don't rely-on/use (potentially broken) %%_libdir/X11 symlink (#207180) +- don't rely-on/use potentially broken %%_libdir/X11 symlink (#207180) * Mon Sep 11 2006 Frank B??ttner - 1.8-9%{?dist} - second rebuild for FC6 From fedora-extras-commits at redhat.com Thu Feb 8 15:28:50 2007 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 8 Feb 2007 10:28:50 -0500 Subject: rpms/xlockmore/FC-5 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 xlockmore.spec, 1.10, 1.11 Message-ID: <200702081528.l18FSot9012663@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/xlockmore/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12642 Modified Files: .cvsignore sources xlockmore.spec Log Message: * Tue Feb 08 2007 Adrian Reber - 5.23-1 - updated to 5.23 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xlockmore/FC-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 1 May 2006 06:54:52 -0000 1.8 +++ .cvsignore 8 Feb 2007 15:28:18 -0000 1.9 @@ -1 +1 @@ -xlockmore-5.22.tar.bz2 +xlockmore-5.23.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xlockmore/FC-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 1 May 2006 06:54:52 -0000 1.8 +++ sources 8 Feb 2007 15:28:18 -0000 1.9 @@ -1 +1 @@ -abf503b6b7af128312fa3f500e8a2121 xlockmore-5.22.tar.bz2 +bd962b1dfa55ede6137c100bde834ee1 xlockmore-5.23.tar.bz2 Index: xlockmore.spec =================================================================== RCS file: /cvs/extras/rpms/xlockmore/FC-5/xlockmore.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- xlockmore.spec 1 May 2006 06:54:52 -0000 1.10 +++ xlockmore.spec 8 Feb 2007 15:28:18 -0000 1.11 @@ -1,16 +1,16 @@ Summary: Screen lock and screen saver Name: xlockmore -Version: 5.22 +Version: 5.23 Release: 1%{?dist} License: BSD Group: Amusements/Graphics URL: http://www.tux.org/~bagleyd/xlockmore.html -Source0: http://www.tux.org/~bagleyd/latest/xlockmore-5.22.tar.bz2 +Source0: http://www.tux.org/~bagleyd/latest/xlockmore-5.23.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pam-devel esound-devel BuildRequires: mesa-libGL-devel mesa-libGLU-devel BuildRequires: desktop-file-utils libXdmcp-devel -BuildRequires: openmotif-devel gtk2-devel +BuildRequires: lesstif-devel gtk2-devel BuildRequires: libXau-devel %description @@ -105,6 +105,16 @@ %{_bindir}/xglock %changelog +* Tue Feb 08 2007 Adrian Reber - 5.23-1 +- updated to 5.23 + +* Tue Sep 12 2006 Adrian Reber - 5.22-3 +- rebuilt +- swtiched to lesstif + +* Sun Jul 09 2006 Adrian Reber - 5.22-2 +- rebuild for new freetype + * Mon May 01 2006 Adrian Reber - 5.22-1 - updated to 5.22 - changed pam file to use include instead of pam_stack.so From fedora-extras-commits at redhat.com Thu Feb 8 15:39:15 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Thu, 8 Feb 2007 10:39:15 -0500 Subject: rpms/beryl-core/devel beryl-core.spec,1.13,1.14 Message-ID: <200702081539.l18FdFAm012834@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/beryl-core/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12795 Modified Files: beryl-core.spec Log Message: Turn beryl-xgl on again (#227844) -- did I mention I suspect upstream is on crack? Index: beryl-core.spec =================================================================== RCS file: /cvs/extras/rpms/beryl-core/devel/beryl-core.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- beryl-core.spec 5 Feb 2007 16:17:39 -0000 1.13 +++ beryl-core.spec 8 Feb 2007 15:38:43 -0000 1.14 @@ -3,7 +3,7 @@ License: GPL Group: User Interface/Desktops Version: 0.1.9999.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Beryl OpenGL window and compositing manager BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -106,6 +106,7 @@ popd %configure --enable-berylmesa \ --with-berylmesadir=./beryl-mesa \ + --enable-xgl \ --x-includes=%{_includedir}/X11/ \ --x-libraries=%{_libdir}/X11/ make %{?_smp_mflags} @@ -159,6 +160,10 @@ %defattr(-,root,root,-) %changelog +* Thu Feb 08 2007 Jarod Wilson 0.1.9999.1-3 +- Upstream changed how to turn on beryl-xgl build, respin to + turn it back on again (#227844) + * Mon Feb 05 2007 Jarod Wilson 0.1.9999.1-2 - Add R: on beryl-settings-simple to meta-packages From fedora-extras-commits at redhat.com Thu Feb 8 15:39:21 2007 From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp)) Date: Thu, 8 Feb 2007 10:39:21 -0500 Subject: rpms/espeak/FC-6 .cvsignore, 1.5, 1.6 espeak.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200702081539.l18FdLGD012839@cvs-int.fedora.redhat.com> Author: faucamp Update of /cvs/extras/rpms/espeak/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12781 Modified Files: .cvsignore espeak.spec sources Log Message: - Update to version 1.20 - Solves stack smash bug (RHBZ #227316) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/espeak/FC-6/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 5 Feb 2007 09:53:55 -0000 1.5 +++ .cvsignore 8 Feb 2007 15:38:49 -0000 1.6 @@ -1 +1 @@ -espeak-1.19-source.zip +espeak-1.20-source.zip Index: espeak.spec =================================================================== RCS file: /cvs/extras/rpms/espeak/FC-6/espeak.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- espeak.spec 5 Feb 2007 09:53:55 -0000 1.5 +++ espeak.spec 8 Feb 2007 15:38:49 -0000 1.6 @@ -1,5 +1,5 @@ Name: espeak -Version: 1.19 +Version: 1.20 Release: 1%{?dist} Summary: Software speech synthesizer (text-to-speech) @@ -81,6 +81,10 @@ %changelog +* Thu Feb 08 2007 Francois Aucamp - 1.20-1 +- Update to version 1.20 +- Solves stack smash bug (RHBZ #227316) + * Fri Jan 26 2007 Francois Aucamp - 1.19-1 - Update to version 1.19 - Removed "espeak-1.18-makefile_lpthread" patch as it has been included upstream Index: sources =================================================================== RCS file: /cvs/extras/rpms/espeak/FC-6/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 5 Feb 2007 09:53:55 -0000 1.5 +++ sources 8 Feb 2007 15:38:49 -0000 1.6 @@ -1 +1 @@ -49d70bd49f7cc7c1151f5973ee26c152 espeak-1.19-source.zip +47dbb852987d22892bcc1c71eff39d61 espeak-1.20-source.zip From fedora-extras-commits at redhat.com Thu Feb 8 15:41:50 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Thu, 8 Feb 2007 10:41:50 -0500 Subject: rpms/beryl-core/FC-6 beryl-core.spec,1.10,1.11 Message-ID: <200702081541.l18FfonC012930@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/beryl-core/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12901 Modified Files: beryl-core.spec Log Message: Turn beryl-xgl on again (#227844) -- did I mention I suspect upstream is on crack? Index: beryl-core.spec =================================================================== RCS file: /cvs/extras/rpms/beryl-core/FC-6/beryl-core.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- beryl-core.spec 5 Feb 2007 16:17:12 -0000 1.10 +++ beryl-core.spec 8 Feb 2007 15:41:17 -0000 1.11 @@ -3,7 +3,7 @@ License: GPL Group: User Interface/Desktops Version: 0.1.9999.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Beryl OpenGL window and compositing manager BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -106,6 +106,7 @@ popd %configure --enable-berylmesa \ --with-berylmesadir=./beryl-mesa \ + --enable-xgl \ --x-includes=%{_includedir}/X11/ \ --x-libraries=%{_libdir}/X11/ make %{?_smp_mflags} @@ -159,6 +160,10 @@ %defattr(-,root,root,-) %changelog +* Thu Feb 08 2007 Jarod Wilson 0.1.9999.1-3 +- Upstream changed how to turn on beryl-xgl build, respin to + turn it back on again (#227844) + * Mon Feb 05 2007 Jarod Wilson 0.1.9999.1-2 - Add R: on beryl-settings-simple to meta-packages From fedora-extras-commits at redhat.com Thu Feb 8 15:42:20 2007 From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp)) Date: Thu, 8 Feb 2007 10:42:20 -0500 Subject: rpms/espeak/FC-5 .cvsignore, 1.5, 1.6 espeak.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200702081542.l18FgK84013024@cvs-int.fedora.redhat.com> Author: faucamp Update of /cvs/extras/rpms/espeak/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12924 Modified Files: .cvsignore espeak.spec sources Log Message: - Update to version 1.20 - Solves stack smash bug (RHBZ #227316) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/espeak/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 5 Feb 2007 09:57:44 -0000 1.5 +++ .cvsignore 8 Feb 2007 15:41:48 -0000 1.6 @@ -1 +1 @@ -espeak-1.19-source.zip +espeak-1.20-source.zip Index: espeak.spec =================================================================== RCS file: /cvs/extras/rpms/espeak/FC-5/espeak.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- espeak.spec 5 Feb 2007 09:57:44 -0000 1.5 +++ espeak.spec 8 Feb 2007 15:41:48 -0000 1.6 @@ -1,5 +1,5 @@ Name: espeak -Version: 1.19 +Version: 1.20 Release: 1%{?dist} Summary: Software speech synthesizer (text-to-speech) @@ -81,6 +81,10 @@ %changelog +* Thu Feb 08 2007 Francois Aucamp - 1.20-1 +- Update to version 1.20 +- Solves stack smash bug (RHBZ #227316) + * Fri Jan 26 2007 Francois Aucamp - 1.19-1 - Update to version 1.19 - Removed "espeak-1.18-makefile_lpthread" patch as it has been included upstream Index: sources =================================================================== RCS file: /cvs/extras/rpms/espeak/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 5 Feb 2007 09:57:44 -0000 1.5 +++ sources 8 Feb 2007 15:41:48 -0000 1.6 @@ -1 +1 @@ -49d70bd49f7cc7c1151f5973ee26c152 espeak-1.19-source.zip +47dbb852987d22892bcc1c71eff39d61 espeak-1.20-source.zip From fedora-extras-commits at redhat.com Thu Feb 8 15:43:03 2007 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 8 Feb 2007 10:43:03 -0500 Subject: rpms/xlockmore/FC-6 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 xlockmore.spec, 1.12, 1.13 Message-ID: <200702081543.l18Fh307013109@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/xlockmore/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13034 Modified Files: .cvsignore sources xlockmore.spec Log Message: * Tue Feb 08 2007 Adrian Reber - 5.23-1 - updated to 5.23 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xlockmore/FC-6/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 1 May 2006 06:36:08 -0000 1.8 +++ .cvsignore 8 Feb 2007 15:42:31 -0000 1.9 @@ -1 +1 @@ -xlockmore-5.22.tar.bz2 +xlockmore-5.23.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xlockmore/FC-6/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 1 May 2006 06:36:08 -0000 1.8 +++ sources 8 Feb 2007 15:42:31 -0000 1.9 @@ -1 +1 @@ -abf503b6b7af128312fa3f500e8a2121 xlockmore-5.22.tar.bz2 +bd962b1dfa55ede6137c100bde834ee1 xlockmore-5.23.tar.bz2 Index: xlockmore.spec =================================================================== RCS file: /cvs/extras/rpms/xlockmore/FC-6/xlockmore.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- xlockmore.spec 12 Sep 2006 08:11:39 -0000 1.12 +++ xlockmore.spec 8 Feb 2007 15:42:31 -0000 1.13 @@ -1,11 +1,11 @@ Summary: Screen lock and screen saver Name: xlockmore -Version: 5.22 -Release: 3%{?dist} +Version: 5.23 +Release: 1%{?dist} License: BSD Group: Amusements/Graphics URL: http://www.tux.org/~bagleyd/xlockmore.html -Source0: http://www.tux.org/~bagleyd/latest/xlockmore-5.22.tar.bz2 +Source0: http://www.tux.org/~bagleyd/latest/xlockmore-5.23.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pam-devel esound-devel BuildRequires: mesa-libGL-devel mesa-libGLU-devel @@ -105,6 +105,9 @@ %{_bindir}/xglock %changelog +* Tue Feb 08 2007 Adrian Reber - 5.23-1 +- updated to 5.23 + * Tue Sep 12 2006 Adrian Reber - 5.22-3 - rebuilt - swtiched to lesstif From fedora-extras-commits at redhat.com Thu Feb 8 15:43:19 2007 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Thu, 8 Feb 2007 10:43:19 -0500 Subject: rpms/koan/FC-6 koan.spec,1.9,1.10 Message-ID: <200702081543.l18FhJ4t013112@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/koan/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13041 Modified Files: koan.spec Log Message: Fix description Index: koan.spec =================================================================== RCS file: /cvs/extras/rpms/koan/FC-6/koan.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- koan.spec 8 Dec 2006 17:09:42 -0000 1.9 +++ koan.spec 8 Feb 2007 15:42:46 -0000 1.10 @@ -1,9 +1,9 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -Summary: Network provisioning tool for Xen and Existing Non-Bare Metal +Summary: Network provisioning tool for Xen and Bare-Metal Name: koan Version: 0.2.5 -Release: 1%{?dist} +Release: 2%{?dist} Source0: %{name}-%{version}.tar.gz License: GPL Group: Applications/System From fedora-extras-commits at redhat.com Thu Feb 8 15:45:02 2007 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 8 Feb 2007 10:45:02 -0500 Subject: rpms/xlockmore/FC-5 xlockmore.spec,1.11,1.12 Message-ID: <200702081545.l18Fj2hk013185@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/xlockmore/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13133 Modified Files: xlockmore.spec Log Message: it is still openmotif on FC-5 Index: xlockmore.spec =================================================================== RCS file: /cvs/extras/rpms/xlockmore/FC-5/xlockmore.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- xlockmore.spec 8 Feb 2007 15:28:18 -0000 1.11 +++ xlockmore.spec 8 Feb 2007 15:44:30 -0000 1.12 @@ -10,7 +10,7 @@ BuildRequires: pam-devel esound-devel BuildRequires: mesa-libGL-devel mesa-libGLU-devel BuildRequires: desktop-file-utils libXdmcp-devel -BuildRequires: lesstif-devel gtk2-devel +BuildRequires: openmotif-devel gtk2-devel BuildRequires: libXau-devel %description From fedora-extras-commits at redhat.com Thu Feb 8 15:46:07 2007 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Thu, 8 Feb 2007 10:46:07 -0500 Subject: rpms/koan/FC-6 koan.spec,1.10,1.11 Message-ID: <200702081546.l18Fk7bJ013215@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/koan/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13192 Modified Files: koan.spec Log Message: Disregard. Not enough caffeine yet this AM, the description was correct :) Index: koan.spec =================================================================== RCS file: /cvs/extras/rpms/koan/FC-6/koan.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- koan.spec 8 Feb 2007 15:42:46 -0000 1.10 +++ koan.spec 8 Feb 2007 15:45:35 -0000 1.11 @@ -1,9 +1,9 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -Summary: Network provisioning tool for Xen and Bare-Metal +Summary: Network provisioning tool for Xen and Existing Non-Bare Metal Name: koan Version: 0.2.5 -Release: 2%{?dist} +Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPL Group: Applications/System From fedora-extras-commits at redhat.com Thu Feb 8 16:14:46 2007 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Thu, 8 Feb 2007 11:14:46 -0500 Subject: rpms/revelation/devel revelation.spec,1.26,1.27 Message-ID: <200702081614.l18GEkCA017036@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/revelation/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16904 Modified Files: revelation.spec Log Message: 0.4.11-2 - use RPM_OPT_FLAGS during build (thx to Ville, #226680) Index: revelation.spec =================================================================== RCS file: /cvs/extras/rpms/revelation/devel/revelation.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- revelation.spec 16 Jan 2007 11:02:39 -0000 1.26 +++ revelation.spec 8 Feb 2007 16:14:14 -0000 1.27 @@ -4,7 +4,7 @@ Summary: Password manager for GNOME 2 Name: revelation Version: 0.4.11 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Productivity Source0: ftp://oss.codepoet.no/revelation/revelation-0.4.11.tar.bz2 @@ -44,7 +44,7 @@ %build %configure --disable-desktop-update --disable-mime-update --with-cracklib-dict=/usr/share/cracklib/pw_dict -make %{?_smp_mflags} +make %{?_smp_mflags} CC="%{__cc} $RPM_OPT_FLAGS" %install @@ -103,6 +103,9 @@ %{_libexecdir}/revelation-applet %changelog +* Wed Feb 07 2007 Thorsten Leemhuis 0.4.11-2 +- use RPM_OPT_FLAGS during build (patch from Ville, #226680) + * Thu Jan 11 2007 Thorsten Leemhuis 0.4.11-1 - update to 0.4.11 (fixes revelation-applet, upstream #202) - run gconftool-2 for applet stuff, too From fedora-extras-commits at redhat.com Thu Feb 8 16:59:03 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Thu, 8 Feb 2007 11:59:03 -0500 Subject: rpms/jd/devel .cvsignore, 1.62, 1.63 jd.spec, 1.73, 1.74 sources, 1.62, 1.63 Message-ID: <200702081659.l18Gx3Cl018421@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18400 Modified Files: .cvsignore jd.spec sources Log Message: * Thu Feb 8 2007 Mamoru Tasaka - 1.8.5-2.cvs070208 - cvs 070208 (24:25 JST) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- .cvsignore 5 Feb 2007 16:16:20 -0000 1.62 +++ .cvsignore 8 Feb 2007 16:58:30 -0000 1.63 @@ -1 +1 @@ -jd-1.8.5-cvs070205.tgz +jd-1.8.5-cvs070208.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- jd.spec 5 Feb 2007 16:16:20 -0000 1.73 +++ jd.spec 8 Feb 2007 16:58:30 -0000 1.74 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 1.8.5 -%define strtag cvs070205 +%define strtag cvs070208 %define repoid 23816 @@ -106,8 +106,8 @@ %{icondir}/%{name}.png %changelog -* Mon Feb 5 2007 Mamoru Tasaka - 1.8.5-2.cvs070205 -- cvs 070205 (22:35 JST) +* Thu Feb 8 2007 Mamoru Tasaka - 1.8.5-2.cvs070208 +- cvs 070208 (24:25 JST) * Fri Feb 2 2007 Mamoru Tasaka - 1.8.5-1 - 1.8.5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- sources 5 Feb 2007 16:16:20 -0000 1.62 +++ sources 8 Feb 2007 16:58:30 -0000 1.63 @@ -1 +1 @@ -d2c516c6c34cefa1d90b78f0b7f74c11 jd-1.8.5-cvs070205.tgz +a46a3350e6ea734f880b6d8eec9dafc2 jd-1.8.5-cvs070208.tgz From fedora-extras-commits at redhat.com Thu Feb 8 17:06:43 2007 From: fedora-extras-commits at redhat.com (David Anderson (anderson)) Date: Thu, 8 Feb 2007 12:06:43 -0500 Subject: rpms/bibletime/FC-6 .cvsignore,1.3,1.4 sources,1.3,1.4 Message-ID: <200702081706.l18H6hiJ021966@cvs-int.fedora.redhat.com> Author: anderson Update of /cvs/extras/rpms/bibletime/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21945 Modified Files: .cvsignore sources Log Message: new sources 1.6.3b Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bibletime/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 20 Jan 2007 15:41:50 -0000 1.3 +++ .cvsignore 8 Feb 2007 17:06:10 -0000 1.4 @@ -1,2 +1,2 @@ -bibletime-1.6.2.tar.bz2 -bibletime-i18n-1.6.2.tar.bz2 +bibletime-1.6.3b.tar.bz2 +bibletime-i18n-1.6.3b.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bibletime/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 20 Jan 2007 15:41:50 -0000 1.3 +++ sources 8 Feb 2007 17:06:10 -0000 1.4 @@ -1,2 +1,2 @@ -b2b8b624d21d397201aec742d43501e5 bibletime-1.6.2.tar.bz2 -a2d4dc8220253e39d8abf720c3ae8aff bibletime-i18n-1.6.2.tar.bz2 +50463409277994cf5da946cc12aefdd1 bibletime-1.6.3b.tar.bz2 +5ae7aeb18607971c80c68cf5a9c5ca4e bibletime-i18n-1.6.3b.tar.bz2 From fedora-extras-commits at redhat.com Thu Feb 8 17:25:18 2007 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 8 Feb 2007 12:25:18 -0500 Subject: extras-buildsys/utils/pushscript List.py,1.1,1.2 Message-ID: <200702081725.l18HPId2022400@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils/pushscript In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22379 Modified Files: List.py Log Message: group and umask check are not needed for this script Index: List.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/List.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- List.py 27 Oct 2006 09:18:00 -0000 1.1 +++ List.py 8 Feb 2007 17:25:15 -0000 1.2 @@ -42,7 +42,5 @@ cfg = Utils.load_config_module(sys.argv[1]) - Utils.signer_gid_check(cfg.signersgid) - os.umask(cfg.signersumask) main(cfg,sys.argv[2:]) sys.exit(0) From fedora-extras-commits at redhat.com Thu Feb 8 17:29:02 2007 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Thu, 8 Feb 2007 12:29:02 -0500 Subject: rpms/alsa-oss/devel alsa-oss-1.0.12-aoss.patch, 1.1, 1.2 alsa-oss.spec, 1.1, 1.2 Message-ID: <200702081729.l18HT2xb022463@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/alsa-oss/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22437 Modified Files: alsa-oss-1.0.12-aoss.patch alsa-oss.spec Log Message: * Thu Feb 08 2007 Patrick "Jima" Laughton 1.0.12-4 - Split out libraries to -libs subpackage, fixing BZ#221711 - Implemented changes as recommended by Jason Tibbitts - Adjusted aoss patch to allow for 32-bit library use on x86_64 - Added reference in man page to added functionality - Resultant alsa-oss package reports no-binary error (necessary evil, I guess) alsa-oss-1.0.12-aoss.patch: Index: alsa-oss-1.0.12-aoss.patch =================================================================== RCS file: /cvs/extras/rpms/alsa-oss/devel/alsa-oss-1.0.12-aoss.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- alsa-oss-1.0.12-aoss.patch 6 Oct 2006 14:11:15 -0000 1.1 +++ alsa-oss-1.0.12-aoss.patch 8 Feb 2007 17:28:30 -0000 1.2 @@ -1,13 +1,58 @@ ---- alsa/aoss.in.orig 2005-10-27 14:34:18.000000000 -0400 -+++ alsa/aoss.in 2006-04-02 15:53:53.000000000 -0400 -@@ -5,9 +5,7 @@ - # aoss +diff -urN alsa-oss-1.0.12/alsa/aoss.1 alsa-oss-1.0.12-patched/alsa/aoss.1 +--- alsa-oss-1.0.12/alsa/aoss.1 2006-08-22 13:43:53.000000000 -0500 ++++ alsa-oss-1.0.12-patched/alsa/aoss.1 2007-02-08 09:34:47.000000000 -0600 +@@ -3,7 +3,7 @@ + aoss \- Wrapper script to facilitate use of the ALSA OSS compatibility + library. + .SH SYNOPSIS +-\fBaoss\fP \fIosscommand\fP [arguments] ++\fBaoss\fP [-32] \fIosscommand\fP [arguments] + + .SH DESCRIPTION + \fBaoss\fP is a simple wrapper script which facilitates the use of the +@@ -38,6 +38,8 @@ + + .SS Arguments + .TP ++\f-32\fP ++Use 32-bit alsa-oss library (on 64-bit systems) + \fIosscommand\fP + A command that uses the OSS API + .TP +diff -urN alsa-oss-1.0.12/alsa/aoss.in alsa-oss-1.0.12-patched/alsa/aoss.in +--- alsa-oss-1.0.12/alsa/aoss.in 2006-08-22 13:43:53.000000000 -0500 ++++ alsa-oss-1.0.12-patched/alsa/aoss.in 2007-02-08 09:47:20.000000000 -0600 +@@ -2,12 +2,29 @@ + + # A simple script to facilitate the use of the OSS compatibility library. + # Usage: +-# aoss ++# aoss [-32] ++ ++if [ -f @prefix@/lib64/libaoss.so.0 ] ++then ++ AOSS_LIBDIR=@prefix@/lib64 ++else ++ AOSS_LIBDIR=@prefix@/lib ++fi ++ ++if [ "$1" = "-32" ] ++then ++ if [ -f @prefix@/lib/libaoss.so.0 ] ++ then ++ AOSS_LIBDIR=@prefix@/lib ++ shift ++ else ++ echo "$0 -32 called, but 32-bit alsa-oss-libs not found! Exiting..." ++ exit 2 ++ fi ++fi if [ -d /proc/asound ]; then - prefix=@prefix@ - exec_prefix=@exec_prefix@ - LD_PRELOAD=${exec_prefix}/\$LIB/libaoss.so${LD_PRELOAD:+:$LD_PRELOAD} exec "$@" -+ LD_PRELOAD=@libdir@/libaoss.so.0${LD_PRELOAD:+:$LD_PRELOAD} exec "$@" ++ LD_PRELOAD=${AOSS_LIBDIR}/libaoss.so.0${LD_PRELOAD:+:$LD_PRELOAD} exec "$@" else exec "$@" fi Index: alsa-oss.spec =================================================================== RCS file: /cvs/extras/rpms/alsa-oss/devel/alsa-oss.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- alsa-oss.spec 6 Oct 2006 14:11:15 -0000 1.1 +++ alsa-oss.spec 8 Feb 2007 17:28:30 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Advanced Linux Sound Architecture (ALSA) wrapper for OSS Name: alsa-oss Version: 1.0.12 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Multimedia URL: http://www.alsa-project.org/ @@ -12,22 +12,30 @@ %ifarch x86_64 BuildRequires: automake, libtool %endif +Requires: %{name}-libs = %{version}-%{release} %description This package contains the compatibility library and wrapper script for running legacy OSS applications through ALSA. Unlike the kernel driver, this has the advantage of supporting DMIX software mixing. +%package libs +Summary: ALSA/OSS wrapper libraries +Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} +%description libs +System libraries for alsa-oss. + %package devel Summary: Headers for ALSA wrapper for OSS Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version}-%{release}, %{name}-libs = %{version}-%{release} %description devel Header files for alsa-oss. %prep %setup -q -%patch0 +%patch0 -p1 %build %ifarch x86_64 @@ -48,13 +56,16 @@ %clean %{__rm} -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc COPYING %{_bindir}/aoss + +%files libs +%defattr(-,root,root,-) %{_libdir}/*.so.* %{_mandir}/man?/* @@ -67,6 +78,13 @@ %changelog +* Thu Feb 08 2007 Patrick "Jima" Laughton 1.0.12-4 +- Split out libraries to -libs subpackage, fixing BZ#221711 +- Implemented changes as recommended by Jason Tibbitts +- Adjusted aoss patch to allow for 32-bit library use on x86_64 +- Added reference in man page to added functionality +- Resultant alsa-oss package reports no-binary error (necessary evil, I guess) + * Fri Oct 06 2006 Patrick "Jima" Laughton 1.0.12-3 - Added conditionalized rpath fixes for x86_64 (thanks Denis!) - Re-added *.a to -devel package From fedora-extras-commits at redhat.com Thu Feb 8 17:49:31 2007 From: fedora-extras-commits at redhat.com (David Anderson (anderson)) Date: Thu, 8 Feb 2007 12:49:31 -0500 Subject: rpms/bibletime/FC-6 bibletime.spec,1.3,1.4 Message-ID: <200702081749.l18HnVxi022907@cvs-int.fedora.redhat.com> Author: anderson Update of /cvs/extras/rpms/bibletime/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22888 Modified Files: bibletime.spec Log Message: version bump as I grapple with CVS... Index: bibletime.spec =================================================================== RCS file: /cvs/extras/rpms/bibletime/FC-6/bibletime.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- bibletime.spec 5 Feb 2007 15:24:18 -0000 1.3 +++ bibletime.spec 8 Feb 2007 17:48:59 -0000 1.4 @@ -1,7 +1,7 @@ Summary: BibleTime is an easy to use Bible study tool for KDE Name: bibletime Version: 1.6.3b -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Url: http://www.bibletime.info/ Group: Applications/Productivity @@ -88,7 +88,7 @@ %doc README LICENSE %changelog -* Mon Feb 05 2007 David Anderson 1.6.3b-2 +* Mon Feb 05 2007 David Anderson 1.6.3b-3 - 1.6.3b * Sat Jan 27 2007 David Anderson 1.6.2-5 From fedora-extras-commits at redhat.com Thu Feb 8 17:51:32 2007 From: fedora-extras-commits at redhat.com (David Anderson (anderson)) Date: Thu, 8 Feb 2007 12:51:32 -0500 Subject: rpms/bibletime/FC-5 bibletime.spec,1.3,1.4 Message-ID: <200702081751.l18HpWJq022976@cvs-int.fedora.redhat.com> Author: anderson Update of /cvs/extras/rpms/bibletime/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22955 Modified Files: bibletime.spec Log Message: bump Index: bibletime.spec =================================================================== RCS file: /cvs/extras/rpms/bibletime/FC-5/bibletime.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- bibletime.spec 5 Feb 2007 15:25:31 -0000 1.3 +++ bibletime.spec 8 Feb 2007 17:51:00 -0000 1.4 @@ -1,7 +1,7 @@ Summary: BibleTime is an easy to use Bible study tool for KDE Name: bibletime Version: 1.6.3b -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Url: http://www.bibletime.info/ Group: Applications/Productivity @@ -88,7 +88,7 @@ %doc README LICENSE %changelog -* Mon Feb 05 2007 David Anderson 1.6.3b-2 +* Mon Feb 05 2007 David Anderson 1.6.3b-3 - 1.6.3b * Sat Jan 27 2007 David Anderson 1.6.2-5 From fedora-extras-commits at redhat.com Thu Feb 8 17:52:27 2007 From: fedora-extras-commits at redhat.com (David Anderson (anderson)) Date: Thu, 8 Feb 2007 12:52:27 -0500 Subject: rpms/bibletime/devel bibletime.spec,1.3,1.4 Message-ID: <200702081752.l18HqRpf023040@cvs-int.fedora.redhat.com> Author: anderson Update of /cvs/extras/rpms/bibletime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23020 Modified Files: bibletime.spec Log Message: bump Index: bibletime.spec =================================================================== RCS file: /cvs/extras/rpms/bibletime/devel/bibletime.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- bibletime.spec 5 Feb 2007 15:20:21 -0000 1.3 +++ bibletime.spec 8 Feb 2007 17:51:55 -0000 1.4 @@ -1,7 +1,7 @@ Summary: BibleTime is an easy to use Bible study tool for KDE Name: bibletime Version: 1.6.3b -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Url: http://www.bibletime.info/ Group: Applications/Productivity @@ -88,7 +88,7 @@ %doc README LICENSE %changelog -* Mon Feb 05 2007 David Anderson 1.6.3b-2 +* Mon Feb 05 2007 David Anderson 1.6.3b-3 - 1.6.3b * Sat Jan 27 2007 David Anderson 1.6.2-5 From fedora-extras-commits at redhat.com Thu Feb 8 18:45:39 2007 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 8 Feb 2007 13:45:39 -0500 Subject: extras-buildsys/utils/pushscript LockFile.py, NONE, 1.1 Push.py, 1.27, 1.28 Message-ID: <200702081845.l18IjdqM026864@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils/pushscript In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26846 Modified Files: Push.py Added Files: LockFile.py Log Message: Split off LockFile class. --- NEW FILE LockFile.py --- #!/usr/bin/python -t # -*- mode: Python; indent-tabs-mode: nil; -*- # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA import os, sys import errno, fcntl class LockFileLocked(Exception): pass class LockFile: def __init__(self, name, blocking=False): self.name = name self.mode = fcntl.LOCK_EX if not blocking: self.mode |= fcntl.LOCK_NB def lock(self): try: self.file = open(self.name,'w') self.rc = fcntl.flock(self.file, self.mode) except IOError, (err, strerr): if ( err == errno.EAGAIN ): raise LockFileLocked else: raise def unlock(self): fcntl.flock(self.file, fcntl.LOCK_UN) self.file.close() os.remove(self.name) ## Main import unittest class TestSequenceFunctions(unittest.TestCase): def testnonblocking(self): name = '.test.lock' l1 = LockFile(name,False) l1.lock() l2 = LockFile(name,False) try: l2.lock() self.assert_(False) except LockFileLocked: self.assert_(True) l1.unlock() def testseries(self): name = '.test.lock' l1 = LockFile(name,False) l1.lock() l2 = LockFile(name,False) try: l1.unlock() l2.lock() l2.unlock() l1.lock() l1.unlock() self.assert_(True) except LockFileLocked: self.assert_(False) if __name__ == '__main__': suitemain = unittest.makeSuite(TestSequenceFunctions) alltests = unittest.TestSuite((suitemain)) unittest.TextTestRunner(verbosity=2).run(alltests) Index: Push.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- Push.py 1 Jan 2007 16:00:46 -0000 1.27 +++ Push.py 8 Feb 2007 18:45:36 -0000 1.28 @@ -26,6 +26,7 @@ import Utils, MultiLib, Comps, WhatsNew import RepoBuild, RepoPrune, RepoView +from LockFile import LockFile, LockFileLocked DEBUG = False Utils.setdebug(DEBUG) @@ -40,32 +41,6 @@ ts = rpmUtils.transaction.initReadOnlyTransaction() # Further globals: cfg, srpmlocdict -class LockFile: - - def __init__(self, name, blocking=False): - self.name = name - self.mode = fcntl.LOCK_EX - if not blocking: - self.mode |= fcntl.LOCK_NB - - - def lock(self): - if DEBUG: - return - try: - self.file = open(self.name,'w') - except IOError, (err, strerr): - print "ERROR: opening lockfile %s failed: %s (error %d)" % (self.name, strerr, err) - sys.exit(err) - self.rc = fcntl.flock(self.file, self.mode) - - - def unlock(self): - if DEBUG: - return - fcntl.flock(self.file, fcntl.LOCK_UN) - self.file.close() - def getrunfilename(dist): runfilename = os.path.join(cfg.rundir, dist) @@ -647,8 +622,8 @@ lock = LockFile(lockfile) try: lock.lock() - except IOError: - print 'ERROR: script locked via lockfile %s - it seems to be running already' % lockfile + except LockFileLocked: + print 'Script locked via %s\nIt seems to be in use already.' % lockfile sys.exit(errno.EPERM) changed = [] # dists with changes in them From fedora-extras-commits at redhat.com Thu Feb 8 18:48:53 2007 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Thu, 8 Feb 2007 13:48:53 -0500 Subject: rpms/inkscape/FC-6 inkscape-0.45-python.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 inkscape.spec, 1.34, 1.35 sources, 1.10, 1.11 inkscape-0.44.1-latex.patch, 1.1, NONE Message-ID: <200702081848.l18Imru9026907@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/inkscape/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26879 Modified Files: .cvsignore inkscape.spec sources Added Files: inkscape-0.45-python.patch Removed Files: inkscape-0.44.1-latex.patch Log Message: - Update to 0.45 - Enabled inkboard, perl and python extensions - Added patch for correct python autodetection - LaTex patch integrated upstreamed, removed - Some rpmlint cleanups inkscape-0.45-python.patch: --- NEW FILE inkscape-0.45-python.patch --- --- inkscape-0.45/configure.orig 2007-02-07 12:08:44.000000000 -0800 +++ inkscape-0.45/configure 2007-02-07 12:22:34.000000000 -0800 @@ -10769,7 +10769,7 @@ if test "$?" -gt "0"; then with_python="no" else - checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null` + checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('DBLIB'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null` if test "$?" -gt "0"; then with_python="no" else Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/inkscape/FC-6/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 7 Sep 2006 09:59:41 -0000 1.10 +++ .cvsignore 8 Feb 2007 18:48:21 -0000 1.11 @@ -1 +1 @@ -inkscape-0.44.1.tar.gz +inkscape-0.45.tar.gz Index: inkscape.spec =================================================================== RCS file: /cvs/extras/rpms/inkscape/FC-6/inkscape.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- inkscape.spec 6 Dec 2006 11:39:32 -0000 1.34 +++ inkscape.spec 8 Feb 2007 18:48:21 -0000 1.35 @@ -1,14 +1,16 @@ +%define _with_inkboard 1 + Name: inkscape -Version: 0.44.1 -Release: 2%{?dist} +Version: 0.45 +Release: 1%{?dist} Summary: Vector-based drawing program using SVG Group: Applications/Productivity License: GPL URL: http://inkscape.sourceforge.net/ Source0: http://download.sourceforge.net/inkscape/inkscape-%{version}.tar.gz -Patch0: inkscape-0.44.1-latex.patch -Patch1: inkscape-0.44.1-psinput.patch +Patch0: inkscape-0.44.1-psinput.patch +Patch1: inkscape-0.45-python.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: atk-devel @@ -18,30 +20,26 @@ BuildRequires: gettext BuildRequires: gtkmm24-devel BuildRequires: gtkspell-devel -BuildRequires: libart_lgpl-devel >= 2.3.10 -BuildRequires: libgnomeprintui22-devel >= 2.2.0 BuildRequires: gnome-vfs2-devel >= 2.0 BuildRequires: libpng-devel >= 1.2 -BuildRequires: libsigc++20-devel -BuildRequires: libxml2-devel >= 2.4.24 -BuildRequires: libxslt-devel +BuildRequires: libsigc++20-devel >= 2.0.12 +BuildRequires: libxml2-devel >= 2.6.11 +BuildRequires: libxslt-devel >= 1.0.15 BuildRequires: pango-devel BuildRequires: pkgconfig -BuildRequires: lcms-devel >= 1.13 -BuildRequires: boost-devel >= 1.33.1 -%{?_with_perl: BuildRequires: perl-XML-Parser, perl-libxml-enno} -%{?_with_python: BuildRequires: python-devel} -%{?_with_inkboard: BuildRequires: loudmouth-devel >= 1.0} -%{?_with_gnomeprint: BuildRequires: libgnomeprint22-devel >= 2.2.0} +BuildRequires: lcms-devel >= 1.13 +BuildRequires: cairo-devel +BuildRequires: openssl-devel +BuildRequires: dos2unix +BuildRequires: perl-XML-Parser +BuildRequires: python-devel +%{?_with_inkboard:BuildRequires: loudmouth-devel >= 1.0} -Requires: pstoedit +Requires: pstoedit Requires(post): desktop-file-utils Requires(postun): desktop-file-utils -Provides: perl(SpSVG) -Provides: perl(SVG) - %description Inkscape is a vector-based drawing program, like CorelDraw?? or Adobe @@ -59,8 +57,11 @@ %prep %setup -q -%patch0 -p1 -b .latex -%patch1 -p1 -b .psinput +%patch0 -p1 -b .psinput +%patch1 -p1 -b .python +find -type f -regex '.*\.\(cpp\|h\)' -perm +111 -exec chmod -x {} ';' +find share/extensions/ -type f -regex '.*\.py' -perm +111 -exec chmod -x {} ';' +dos2unix share/extensions/*.py %build @@ -68,20 +69,11 @@ --disable-dependency-tracking \ --with-xinerama \ --enable-static=no \ -%if "%{?_with_python}" --with-python \ -%endif -%if "%{?_with_perl}" --with-perl \ -%endif --with-gnome-vfs \ --with-inkjar \ -%if "%{?_with_inkboard}" --enable-inkboard \ -%endif -%if "%{?_with_gnomeprint}" ---with-gnome-print \ -%endif --enable-lcms make %{?_smp_mflags} @@ -93,6 +85,9 @@ %find_lang %{name} find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' +rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/outline2svg.* +rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/txt2svg.* + desktop-file-install --vendor fedora --delete-original \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ @@ -123,6 +118,13 @@ %changelog +* Wed Feb 7 2007 Denis Leroy - 0.45-1 +- Update to 0.45 +- Enabled inkboard, perl and python extensions +- Added patch for correct python autodetection +- LaTex patch integrated upstreamed, removed +- Some rpmlint cleanups + * Fri Dec 1 2006 Denis Leroy - 0.44.1-2 - Added patches to fix LaTex import (#217699) - Added patch to base postscript import on pstoedit plot-svg Index: sources =================================================================== RCS file: /cvs/extras/rpms/inkscape/FC-6/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 7 Sep 2006 09:59:41 -0000 1.10 +++ sources 8 Feb 2007 18:48:21 -0000 1.11 @@ -1 +1 @@ -ae2929f70403004038963ef2448728f3 inkscape-0.44.1.tar.gz +82d7cff90a7de42460e65d289e0d4d33 inkscape-0.45.tar.gz --- inkscape-0.44.1-latex.patch DELETED --- From fedora-extras-commits at redhat.com Thu Feb 8 18:52:34 2007 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 8 Feb 2007 13:52:34 -0500 Subject: extras-buildsys/utils/pushscript LockFile.py,1.1,1.2 Message-ID: <200702081852.l18IqYeC026938@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils/pushscript In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26921 Modified Files: LockFile.py Log Message: Python on CentOS 4.4 doesn't like this, so simplify for now. Index: LockFile.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/LockFile.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LockFile.py 8 Feb 2007 18:45:36 -0000 1.1 +++ LockFile.py 8 Feb 2007 18:52:32 -0000 1.2 @@ -83,6 +83,4 @@ if __name__ == '__main__': - suitemain = unittest.makeSuite(TestSequenceFunctions) - alltests = unittest.TestSuite((suitemain)) - unittest.TextTestRunner(verbosity=2).run(alltests) + unittest.main() From fedora-extras-commits at redhat.com Thu Feb 8 20:02:56 2007 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Thu, 8 Feb 2007 15:02:56 -0500 Subject: rpms/bcfg2/devel .cvsignore, 1.1, 1.2 bcfg2-serverinitsubsys.patch, 1.1, 1.2 bcfg2.spec, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702082002.l18K2uLa001783@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/bcfg2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1754 Modified Files: .cvsignore bcfg2-serverinitsubsys.patch bcfg2.spec sources Log Message: Update to 0.9.1d Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bcfg2/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Feb 2007 20:44:03 -0000 1.1 +++ .cvsignore 8 Feb 2007 20:02:23 -0000 1.2 @@ -1 +1 @@ -bcfg2-0.8.7.3.tar.gz +bcfg2-0.9.1d.tar.gz bcfg2-serverinitsubsys.patch: Index: bcfg2-serverinitsubsys.patch =================================================================== RCS file: /cvs/extras/rpms/bcfg2/devel/bcfg2-serverinitsubsys.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bcfg2-serverinitsubsys.patch 3 Feb 2007 20:44:03 -0000 1.1 +++ bcfg2-serverinitsubsys.patch 8 Feb 2007 20:02:23 -0000 1.2 @@ -1,18 +1,20 @@ ---- debian/buildsys/common/bcfg2-server.init.orig 2006-12-20 08:54:22.000000000 -0600 -+++ debian/buildsys/common/bcfg2-server.init 2006-12-20 09:02:00.000000000 -0600 -@@ -40,6 +40,7 @@ +Index: debian/buildsys/common/bcfg2-server.init +=================================================================== +--- debian/buildsys/common/bcfg2-server.init (revision 2796) ++++ debian/buildsys/common/bcfg2-server.init (working copy) +@@ -37,6 +37,7 @@ if [ "$STATUS" = 0 ] then - l_msg "bcfg2-server" + log_success_msg "bcfg2-server" + touch /var/lock/subsys/bcfg2-server else - l_fail "bcfg2-server" + log_failure_msg "bcfg2-server" fi -@@ -51,6 +52,7 @@ +@@ -48,6 +49,7 @@ STATUS=$? if [ "$STATUS" = 0 ]; then - l_msg "bcfg2-server" + log_success_msg "bcfg2-server" + rm -f /var/lock/subsys/bcfg2-server exit 0 else - l_fail "bcfg2-server" + log_failure_msg "bcfg2-server" Index: bcfg2.spec =================================================================== RCS file: /cvs/extras/rpms/bcfg2/devel/bcfg2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bcfg2.spec 3 Feb 2007 20:44:03 -0000 1.1 +++ bcfg2.spec 8 Feb 2007 20:02:23 -0000 1.2 @@ -1,14 +1,16 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%define subversion d + Name: bcfg2 -Version: 0.8.7.3 -Release: 2%{?dist} +Version: 0.9.1 +Release: 1%{?subversion:.%{subversion}}%{?dist} Summary: Configuration management system Group: Applications/System License: BSD URL: http://trac.mcs.anl.gov/projects/bcfg2 -Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-%{version}.tar.gz +Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-%{version}%{?subversion}.tar.gz Patch0: bcfg2-serverinitsubsys.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -64,7 +66,7 @@ Configuration management server %prep -%setup -q +%setup -q -n %{name}-%{version}%{?subversion} %patch0 -p0 -b .serverinitsubsys # fixup some paths @@ -186,6 +188,7 @@ %{_sbindir}/bcfg2-repo-validate %{_sbindir}/bcfg2-server +%{_mandir}/man8/bcfg2-admin.8* %{_mandir}/man8/bcfg2-build-reports.8* %{_mandir}/man8/bcfg2-info.8* %{_mandir}/man8/bcfg2-repo-validate.8* @@ -194,6 +197,9 @@ %dir %{_var}/lib/bcfg2 %changelog +* Thu Feb 8 2007 Jeffrey C. Ollie - 0.9.1-1.d +- Update to 0.9.1d + * Tue Jan 9 2007 Jeffrey C. Ollie - 0.8.7.3-2 - Merge client back into base package. Index: sources =================================================================== RCS file: /cvs/extras/rpms/bcfg2/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Feb 2007 20:44:03 -0000 1.1 +++ sources 8 Feb 2007 20:02:23 -0000 1.2 @@ -1 +1 @@ -375d99b8282befa975e93930ce51041c bcfg2-0.8.7.3.tar.gz +7134b1947f258cda84182c8dfe080bda bcfg2-0.9.1d.tar.gz From fedora-extras-commits at redhat.com Thu Feb 8 20:13:52 2007 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 8 Feb 2007 15:13:52 -0500 Subject: rpms/liferea/devel .cvsignore, 1.44, 1.45 liferea.spec, 1.64, 1.65 sources, 1.45, 1.46 Message-ID: <200702082013.l18KDq3M001918@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1897 Modified Files: .cvsignore liferea.spec sources Log Message: * Thu Feb 8 2007 Brian Pepple - 1.2.6-1 - Update to 1.2.6. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- .cvsignore 5 Feb 2007 18:47:30 -0000 1.44 +++ .cvsignore 8 Feb 2007 20:13:20 -0000 1.45 @@ -1 +1 @@ -liferea-1.2.5.tar.gz +liferea-1.2.6.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- liferea.spec 5 Feb 2007 18:47:30 -0000 1.64 +++ liferea.spec 8 Feb 2007 20:13:20 -0000 1.65 @@ -1,5 +1,5 @@ Name: liferea -Version: 1.2.5 +Version: 1.2.6 Release: 1%{?dist} Summary: An RSS/RDF feed reader @@ -112,6 +112,9 @@ %changelog +* Thu Feb 8 2007 Brian Pepple - 1.2.6-1 +- Update to 1.2.6. + * Mon Feb 5 2007 Brian Pepple - 1.2.5-1 - Update to 1.2.5. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/sources,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- sources 5 Feb 2007 18:47:30 -0000 1.45 +++ sources 8 Feb 2007 20:13:20 -0000 1.46 @@ -1 +1 @@ -3b901a9c7942be39e975446795788f0c liferea-1.2.5.tar.gz +57d6dccc89d2a05af027b9c06dd145c4 liferea-1.2.6.tar.gz From fedora-extras-commits at redhat.com Thu Feb 8 21:19:07 2007 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Thu, 8 Feb 2007 16:19:07 -0500 Subject: rpms/jrtplib/devel .cvsignore, 1.2, 1.3 jrtplib.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200702082119.l18LJ7XA005732@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/jrtplib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5711 Modified Files: .cvsignore jrtplib.spec sources Log Message: Update to 3.7.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jrtplib/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Aug 2006 23:37:58 -0000 1.2 +++ .cvsignore 8 Feb 2007 21:18:35 -0000 1.3 @@ -1 +1 @@ -jrtplib-3.6.0.tar.bz2 +jrtplib-3.7.0.tar.bz2 Index: jrtplib.spec =================================================================== RCS file: /cvs/extras/rpms/jrtplib/devel/jrtplib.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jrtplib.spec 28 Aug 2006 23:37:58 -0000 1.1 +++ jrtplib.spec 8 Feb 2007 21:18:35 -0000 1.2 @@ -1,11 +1,11 @@ Summary: JRTPLIB is an object-oriented RTP library written in C++ Name: jrtplib -Version: 3.6.0 +Version: 3.7.0 Release: 1%{?dist} License: MIT Group: System Environment/Libraries -URL: http://research.edm.luc.ac.be/jori/jrtplib/jrtplib.html -Source0: http://research.edm.luc.ac.be/jori/jrtplib/jrtplib-%{version}.tar.bz2 +URL: http://research.edm.uhasselt.be/~jori/page/index.php?n=CS.Jrtplib +Source0: http://research.edm.uhasselt.be/jori/jrtplib/jrtplib-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen @@ -65,6 +65,9 @@ %{_libdir}/pkgconfig/jrtplib.pc %changelog +* Thu Feb 8 2007 Jeffrey C. Ollie - 3.7.0-1 +- Update to 3.7.0 + * Sat Aug 5 2006 Jeffrey C. Ollie - 3.6.0-1 - Update to 3.6.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jrtplib/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Aug 2006 23:37:58 -0000 1.2 +++ sources 8 Feb 2007 21:18:35 -0000 1.3 @@ -1 +1 @@ -8e69c3f4234b9386316f9aa9294e00cf jrtplib-3.6.0.tar.bz2 +017e1daccd8197a9a729013308942880 jrtplib-3.7.0.tar.bz2 From fedora-extras-commits at redhat.com Thu Feb 8 21:26:42 2007 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Thu, 8 Feb 2007 16:26:42 -0500 Subject: rpms/itcl/devel itcl.spec,1.5,1.6 Message-ID: <200702082126.l18LQgfO005852@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/itcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5831 Modified Files: itcl.spec Log Message: Rebuild for tcl8.5a5 Index: itcl.spec =================================================================== RCS file: /cvs/extras/rpms/itcl/devel/itcl.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- itcl.spec 28 Aug 2006 16:44:38 -0000 1.5 +++ itcl.spec 8 Feb 2007 21:26:09 -0000 1.6 @@ -1,6 +1,6 @@ Name: itcl Version: 3.3 -Release: 0.7.RC1%{?dist} +Release: 0.8.RC1%{?dist} Summary: Object oriented extensions to Tcl and Tk Group: Development/Libraries @@ -61,6 +61,9 @@ %doc %changelog +* Thu Feb 8 2007 Wart - 3.3-0.8.RC1 +- Rebuild for tcl8.5a5 + * Mon Aug 28 2006 Wart - 3.3-0.7.RC1 - Rebuild for Fedora Extras From fedora-extras-commits at redhat.com Thu Feb 8 21:33:26 2007 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Thu, 8 Feb 2007 16:33:26 -0500 Subject: rpms/jrtplib/FC-6 .cvsignore, 1.2, 1.3 jrtplib.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200702082133.l18LXQns005984@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/jrtplib/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5963 Modified Files: .cvsignore jrtplib.spec sources Log Message: Update to 3.7.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jrtplib/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Aug 2006 23:37:58 -0000 1.2 +++ .cvsignore 8 Feb 2007 21:32:53 -0000 1.3 @@ -1 +1 @@ -jrtplib-3.6.0.tar.bz2 +jrtplib-3.7.0.tar.bz2 Index: jrtplib.spec =================================================================== RCS file: /cvs/extras/rpms/jrtplib/FC-6/jrtplib.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jrtplib.spec 28 Aug 2006 23:37:58 -0000 1.1 +++ jrtplib.spec 8 Feb 2007 21:32:53 -0000 1.2 @@ -1,11 +1,11 @@ Summary: JRTPLIB is an object-oriented RTP library written in C++ Name: jrtplib -Version: 3.6.0 +Version: 3.7.0 Release: 1%{?dist} License: MIT Group: System Environment/Libraries -URL: http://research.edm.luc.ac.be/jori/jrtplib/jrtplib.html -Source0: http://research.edm.luc.ac.be/jori/jrtplib/jrtplib-%{version}.tar.bz2 +URL: http://research.edm.uhasselt.be/~jori/page/index.php?n=CS.Jrtplib +Source0: http://research.edm.uhasselt.be/jori/jrtplib/jrtplib-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen @@ -65,6 +65,9 @@ %{_libdir}/pkgconfig/jrtplib.pc %changelog +* Thu Feb 8 2007 Jeffrey C. Ollie - 3.7.0-1 +- Update to 3.7.0 + * Sat Aug 5 2006 Jeffrey C. Ollie - 3.6.0-1 - Update to 3.6.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jrtplib/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Aug 2006 23:37:58 -0000 1.2 +++ sources 8 Feb 2007 21:32:53 -0000 1.3 @@ -1 +1 @@ -8e69c3f4234b9386316f9aa9294e00cf jrtplib-3.6.0.tar.bz2 +017e1daccd8197a9a729013308942880 jrtplib-3.7.0.tar.bz2 From fedora-extras-commits at redhat.com Thu Feb 8 21:46:08 2007 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Thu, 8 Feb 2007 16:46:08 -0500 Subject: rpms/itk/devel itk.spec,1.3,1.4 Message-ID: <200702082146.l18Lk8rn006116@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/itk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6095 Modified Files: itk.spec Log Message: Rebuild for tcl8.5a5 Index: itk.spec =================================================================== RCS file: /cvs/extras/rpms/itk/devel/itk.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- itk.spec 29 Aug 2006 00:42:22 -0000 1.3 +++ itk.spec 8 Feb 2007 21:45:35 -0000 1.4 @@ -1,6 +1,6 @@ Name: itk Version: 3.3 -Release: 0.4.RC1%{?dist} +Release: 0.5.RC1%{?dist} Summary: Object oriented extensions to Tk Group: Development/Libraries @@ -57,6 +57,9 @@ %doc %changelog +* Thu Feb 8 2006 Wart - 3.3-0.5.RC1 +- Rebuild for tcl 8.5a5 + * Mon Aug 28 2006 Wart - 3.3-0.4.RC1 - Rebuild for Fedora Extras From fedora-extras-commits at redhat.com Thu Feb 8 21:47:43 2007 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Thu, 8 Feb 2007 16:47:43 -0500 Subject: rpms/itk/devel itk.spec,1.4,1.5 Message-ID: <200702082147.l18LlhQO006164@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/itk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6142 Modified Files: itk.spec Log Message: Fix out of order date in changelog Index: itk.spec =================================================================== RCS file: /cvs/extras/rpms/itk/devel/itk.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- itk.spec 8 Feb 2007 21:45:35 -0000 1.4 +++ itk.spec 8 Feb 2007 21:47:11 -0000 1.5 @@ -57,7 +57,7 @@ %doc %changelog -* Thu Feb 8 2006 Wart - 3.3-0.5.RC1 +* Thu Feb 8 2007 Wart - 3.3-0.5.RC1 - Rebuild for tcl 8.5a5 * Mon Aug 28 2006 Wart - 3.3-0.4.RC1 From fedora-extras-commits at redhat.com Thu Feb 8 22:00:49 2007 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Thu, 8 Feb 2007 17:00:49 -0500 Subject: rpms/libnfnetlink/devel .cvsignore, 1.3, 1.4 libnfnetlink.spec, 1.4, 1.5 sources, 1.3, 1.4 0001-linux-types.patch, 1.1, NONE Message-ID: <200702082200.l18M0nhq006294@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/libnfnetlink/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6269 Modified Files: .cvsignore libnfnetlink.spec sources Removed Files: 0001-linux-types.patch Log Message: libnfnetlink 0.0.25 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libnfnetlink/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 12 Jul 2006 19:12:35 -0000 1.3 +++ .cvsignore 8 Feb 2007 22:00:17 -0000 1.4 @@ -1 +1 @@ -libnfnetlink-0.0.16.tar.bz2 +libnfnetlink-0.0.25.tar.bz2 Index: libnfnetlink.spec =================================================================== RCS file: /cvs/extras/rpms/libnfnetlink/devel/libnfnetlink.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libnfnetlink.spec 10 Sep 2006 09:35:11 -0000 1.4 +++ libnfnetlink.spec 8 Feb 2007 22:00:17 -0000 1.5 @@ -1,13 +1,12 @@ Name: libnfnetlink -Version: 0.0.16 -Release: 2%{?dist} +Version: 0.0.25 +Release: 1%{?dist} Summary: Netfilter netlink userspace library Group: System Environment/Libraries License: GPL URL: http://netfilter.org Source0: http://netfilter.org/projects/libnfnetlink/files/%{name}-%{version}.tar.bz2 Source1: http://www.gnu.org/licenses/gpl.txt -Patch0: 0001-linux-types.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #BuildRequires: @@ -32,7 +31,6 @@ %prep %setup -q -%patch -p1 cp %{SOURCE1} LICENSE @@ -67,6 +65,9 @@ %changelog +* Fri Feb 9 2007 Paul P. Komkoff Jr - 0.0.25-1 +- upstream version 0.0.25 + * Sun Sep 10 2006 Paul P. Komkoff Jr - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/libnfnetlink/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 12 Jul 2006 19:12:35 -0000 1.3 +++ sources 8 Feb 2007 22:00:17 -0000 1.4 @@ -1 +1 @@ -5c9b7fc55c5cc7869ecf2ae5ac8afff3 libnfnetlink-0.0.16.tar.bz2 +fc915a2e66d282e524af6ef939042d7d libnfnetlink-0.0.25.tar.bz2 --- 0001-linux-types.patch DELETED --- From fedora-extras-commits at redhat.com Thu Feb 8 23:15:20 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Thu, 8 Feb 2007 18:15:20 -0500 Subject: rpms/gtklp/FC-6 .cvsignore, 1.3, 1.4 gtklp.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200702082315.l18NFK7A013410@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gtklp/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13385 Modified Files: .cvsignore gtklp.spec sources Log Message: new version 1.2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtklp/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 31 May 2006 21:29:43 -0000 1.3 +++ .cvsignore 8 Feb 2007 23:14:47 -0000 1.4 @@ -1 +1 @@ -gtklp-1.2.2.src.tar.gz +gtklp-1.2.3.src.tar.gz Index: gtklp.spec =================================================================== RCS file: /cvs/extras/rpms/gtklp/FC-6/gtklp.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gtklp.spec 28 Aug 2006 09:13:15 -0000 1.4 +++ gtklp.spec 8 Feb 2007 23:14:47 -0000 1.5 @@ -1,12 +1,12 @@ Name: gtklp -Version: 1.2.2 -Release: 3%{?dist} +Version: 1.2.3 +Release: 1%{?dist} Summary: A GTK frontend to CUPS Group: Applications/System License: GPL URL: http://gtklp.sourceforge.net -Source: http://switch.dl.sourceforge.net/sourceforge/gtklp/gtklp-1.2.2.src.tar.gz +Source: http://switch.dl.sourceforge.net/sourceforge/gtklp/gtklp-1.2.3.src.tar.gz Source1: gtklp.png Source2: gtklpq.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -106,6 +106,9 @@ %changelog +* Fri Feb 9 2007 Gerard Milmeister - 1.2.3-1 +- new version 1.2.3 + * Mon Aug 28 2006 Gerard Milmeister - 1.2.2-3 - Rebuild for FE6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtklp/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 May 2006 21:29:43 -0000 1.3 +++ sources 8 Feb 2007 23:14:47 -0000 1.4 @@ -1 +1 @@ -f07a6acee4cf4d95559a7740661bcbe9 gtklp-1.2.2.src.tar.gz +38ca06be7cef966898acc9aa3691c81b gtklp-1.2.3.src.tar.gz From fedora-extras-commits at redhat.com Thu Feb 8 23:22:59 2007 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Thu, 8 Feb 2007 18:22:59 -0500 Subject: rpms/tcldom/devel tcldom.spec,1.5,1.6 Message-ID: <200702082322.l18NMxwT013587@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tcldom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13542 Modified Files: tcldom.spec Log Message: Add a -gui subpackage for the dom-based widgets Add a -expat subpackage for the expat-based dom parser Index: tcldom.spec =================================================================== RCS file: /cvs/extras/rpms/tcldom/devel/tcldom.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- tcldom.spec 29 Aug 2006 02:12:40 -0000 1.5 +++ tcldom.spec 8 Feb 2007 23:22:27 -0000 1.6 @@ -1,15 +1,21 @@ +%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)} +%{!?tcl_sitelib: %define tcl_sitelib %{_datadir}/tcl%{tcl_version}} + Summary: TclDOM is a package that provides a DOM binding for the Tcl scripting language Name: tcldom Version: 3.1 -Release: 6%{?dist} +Release: 7%{?dist} License: BSD Group: Development/Libraries -URL: http://tclxml.sourceforge.net/ -Source: http://dl.sf.net/tclxml/tcldom-3.1.tar.gz +URL: http://tclxml.sourceforge.net/ +Source0: http://dl.sf.net/tclxml/tcldom-3.1.tar.gz +Source1: pkgIndex.tcl.in.gui Patch0: tcldom.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: tcl tcl-devel libxml2-devel tclxml-devel -Requires: tcl tclxml tcllib libxml2 +Patch1: tcldom-3.1-pkgprovides.patch +Patch2: tcldom-3.1-cversion.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: tcl-devel libxml2-devel tclxml-devel expat-devel +Requires: tcl tclxml tcllib %description This package provides a DOM binding for Tcl. It provides one of the following @@ -19,6 +25,14 @@ (also fast and compatiable with TclXSLT/libxslt [http://tclxml.sourceforge.net/tclxslt.html]). +%package expat +Summary: The Tcl dom parser built with the expat xml parser +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} tclxml-expat +%description expat +This package provides an optimized Tcl dom parser built with the expat +xml parser. + %package libxml2 Summary: The Tcl dom parser built with the libxml2 xml parser Group: Development/Libraries @@ -27,6 +41,13 @@ This package provides an optimized Tcl dom parser built with the libxml2 xml parser. +%package gui +Summary: UI widgets for manipulating a DOM tree +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} bwidget +%description gui +This package provides some useful widgets for manipulating a DOM tree. + %package devel Summary: The Tcl dom parser development files Group: Development/Libraries @@ -37,40 +58,77 @@ %prep %setup -q +touch -r src/configure.in src/configure.in.stamp +touch -r src-libxml2/configure.in src-libxml2/configure.in.stamp %patch0 -p1 +%patch1 +%patch2 +touch -r src/configure.in.stamp src/configure.in +touch -r src-libxml2/configure.in.stamp src-libxml2/configure.in %{__sed} -i 's/\r//' examples/tkxmllint.tcl %build -cd src-libxml2 -%configure +pushd src +%configure --enable-threads make %{?_smp_mflags} +popd +pushd src-libxml2 +%configure --enable-threads +make %{?_smp_mflags} +popd %install rm -rf $RPM_BUILD_ROOT # We have to hand-install the base Tcl files since the configure script # doesn't take care of that. -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}%{version} -install -m 0644 library/*.tcl $RPM_BUILD_ROOT/%{_datadir}/%{name}%{version} -sed -e 's/@VERSION@/%{version}/' < library/pkgIndex.tcl.in > $RPM_BUILD_ROOT/%{_datadir}/%{name}%{version}/pkgIndex.tcl +mkdir -p $RPM_BUILD_ROOT/%{tcl_sitelib}/%{name}%{version} +install -m 0644 library/*.tcl $RPM_BUILD_ROOT/%{tcl_sitelib}/%{name}%{version} +sed -e 's/@VERSION@/%{version}/' < library/pkgIndex.tcl.in > $RPM_BUILD_ROOT/%{tcl_sitelib}/%{name}%{version}/pkgIndex.tcl -cd src-libxml2 +pushd src-libxml2 make install DESTDIR=$RPM_BUILD_ROOT +popd + +pushd src +make install DESTDIR=$RPM_BUILD_ROOT +mv $RPM_BUILD_ROOT%{_libdir}/tcldom3.1 $RPM_BUILD_ROOT%{_libdir}/%{name}_expat%{version} +popd + +# Install the examples in a -gui subpackage +install -d $RPM_BUILD_ROOT%{tcl_sitelib}/%{name}-gui%{version} +sed -e 's/@VERSION@/%{version}/' < %{SOURCE1} > $RPM_BUILD_ROOT/%{tcl_sitelib}/%{name}-gui%{version}/pkgIndex.tcl +install -p -m 0644 examples/domtree.tcl \ + examples/domtree-treectrl.tcl \ + examples/domtext.tcl \ + examples/cgi2dom.tcl \ + $RPM_BUILD_ROOT%{tcl_sitelib}/%{name}-gui%{version}/ %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%{_datadir}/%{name}%{version} +%{tcl_sitelib}/%{name}%{version} %doc ChangeLog README MANIFEST RELNOTES LICENSE %doc docs/* examples/* +%files expat +%defattr(-,root,root) +%dir %{_libdir}/%{name}_expat%{version} +%{_libdir}/%{name}_expat%{version}/*.tcl +%{_libdir}/%{name}_expat%{version}/*.so + %files libxml2 %defattr(-,root,root) %dir %{_libdir}/%{name}_libxml2%{version} %{_libdir}/%{name}_libxml2%{version}/*.tcl %{_libdir}/%{name}_libxml2%{version}/*.so +%files gui +%defattr(-,root,root) +%dir %{tcl_sitelib}/%{name}-gui%{version} +%{tcl_sitelib}/%{name}-gui%{version}/*.tcl + %files devel %defattr(-,root,root) %{_includedir}/* @@ -78,6 +136,10 @@ %{_libdir}/%{name}_libxml2%{version}/*.a %changelog +* Thu Feb 8 2007 Wart - 3.1-7 +- Add a -gui subpackage for the dom-based widgets +- Add a -expat subpackage for the expat-based dom parser + * Mon Aug 28 2006 Wart - 3.1-6 - Rebuild for Fedora Extras From fedora-extras-commits at redhat.com Thu Feb 8 23:23:34 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Thu, 8 Feb 2007 18:23:34 -0500 Subject: rpms/gtklp/FC-5 .cvsignore, 1.3, 1.4 gtklp.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200702082323.l18NNYWC013667@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gtklp/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13591/FC-5 Modified Files: .cvsignore gtklp.spec sources Log Message: new version 1.2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtklp/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 31 May 2006 21:29:42 -0000 1.3 +++ .cvsignore 8 Feb 2007 23:23:01 -0000 1.4 @@ -1 +1 @@ -gtklp-1.2.2.src.tar.gz +gtklp-1.2.3.src.tar.gz Index: gtklp.spec =================================================================== RCS file: /cvs/extras/rpms/gtklp/FC-5/gtklp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gtklp.spec 31 May 2006 21:29:42 -0000 1.2 +++ gtklp.spec 8 Feb 2007 23:23:01 -0000 1.3 @@ -1,12 +1,12 @@ Name: gtklp -Version: 1.2.2 +Version: 1.2.3 Release: 1%{?dist} Summary: A GTK frontend to CUPS Group: Applications/System License: GPL URL: http://gtklp.sourceforge.net -Source: http://switch.dl.sourceforge.net/sourceforge/gtklp/gtklp-1.2.2.src.tar.gz +Source: http://switch.dl.sourceforge.net/sourceforge/gtklp/gtklp-1.2.3.src.tar.gz Source1: gtklp.png Source2: gtklpq.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -106,6 +106,15 @@ %changelog +* Fri Feb 9 2007 Gerard Milmeister - 1.2.3-1 +- new version 1.2.3 + +* Mon Aug 28 2006 Gerard Milmeister - 1.2.2-3 +- Rebuild for FE6 + +* Fri Jun 16 2006 Gerard Milmeister - 1.2.2-2 +- rebuild against new cups + * Wed May 31 2006 Gerard Milmeister - 1.2.2-1 - new version 1.2.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtklp/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 May 2006 21:29:42 -0000 1.3 +++ sources 8 Feb 2007 23:23:01 -0000 1.4 @@ -1 +1 @@ -f07a6acee4cf4d95559a7740661bcbe9 gtklp-1.2.2.src.tar.gz +38ca06be7cef966898acc9aa3691c81b gtklp-1.2.3.src.tar.gz From fedora-extras-commits at redhat.com Thu Feb 8 23:23:36 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Thu, 8 Feb 2007 18:23:36 -0500 Subject: rpms/gtklp/devel .cvsignore, 1.3, 1.4 gtklp.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200702082323.l18NNaf5013672@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gtklp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13591/devel Modified Files: .cvsignore gtklp.spec sources Log Message: new version 1.2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtklp/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 31 May 2006 21:29:43 -0000 1.3 +++ .cvsignore 8 Feb 2007 23:23:04 -0000 1.4 @@ -1 +1 @@ -gtklp-1.2.2.src.tar.gz +gtklp-1.2.3.src.tar.gz Index: gtklp.spec =================================================================== RCS file: /cvs/extras/rpms/gtklp/devel/gtklp.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gtklp.spec 28 Aug 2006 09:13:15 -0000 1.4 +++ gtklp.spec 8 Feb 2007 23:23:04 -0000 1.5 @@ -1,12 +1,12 @@ Name: gtklp -Version: 1.2.2 -Release: 3%{?dist} +Version: 1.2.3 +Release: 1%{?dist} Summary: A GTK frontend to CUPS Group: Applications/System License: GPL URL: http://gtklp.sourceforge.net -Source: http://switch.dl.sourceforge.net/sourceforge/gtklp/gtklp-1.2.2.src.tar.gz +Source: http://switch.dl.sourceforge.net/sourceforge/gtklp/gtklp-1.2.3.src.tar.gz Source1: gtklp.png Source2: gtklpq.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -106,6 +106,9 @@ %changelog +* Fri Feb 9 2007 Gerard Milmeister - 1.2.3-1 +- new version 1.2.3 + * Mon Aug 28 2006 Gerard Milmeister - 1.2.2-3 - Rebuild for FE6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtklp/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 May 2006 21:29:43 -0000 1.3 +++ sources 8 Feb 2007 23:23:04 -0000 1.4 @@ -1 +1 @@ -f07a6acee4cf4d95559a7740661bcbe9 gtklp-1.2.2.src.tar.gz +38ca06be7cef966898acc9aa3691c81b gtklp-1.2.3.src.tar.gz From fedora-extras-commits at redhat.com Thu Feb 8 23:23:41 2007 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Thu, 8 Feb 2007 18:23:41 -0500 Subject: rpms/tcldom/devel tcldom-3.1-cversion.patch, NONE, 1.1 tcldom-3.1-pkgprovides.patch, NONE, 1.1 Message-ID: <200702082323.l18NNfE5013715@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tcldom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13664 Added Files: tcldom-3.1-cversion.patch tcldom-3.1-pkgprovides.patch Log Message: Patches to fix tcl module version mismatches. tcldom-3.1-cversion.patch: --- NEW FILE tcldom-3.1-cversion.patch --- --- src/configure.in.orig 2007-02-06 17:56:23.000000000 -0800 +++ src/configure.in 2007-02-06 18:10:31.000000000 -0800 @@ -9,9 +9,9 @@ # Package identification: # PACKAGE=tcldom -MAJOR_VERSION=2 -MINOR_VERSION=0 -PATCHLEVEL=2 +MAJOR_VERSION=3 +MINOR_VERSION=1 +PATCHLEVEL=0 VERSION=${MAJOR_VERSION}.${MINOR_VERSION} NODOT_VERSION=${MAJOR_VERSION}${MINOR_VERSION} --- src/configure.orig 2007-02-06 18:10:22.000000000 -0800 +++ src/configure 2007-02-06 18:10:51.000000000 -0800 @@ -1354,9 +1354,9 @@ # Package identification: # PACKAGE=tcldom -MAJOR_VERSION=2 -MINOR_VERSION=0 -PATCHLEVEL=2 +MAJOR_VERSION=3 +MINOR_VERSION=1 +PATCHLEVEL=0 VERSION=${MAJOR_VERSION}.${MINOR_VERSION} NODOT_VERSION=${MAJOR_VERSION}${MINOR_VERSION} tcldom-3.1-pkgprovides.patch: --- NEW FILE tcldom-3.1-pkgprovides.patch --- --- src/pkgIndex.tcl.in.orig 2007-02-04 16:08:41.000000000 -0800 +++ src/pkgIndex.tcl.in 2007-02-04 16:08:59.000000000 -0800 @@ -8,9 +8,9 @@ package ifneeded @PACKAGE@ @VERSION@ \ [list load [file join $dir @tcldom_LIB_FILE@]] -package ifneeded dom @VERSION@ \ - "load [file join $dir @tcldom_LIB_FILE@] Tcldom ; - package provide dom @VERSION@" +#package ifneeded dom @VERSION@ \ +# "load [file join $dir @tcldom_LIB_FILE@] Tcldom ; +# package provide dom @VERSION@" package ifneeded dom::c @VERSION@ \ "load [file join $dir @tcldom_LIB_FILE@] Tcldom ; --- library/pkgIndex.tcl.in.orig 2007-02-04 16:10:34.000000000 -0800 +++ library/pkgIndex.tcl.in 2007-02-04 16:11:52.000000000 -0800 @@ -2,17 +2,10 @@ # # $Id: pkgIndex.tcl.in,v 1.17 2005/11/04 06:30:08 balls Exp $ -package ifneeded dom::c @VERSION@ [list load [file join $dir @Tcldom_LIB_FILE@]] package ifneeded dom::tcl @VERSION@ [list source [file join $dir dom.tcl]] package ifneeded dommap 1.0 [list source [file join $dir dommap.tcl]] package ifneeded xmlswitch 1.0 [list source [file join $dir xmlswitch.tcl]] -# Examples - will not necessarily be installed -package ifneeded cgi2dom 1.1 [list source [file join $dir cgi2dom.tcl]] -package ifneeded domtree @VERSION@ [list source [file join $dir domtree.tcl]] -package ifneeded domtree::treectrl @VERSION@ [list source [file join $dir domtree-treectrl.tcl]] -package ifneeded domtext @VERSION@ [list source [file join $dir domtext.tcl]] - ## Provided by separate package. ##package ifneeded dom::libxml2 @VERSION@ [list load [file join $dir @RELPATH@ @TCLDOM_XML2_LIB_FILE@] Tcldomxml] From fedora-extras-commits at redhat.com Thu Feb 8 23:30:18 2007 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Thu, 8 Feb 2007 18:30:18 -0500 Subject: rpms/tcldom/devel tcldom.spec,1.6,1.7 Message-ID: <200702082330.l18NUISn013913@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tcldom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13875 Modified Files: tcldom.spec Log Message: Add missing BuildRequires: tcl for tcl sitelib macros Index: tcldom.spec =================================================================== RCS file: /cvs/extras/rpms/tcldom/devel/tcldom.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- tcldom.spec 8 Feb 2007 23:22:27 -0000 1.6 +++ tcldom.spec 8 Feb 2007 23:29:46 -0000 1.7 @@ -4,7 +4,7 @@ Summary: TclDOM is a package that provides a DOM binding for the Tcl scripting language Name: tcldom Version: 3.1 -Release: 7%{?dist} +Release: 8%{?dist} License: BSD Group: Development/Libraries URL: http://tclxml.sourceforge.net/ @@ -14,7 +14,7 @@ Patch1: tcldom-3.1-pkgprovides.patch Patch2: tcldom-3.1-cversion.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: tcl-devel libxml2-devel tclxml-devel expat-devel +BuildRequires: tcl tcl-devel libxml2-devel tclxml-devel expat-devel Requires: tcl tclxml tcllib %description @@ -136,6 +136,9 @@ %{_libdir}/%{name}_libxml2%{version}/*.a %changelog +* Thu Feb 8 2007 Wart - 3.1-8 +- Add missing BuildRequires: tcl + * Thu Feb 8 2007 Wart - 3.1-7 - Add a -gui subpackage for the dom-based widgets - Add a -expat subpackage for the expat-based dom parser From fedora-extras-commits at redhat.com Thu Feb 8 23:33:48 2007 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Thu, 8 Feb 2007 18:33:48 -0500 Subject: rpms/tcldom/devel pkgIndex.tcl.in.gui,NONE,1.1 Message-ID: <200702082333.l18NXmEV014019@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tcldom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14012 Added Files: pkgIndex.tcl.in.gui Log Message: Add missing pkgIndex file for the -gui subpackage --- NEW FILE pkgIndex.tcl.in.gui --- package ifneeded cgi2dom 1.1 [list source [file join $dir cgi2dom.tcl]] package ifneeded domtree @VERSION@ [list source [file join $dir domtree.tcl]] package ifneeded domtree::treectrl @VERSION@ [list source [file join $dir domtree-treectrl.tcl]] package ifneeded domtext @VERSION@ [list source [file join $dir domtext.tcl]] From fedora-extras-commits at redhat.com Fri Feb 9 04:35:30 2007 From: fedora-extras-commits at redhat.com (Yuichi Nakamura (ynakam)) Date: Thu, 8 Feb 2007 23:35:30 -0500 Subject: rpms/seedit/FC-6 seedit.spec,1.1,1.2 Message-ID: <200702090435.l194ZUcH032425@cvs-int.fedora.redhat.com> Author: ynakam Update of /cvs/extras/rpms/seedit/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32384/FC-6 Modified Files: seedit.spec Log Message: Updated for 2.1.0 Index: seedit.spec =================================================================== RCS file: /cvs/extras/rpms/seedit/FC-6/seedit.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- seedit.spec 31 Jan 2007 13:16:25 -0000 1.1 +++ seedit.spec 9 Feb 2007 04:34:58 -0000 1.2 @@ -1,5 +1,4 @@ -%define betatag beta6.7 -%define buildnum 15 +%define buildnum 1 %define python_sitelib %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib()') %define selinuxconf %{_sysconfdir}/selinux/config @@ -9,23 +8,26 @@ #Whether SELinux supports modular policy, after FC5 "y" %define modular y #Whether pam supports include syntax, after FC5 "y" -%define pam_include_support y +%define pam_include_support y +#Whether audit support obj_type field, after FC6 "y" +%define audit_obj_type_support y #Version of sample policy file %define sample_policy_type fc6 Name: seedit Version: 2.1.0 -Release: 0.%{buildnum}.%{betatag}%{?dist} +Release: %{buildnum}%{?dist} Summary: SELinux Policy Editor:Core component Group: System Environment/Base License: GPL URL: http://seedit.sourceforge.net/ -Source0: http://osdn.dl.sourceforge.jp/selpe/23577/%{name}-%{version}-%{betatag}.tar.gz +Source0: http://osdn.dl.sourceforge.jp/selpe/23577/%{name}-%{version}.tar.gz Source1: seedit-gui.desktop Source2: seedit-gui.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{betatag}-root-%(%{__id_u} -n) BuildRequires: libselinux-devel >= 1.19, libsepol-devel >= 1.1.1, byacc, flex Requires: checkpolicy, m4, audit, libselinux >= 1.19, libsepol >= 1.1.1 +Provides: seedit-converter %description SELinux Policy Editor(SEEdit) is a tool to make SELinux easy. @@ -49,18 +51,22 @@ rm -rf %{buildroot} pushd core -make install DESTDIR=%{buildroot} PYTHON_SITELIB=%{buildroot}/%{python_sitelib} CUSTOMIZABLE_TYPES=%{customizable_types} MODULAR=%{modular} +make install DESTDIR=%{buildroot} PYTHON_SITELIB=%{buildroot}/%{python_sitelib} CUSTOMIZABLE_TYPES=%{customizable_types} MODULAR=%{modular} AUDIT_OBJ_TYPE_SUPPORT=%{audit_obj_type_support} popd pushd policy -make install DESTDIR=%{buildroot} DISTRO=%{sample_policy_type} SELINUXTYPE=seedit MODULAR=%{modular} AUDITRULES=%{auditrules} +make install DESTDIR=%{buildroot} DISTRO=%{sample_policy_type} SELINUXTYPE=seedit MODULAR=%{modular} AUDITRULES=%{auditrules} popd pushd gui make install DESTDIR=%{buildroot} PYTHON_SITELIB=%{buildroot}/%{python_sitelib} PAM_INCLUDE_SUPPORT=%{pam_include_support} +#For Asianux2 +#AX2 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications +#AX2 install -p -m 0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/applications desktop-file-install --vendor "" --dir ${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1} + mkdir -p %{buildroot}%{_datadir}/pixmaps install -p -m 0644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/seedit-gui.png popd @@ -85,14 +91,14 @@ %{_bindir}/seedit-unconfined %{_bindir}/seedit-template %dir %{python_sitelib}/%{name} -%{python_sitelib}/%{name}/*.py -%{python_sitelib}/%{name}/*.pyo -%{python_sitelib}/%{name}/*.pyc +%{python_sitelib}/%{name}/*.* %dir %{_datadir}/%{name} %{_datadir}/%{name}/Makefile %{_datadir}/%{name}/macros %{_datadir}/%{name}/base_policy %dir %{_datadir}/%{name}/sepolicy +%dir %{_sysconfdir}/%{name} +%{_sysconfdir}/%{name}/seedit-load.conf %package policy Summary: SELinux Policy Editor: Sample simplified policy @@ -121,7 +127,7 @@ %files policy %defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/%{name} +%config(noreplace) %{_sysconfdir}/%{name}/policy %config(noreplace) %{_sysconfdir}/selinux/%{name} %{_datadir}/%{name}/initialize/ %{_sbindir}/seedit-init @@ -134,7 +140,8 @@ Requires: usermode Requires: pygtk2 Requires: pam >= 0.80-9 -BuildRequires: desktop-file-utils, gettext +BuildRequires: desktop-file-utils +BuildRequires: gettext Requires: %{name} = %{version}-%{release}, %{name}-policy = %{version}-%{release} %description gui @@ -159,6 +166,13 @@ %changelog +* Tue Feb 6 2007 Yuichi Nakamura 2.1.0-1 + - Fixed bug in RBAC + - Fixed installer for Asianux + +* Wed Jan 31 2007 Yuichi Nakamura 2.1.0-0.16.beta7 + - Fixed for CentOS4, package build failed. + * Sat Jan 27 2007 Yuichi Nakamura 2.1.0-0.15.beta6.7 - Fixed Requires - Fixed makefiles to preserve timestamps. From fedora-extras-commits at redhat.com Fri Feb 9 04:35:33 2007 From: fedora-extras-commits at redhat.com (Yuichi Nakamura (ynakam)) Date: Thu, 8 Feb 2007 23:35:33 -0500 Subject: rpms/seedit/devel seedit.spec,1.1,1.2 Message-ID: <200702090435.l194ZXnI032430@cvs-int.fedora.redhat.com> Author: ynakam Update of /cvs/extras/rpms/seedit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32384/devel Modified Files: seedit.spec Log Message: Updated for 2.1.0 Index: seedit.spec =================================================================== RCS file: /cvs/extras/rpms/seedit/devel/seedit.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- seedit.spec 31 Jan 2007 13:16:25 -0000 1.1 +++ seedit.spec 9 Feb 2007 04:35:01 -0000 1.2 @@ -1,5 +1,4 @@ -%define betatag beta6.7 -%define buildnum 15 +%define buildnum 1 %define python_sitelib %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib()') %define selinuxconf %{_sysconfdir}/selinux/config @@ -9,23 +8,26 @@ #Whether SELinux supports modular policy, after FC5 "y" %define modular y #Whether pam supports include syntax, after FC5 "y" -%define pam_include_support y +%define pam_include_support y +#Whether audit support obj_type field, after FC6 "y" +%define audit_obj_type_support y #Version of sample policy file %define sample_policy_type fc6 Name: seedit Version: 2.1.0 -Release: 0.%{buildnum}.%{betatag}%{?dist} +Release: %{buildnum}%{?dist} Summary: SELinux Policy Editor:Core component Group: System Environment/Base License: GPL URL: http://seedit.sourceforge.net/ -Source0: http://osdn.dl.sourceforge.jp/selpe/23577/%{name}-%{version}-%{betatag}.tar.gz +Source0: http://osdn.dl.sourceforge.jp/selpe/23577/%{name}-%{version}.tar.gz Source1: seedit-gui.desktop Source2: seedit-gui.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{betatag}-root-%(%{__id_u} -n) BuildRequires: libselinux-devel >= 1.19, libsepol-devel >= 1.1.1, byacc, flex Requires: checkpolicy, m4, audit, libselinux >= 1.19, libsepol >= 1.1.1 +Provides: seedit-converter %description SELinux Policy Editor(SEEdit) is a tool to make SELinux easy. @@ -49,18 +51,22 @@ rm -rf %{buildroot} pushd core -make install DESTDIR=%{buildroot} PYTHON_SITELIB=%{buildroot}/%{python_sitelib} CUSTOMIZABLE_TYPES=%{customizable_types} MODULAR=%{modular} +make install DESTDIR=%{buildroot} PYTHON_SITELIB=%{buildroot}/%{python_sitelib} CUSTOMIZABLE_TYPES=%{customizable_types} MODULAR=%{modular} AUDIT_OBJ_TYPE_SUPPORT=%{audit_obj_type_support} popd pushd policy -make install DESTDIR=%{buildroot} DISTRO=%{sample_policy_type} SELINUXTYPE=seedit MODULAR=%{modular} AUDITRULES=%{auditrules} +make install DESTDIR=%{buildroot} DISTRO=%{sample_policy_type} SELINUXTYPE=seedit MODULAR=%{modular} AUDITRULES=%{auditrules} popd pushd gui make install DESTDIR=%{buildroot} PYTHON_SITELIB=%{buildroot}/%{python_sitelib} PAM_INCLUDE_SUPPORT=%{pam_include_support} +#For Asianux2 +#AX2 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications +#AX2 install -p -m 0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/applications desktop-file-install --vendor "" --dir ${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1} + mkdir -p %{buildroot}%{_datadir}/pixmaps install -p -m 0644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/seedit-gui.png popd @@ -85,14 +91,14 @@ %{_bindir}/seedit-unconfined %{_bindir}/seedit-template %dir %{python_sitelib}/%{name} -%{python_sitelib}/%{name}/*.py -%{python_sitelib}/%{name}/*.pyo -%{python_sitelib}/%{name}/*.pyc +%{python_sitelib}/%{name}/*.* %dir %{_datadir}/%{name} %{_datadir}/%{name}/Makefile %{_datadir}/%{name}/macros %{_datadir}/%{name}/base_policy %dir %{_datadir}/%{name}/sepolicy +%dir %{_sysconfdir}/%{name} +%{_sysconfdir}/%{name}/seedit-load.conf %package policy Summary: SELinux Policy Editor: Sample simplified policy @@ -121,7 +127,7 @@ %files policy %defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/%{name} +%config(noreplace) %{_sysconfdir}/%{name}/policy %config(noreplace) %{_sysconfdir}/selinux/%{name} %{_datadir}/%{name}/initialize/ %{_sbindir}/seedit-init @@ -134,7 +140,8 @@ Requires: usermode Requires: pygtk2 Requires: pam >= 0.80-9 -BuildRequires: desktop-file-utils, gettext +BuildRequires: desktop-file-utils +BuildRequires: gettext Requires: %{name} = %{version}-%{release}, %{name}-policy = %{version}-%{release} %description gui @@ -159,6 +166,13 @@ %changelog +* Tue Feb 6 2007 Yuichi Nakamura 2.1.0-1 + - Fixed bug in RBAC + - Fixed installer for Asianux + +* Wed Jan 31 2007 Yuichi Nakamura 2.1.0-0.16.beta7 + - Fixed for CentOS4, package build failed. + * Sat Jan 27 2007 Yuichi Nakamura 2.1.0-0.15.beta6.7 - Fixed Requires - Fixed makefiles to preserve timestamps. From fedora-extras-commits at redhat.com Fri Feb 9 05:24:35 2007 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 9 Feb 2007 00:24:35 -0500 Subject: rpms/exo/devel exo.spec,1.22,1.23 Message-ID: <200702090524.l195OZts003562@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/exo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3544 Modified Files: exo.spec Log Message: Add hal-devel and libnotify-devel BuildRequires. Fixes #225135 Index: exo.spec =================================================================== RCS file: /cvs/extras/rpms/exo/devel/exo.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- exo.spec 22 Jan 2007 08:25:07 -0000 1.22 +++ exo.spec 9 Feb 2007 05:24:03 -0000 1.23 @@ -3,7 +3,7 @@ Summary: Application library for the Xfce desktop environment Name: exo Version: 0.3.2 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL URL: http://xfce.org/ Source0: http://www.xfce.org/archive/xfce-4.4.0/src/exo-0.3.2.tar.bz2 @@ -21,6 +21,7 @@ BuildRequires: perl-URI BuildRequires: xfce-mcs-manager-devel BuildRequires: libxfce4util-devel +BuildRequires: hal-devel libnotify-devel %description Extension library for Xfce, targeted at application development. @@ -96,6 +97,7 @@ %{_bindir}/exo-unmount %config(noreplace) %{_sysconfdir}/xdg/xfce4/helpers.rc %{_libexecdir}/exo-helper-0.3 +%{_libexecdir}/exo-mount-notify-0.3 %{_libexecdir}/exo-compose-mail-0.3 %{_datadir}/applications/exo-preferred-applications.desktop %{_libdir}/xfce4/mcs-plugins/exo-preferred-applications-settings.so @@ -119,6 +121,9 @@ %{python_sitearch}/pyexo.* %changelog +* Thu Feb 8 2007 Kevin Fenzi - 0.3.2-2 +- Add hal-devel and libnotify-devel BuildRequires. Fixes #225135 + * Sun Jan 21 2007 Kevin Fenzi - 0.3.2-1 - Upgrade to 0.3.2 From fedora-extras-commits at redhat.com Fri Feb 9 05:30:22 2007 From: fedora-extras-commits at redhat.com (Yuichi Nakamura (ynakam)) Date: Fri, 9 Feb 2007 00:30:22 -0500 Subject: rpms/seedit/FC-6 .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200702090530.l195UMdr003678@cvs-int.fedora.redhat.com> Author: ynakam Update of /cvs/extras/rpms/seedit/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3632 Modified Files: .cvsignore sources Log Message: Uploaded 2.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/seedit/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 31 Jan 2007 13:16:25 -0000 1.2 +++ .cvsignore 9 Feb 2007 05:29:50 -0000 1.3 @@ -1 +1 @@ -seedit-2.1.0-beta6.7.tar.gz +seedit-2.1.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/seedit/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 31 Jan 2007 13:16:25 -0000 1.2 +++ sources 9 Feb 2007 05:29:50 -0000 1.3 @@ -1 +1 @@ -61eec5bb305ac6100db50f03a3867f59 seedit-2.1.0-beta6.7.tar.gz +7c1577a48ae95d4d1d425121f4c3980b seedit-2.1.0.tar.gz From fedora-extras-commits at redhat.com Fri Feb 9 05:31:12 2007 From: fedora-extras-commits at redhat.com (Yuichi Nakamura (ynakam)) Date: Fri, 9 Feb 2007 00:31:12 -0500 Subject: rpms/seedit/devel .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200702090531.l195VCsP003709@cvs-int.fedora.redhat.com> Author: ynakam Update of /cvs/extras/rpms/seedit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3685 Modified Files: .cvsignore sources Log Message: Uploaded 2.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/seedit/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 31 Jan 2007 13:16:25 -0000 1.2 +++ .cvsignore 9 Feb 2007 05:30:40 -0000 1.3 @@ -1 +1 @@ -seedit-2.1.0-beta6.7.tar.gz +seedit-2.1.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/seedit/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 31 Jan 2007 13:16:25 -0000 1.2 +++ sources 9 Feb 2007 05:30:40 -0000 1.3 @@ -1 +1 @@ -61eec5bb305ac6100db50f03a3867f59 seedit-2.1.0-beta6.7.tar.gz +7c1577a48ae95d4d1d425121f4c3980b seedit-2.1.0.tar.gz From fedora-extras-commits at redhat.com Fri Feb 9 05:39:14 2007 From: fedora-extras-commits at redhat.com (Yuichi Nakamura (ynakam)) Date: Fri, 9 Feb 2007 00:39:14 -0500 Subject: rpms/seedit/devel seedit.spec,1.2,1.3 Message-ID: <200702090539.l195dEvC003920@cvs-int.fedora.redhat.com> Author: ynakam Update of /cvs/extras/rpms/seedit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3877/devel Modified Files: seedit.spec Log Message: Fixed build failure Index: seedit.spec =================================================================== RCS file: /cvs/extras/rpms/seedit/devel/seedit.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- seedit.spec 9 Feb 2007 04:35:01 -0000 1.2 +++ seedit.spec 9 Feb 2007 05:38:41 -0000 1.3 @@ -1,4 +1,4 @@ -%define buildnum 1 +%define buildnum 2 %define python_sitelib %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib()') %define selinuxconf %{_sysconfdir}/selinux/config @@ -166,6 +166,9 @@ %changelog +* Fri Feb 9 2007 Yuichi Nakamura 2.1.0-2 + - Fixed build failure + * Tue Feb 6 2007 Yuichi Nakamura 2.1.0-1 - Fixed bug in RBAC - Fixed installer for Asianux From fedora-extras-commits at redhat.com Fri Feb 9 05:39:11 2007 From: fedora-extras-commits at redhat.com (Yuichi Nakamura (ynakam)) Date: Fri, 9 Feb 2007 00:39:11 -0500 Subject: rpms/seedit/FC-6 seedit.spec,1.2,1.3 Message-ID: <200702090539.l195dBQG003917@cvs-int.fedora.redhat.com> Author: ynakam Update of /cvs/extras/rpms/seedit/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3877/FC-6 Modified Files: seedit.spec Log Message: Fixed build failure Index: seedit.spec =================================================================== RCS file: /cvs/extras/rpms/seedit/FC-6/seedit.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- seedit.spec 9 Feb 2007 04:34:58 -0000 1.2 +++ seedit.spec 9 Feb 2007 05:38:39 -0000 1.3 @@ -1,4 +1,4 @@ -%define buildnum 1 +%define buildnum 2 %define python_sitelib %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib()') %define selinuxconf %{_sysconfdir}/selinux/config @@ -166,6 +166,9 @@ %changelog +* Fri Feb 9 2007 Yuichi Nakamura 2.1.0-2 + - Fixed build failure + * Tue Feb 6 2007 Yuichi Nakamura 2.1.0-1 - Fixed bug in RBAC - Fixed installer for Asianux From fedora-extras-commits at redhat.com Fri Feb 9 05:52:21 2007 From: fedora-extras-commits at redhat.com (Yuichi Nakamura (ynakam)) Date: Fri, 9 Feb 2007 00:52:21 -0500 Subject: rpms/seedit/FC-6 seedit.spec,1.3,1.4 Message-ID: <200702090552.l195qLal004152@cvs-int.fedora.redhat.com> Author: ynakam Update of /cvs/extras/rpms/seedit/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4134 Modified Files: seedit.spec Log Message: Fixed build failure again.. Index: seedit.spec =================================================================== RCS file: /cvs/extras/rpms/seedit/FC-6/seedit.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- seedit.spec 9 Feb 2007 05:38:39 -0000 1.3 +++ seedit.spec 9 Feb 2007 05:51:49 -0000 1.4 @@ -166,6 +166,9 @@ %changelog +* Fri Feb 9 2007 Yuichi Nakamura 2.1.0-3 + - Fixed build failure + * Fri Feb 9 2007 Yuichi Nakamura 2.1.0-2 - Fixed build failure From fedora-extras-commits at redhat.com Fri Feb 9 05:55:43 2007 From: fedora-extras-commits at redhat.com (Yuichi Nakamura (ynakam)) Date: Fri, 9 Feb 2007 00:55:43 -0500 Subject: rpms/seedit/FC-6 seedit.spec,1.4,1.5 Message-ID: <200702090555.l195thTZ004208@cvs-int.fedora.redhat.com> Author: ynakam Update of /cvs/extras/rpms/seedit/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4190 Modified Files: seedit.spec Log Message: Fixed build failure again,again. sorry for spam Index: seedit.spec =================================================================== RCS file: /cvs/extras/rpms/seedit/FC-6/seedit.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- seedit.spec 9 Feb 2007 05:51:49 -0000 1.4 +++ seedit.spec 9 Feb 2007 05:55:11 -0000 1.5 @@ -1,4 +1,4 @@ -%define buildnum 2 +%define buildnum 3 %define python_sitelib %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib()') %define selinuxconf %{_sysconfdir}/selinux/config From fedora-extras-commits at redhat.com Fri Feb 9 06:36:10 2007 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 9 Feb 2007 01:36:10 -0500 Subject: rpms/mew/devel mew-init.el,1.2,1.3 mew.spec,1.8,1.9 Message-ID: <200702090636.l196aA7X007826@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/mew/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7805 Modified Files: mew-init.el mew.spec Log Message: * Fri Feb 9 2007 Akira TAGOH - 5.2-2 - Remove all MIME handler definitions in mew-init.el so that it's no longer needed. Index: mew-init.el =================================================================== RCS file: /cvs/extras/rpms/mew/devel/mew-init.el,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mew-init.el 19 Jul 2006 04:29:44 -0000 1.2 +++ mew-init.el 9 Feb 2007 06:35:38 -0000 1.3 @@ -33,34 +33,3 @@ (setq mew-prog-mspowerpoint '("ooffice" nil t)) (setq mew-prog-ssl "/usr/sbin/stunnel") -;; Set content-type -(eval-after-load "mew" - '(progn - (setq mew-mime-content-type - (append '(("application/vnd.oasis.opendocument.chart" "\\.odc$" mew-b64 - mew-prog-ooffice mew-icon-text) - ("application/vnd.oasis.opendocument.database" "\\.odb$" mew-b64 - mew-prog-ooffice mew-icon-text) - ("application/vnd.oasis.opendocument.formula" "\\.odf$" mew-b64 - mew-prog-ooffice mew-icon-text) - ("application/vnd.oasis.opendocument.graphics" "\\.odg$" mew-b64 - mew-prog-ooffice mew-icon-text) - ("application/vnd.oasis.opendocument.graphics-template" "\\.otg$" mew-b64 - mew-prog-ooffice mew-icon-text) - ("application/vnd.oasis.opendocument.image" "\\.odi$" mew-b64 - mew-prog-ooffice mew-icon-text) - ("application/vnd.oasis.opendocument.presentation" "\\.odp$" mew-b64 - mew-prog-ooffice mew-icon-text) - ("application/vnd.oasis.opendocument.presentation-template" "\\.otp$" mew-b64 - mew-prog-ooffice mew-icon-text) - ("application/vnd.oasis.opendocument.spreadsheet" "\\.ods$" mew-b64 - mew-prog-ooffice mew-icon-text) - ("application/vnd.oasis.opendocument.spreadsheet-template" "\\.ots$" mew-b64 - mew-prog-ooffice mew-icon-text) - ("application/vnd.oasis.opendocument.text" "\\.odt$" mew-b64 - mew-prog-ooffice mew-icon-text) - ("application/vnd.oasis.opendocument.text-master" "\\.odm$" mew-b64 - mew-prog-ooffice mew-icon-text) - ("application/vnd.oasis.opendocument.text-template" "\\.ott$" mew-b64 - mew-prog-ooffice mew-icon-text)) - mew-mime-content-type)))) Index: mew.spec =================================================================== RCS file: /cvs/extras/rpms/mew/devel/mew.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- mew.spec 7 Feb 2007 04:56:17 -0000 1.8 +++ mew.spec 9 Feb 2007 06:35:38 -0000 1.9 @@ -177,6 +177,9 @@ %changelog +* Fri Feb 9 2007 Akira TAGOH - 5.2-2 +- Remove all MIME handler definitions in mew-init.el so that it's no longer needed. + * Wed Feb 7 2007 Akira TAGOH - 5.2-1 - New upstream release. From fedora-extras-commits at redhat.com Fri Feb 9 06:37:43 2007 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 9 Feb 2007 01:37:43 -0500 Subject: rpms/mew/devel mew.spec,1.9,1.10 Message-ID: <200702090637.l196bhCP007880@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/mew/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7863 Modified Files: mew.spec Log Message: Index: mew.spec =================================================================== RCS file: /cvs/extras/rpms/mew/devel/mew.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- mew.spec 9 Feb 2007 06:35:38 -0000 1.9 +++ mew.spec 9 Feb 2007 06:37:11 -0000 1.10 @@ -5,7 +5,7 @@ Name: mew Version: 5.2 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD-like URL: http://www.mew.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From fedora-extras-commits at redhat.com Fri Feb 9 06:41:41 2007 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 9 Feb 2007 01:41:41 -0500 Subject: rpms/mew/FC-6 mew-init.el,1.2,1.3 mew.spec,1.8,1.9 Message-ID: <200702090641.l196ffaY007977@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/mew/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7958 Modified Files: mew-init.el mew.spec Log Message: * Fri Feb 9 2007 Akira TAGOH - 5.2-2 - Remove all MIME handler definitions in mew-init.el so that it's no longer needed. Index: mew-init.el =================================================================== RCS file: /cvs/extras/rpms/mew/FC-6/mew-init.el,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mew-init.el 19 Jul 2006 04:29:44 -0000 1.2 +++ mew-init.el 9 Feb 2007 06:41:08 -0000 1.3 @@ -33,34 +33,3 @@ (setq mew-prog-mspowerpoint '("ooffice" nil t)) (setq mew-prog-ssl "/usr/sbin/stunnel") -;; Set content-type -(eval-after-load "mew" - '(progn - (setq mew-mime-content-type - (append '(("application/vnd.oasis.opendocument.chart" "\\.odc$" mew-b64 - mew-prog-ooffice mew-icon-text) - ("application/vnd.oasis.opendocument.database" "\\.odb$" mew-b64 - mew-prog-ooffice mew-icon-text) - ("application/vnd.oasis.opendocument.formula" "\\.odf$" mew-b64 - mew-prog-ooffice mew-icon-text) - ("application/vnd.oasis.opendocument.graphics" "\\.odg$" mew-b64 - mew-prog-ooffice mew-icon-text) - ("application/vnd.oasis.opendocument.graphics-template" "\\.otg$" mew-b64 - mew-prog-ooffice mew-icon-text) - ("application/vnd.oasis.opendocument.image" "\\.odi$" mew-b64 - mew-prog-ooffice mew-icon-text) - ("application/vnd.oasis.opendocument.presentation" "\\.odp$" mew-b64 - mew-prog-ooffice mew-icon-text) - ("application/vnd.oasis.opendocument.presentation-template" "\\.otp$" mew-b64 - mew-prog-ooffice mew-icon-text) - ("application/vnd.oasis.opendocument.spreadsheet" "\\.ods$" mew-b64 - mew-prog-ooffice mew-icon-text) - ("application/vnd.oasis.opendocument.spreadsheet-template" "\\.ots$" mew-b64 - mew-prog-ooffice mew-icon-text) - ("application/vnd.oasis.opendocument.text" "\\.odt$" mew-b64 - mew-prog-ooffice mew-icon-text) - ("application/vnd.oasis.opendocument.text-master" "\\.odm$" mew-b64 - mew-prog-ooffice mew-icon-text) - ("application/vnd.oasis.opendocument.text-template" "\\.ott$" mew-b64 - mew-prog-ooffice mew-icon-text)) - mew-mime-content-type)))) Index: mew.spec =================================================================== RCS file: /cvs/extras/rpms/mew/FC-6/mew.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- mew.spec 8 Feb 2007 03:18:36 -0000 1.8 +++ mew.spec 9 Feb 2007 06:41:08 -0000 1.9 @@ -5,7 +5,7 @@ Name: mew Version: 5.2 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD-like URL: http://www.mew.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -177,6 +177,9 @@ %changelog +* Fri Feb 9 2007 Akira TAGOH - 5.2-2 +- Remove all MIME handler definitions in mew-init.el so that it's no longer needed. + * Wed Feb 7 2007 Akira TAGOH - 5.2-1 - New upstream release. From fedora-extras-commits at redhat.com Fri Feb 9 06:53:43 2007 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 9 Feb 2007 01:53:43 -0500 Subject: rpms/mew/FC-5 mew-init.el,1.2,1.3 mew.spec,1.5,1.6 Message-ID: <200702090653.l196rh21008077@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/mew/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8058 Modified Files: mew-init.el mew.spec Log Message: * Fri Feb 9 2007 Akira TAGOH - 5.2-2 - Remove all MIME handler definitions in mew-init.el so that it's no longer needed. Index: mew-init.el =================================================================== RCS file: /cvs/extras/rpms/mew/FC-5/mew-init.el,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mew-init.el 19 Jul 2006 04:37:48 -0000 1.2 +++ mew-init.el 9 Feb 2007 06:53:11 -0000 1.3 @@ -33,34 +33,3 @@ (setq mew-prog-mspowerpoint '("ooffice" nil t)) (setq mew-prog-ssl "/usr/sbin/stunnel") -;; Set content-type -(eval-after-load "mew" - '(progn - (setq mew-mime-content-type - (append '(("application/vnd.oasis.opendocument.chart" "\\.odc$" mew-b64 - mew-prog-ooffice mew-icon-text) - ("application/vnd.oasis.opendocument.database" "\\.odb$" mew-b64 - mew-prog-ooffice mew-icon-text) - ("application/vnd.oasis.opendocument.formula" "\\.odf$" mew-b64 - mew-prog-ooffice mew-icon-text) - ("application/vnd.oasis.opendocument.graphics" "\\.odg$" mew-b64 - mew-prog-ooffice mew-icon-text) - ("application/vnd.oasis.opendocument.graphics-template" "\\.otg$" mew-b64 - mew-prog-ooffice mew-icon-text) - ("application/vnd.oasis.opendocument.image" "\\.odi$" mew-b64 - mew-prog-ooffice mew-icon-text) - ("application/vnd.oasis.opendocument.presentation" "\\.odp$" mew-b64 - mew-prog-ooffice mew-icon-text) - ("application/vnd.oasis.opendocument.presentation-template" "\\.otp$" mew-b64 - mew-prog-ooffice mew-icon-text) - ("application/vnd.oasis.opendocument.spreadsheet" "\\.ods$" mew-b64 - mew-prog-ooffice mew-icon-text) - ("application/vnd.oasis.opendocument.spreadsheet-template" "\\.ots$" mew-b64 - mew-prog-ooffice mew-icon-text) - ("application/vnd.oasis.opendocument.text" "\\.odt$" mew-b64 - mew-prog-ooffice mew-icon-text) - ("application/vnd.oasis.opendocument.text-master" "\\.odm$" mew-b64 - mew-prog-ooffice mew-icon-text) - ("application/vnd.oasis.opendocument.text-template" "\\.ott$" mew-b64 - mew-prog-ooffice mew-icon-text)) - mew-mime-content-type)))) Index: mew.spec =================================================================== RCS file: /cvs/extras/rpms/mew/FC-5/mew.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mew.spec 8 Feb 2007 05:28:50 -0000 1.5 +++ mew.spec 9 Feb 2007 06:53:11 -0000 1.6 @@ -5,7 +5,7 @@ Name: mew Version: 5.2 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD-like URL: http://www.mew.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -177,6 +177,9 @@ %changelog +* Fri Feb 9 2007 Akira TAGOH - 5.2-2 +- Remove all MIME handler definitions in mew-init.el so that it's no longer needed. + * Wed Feb 7 2007 Akira TAGOH - 5.2-1 - New upstream release. From fedora-extras-commits at redhat.com Fri Feb 9 07:12:21 2007 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Fri, 9 Feb 2007 02:12:21 -0500 Subject: rpms/deskbar-applet/devel deskbar-applet.spec,1.40,1.41 Message-ID: <200702090712.l197CL8v011539@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/deskbar-applet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11522 Modified Files: deskbar-applet.spec Log Message: - 2.17.90 - scrollkeeper support Index: deskbar-applet.spec =================================================================== RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- deskbar-applet.spec 16 Jan 2007 18:38:01 -0000 1.40 +++ deskbar-applet.spec 9 Feb 2007 07:11:48 -0000 1.41 @@ -2,14 +2,14 @@ %{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: deskbar-applet -Version: 2.17.5.1 -Release: 2%{?dist} +Version: 2.17.90 +Release: 1%{?dist} Summary: A Gnome applet to allow easy access to various search engines Group: Applications/Internet License: GPL URL: http://live.gnome.org/DeskbarApplet -Source0: http://ftp.gnome.org/pub/GNOME/sources/deskbar-applet/2.16/%{name}-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/GNOME/sources/deskbar-applet/2.17/%{name}-%{version}.tar.bz2 Source1: fedorabz.py Source2: fedorabz.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -17,12 +17,13 @@ BuildRequires: gettext evolution-data-server-devel gnome-desktop-devel BuildRequires: libSM-devel gnome-python2-applet desktop-file-utils BuildRequires: perl(XML::Parser) gnome-python2-devel -BuildRequires: gnome-doc-utils +BuildRequires: gnome-doc-utils scrollkeeper Requires: gnome-python2 gnome-python2-applet gnome-python2-bonobo Requires: gnome-python2-gconf pygtk2 gnome-python2-libwnck Requires(pre): GConf2 -Requires(post): GConf2 desktop-file-utils +Requires(post): GConf2 desktop-file-utils scrollkeeper Requires(preun): GConf2 desktop-file-utils +Requires(postun): scrollkeeper Provides: deskbar-applet-fedorabz %description @@ -38,7 +39,7 @@ %setup -q %build -%configure --disable-schemas-install --disable-scrollkeeper +%configure --disable-schemas-install make %{_smp_mflags} %install @@ -74,6 +75,7 @@ touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : %preun if [ "$1" -eq 0 ]; then @@ -86,6 +88,7 @@ %postun touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +scrollkeeper-update -q || : %files -f %{name}.lang %defattr(-,root,root,-) @@ -99,8 +102,13 @@ %{_datadir}/icons/hicolor/*/apps/%{name}.* %{_datadir}/gnome/help/deskbar/C/ %{_datadir}/omf/deskbar/ +/var/lib/scrollkeeper/ %changelog +* Tue Feb 9 2007 Luke Macken - 2.17.90-1 +- 2.17.90 +- scrollkeeper support + * Tue Jan 16 2007 Luke Macken - 2.17.5.1-2 - Add gnome-doc-utils to BuildRequires From fedora-extras-commits at redhat.com Fri Feb 9 07:25:25 2007 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Fri, 9 Feb 2007 02:25:25 -0500 Subject: rpms/deskbar-applet/devel .cvsignore,1.17,1.18 sources,1.17,1.18 Message-ID: <200702090725.l197PPLG011685@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/deskbar-applet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11664 Modified Files: .cvsignore sources Log Message: add the new sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/deskbar-applet/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 16 Jan 2007 18:24:49 -0000 1.17 +++ .cvsignore 9 Feb 2007 07:24:52 -0000 1.18 @@ -1 +1 @@ -deskbar-applet-2.17.5.1.tar.bz2 +deskbar-applet-2.17.90.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/deskbar-applet/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 16 Jan 2007 18:24:49 -0000 1.17 +++ sources 9 Feb 2007 07:24:52 -0000 1.18 @@ -1 +1 @@ -09837caa00f33905bd6d3c3a214a6fe0 deskbar-applet-2.17.5.1.tar.bz2 +5517180a876246a833253839f28276a2 deskbar-applet-2.17.90.tar.bz2 From fedora-extras-commits at redhat.com Fri Feb 9 07:27:20 2007 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Fri, 9 Feb 2007 02:27:20 -0500 Subject: rpms/deskbar-applet/devel deskbar-applet.spec,1.41,1.42 Message-ID: <200702090727.l197RKMf011724@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/deskbar-applet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11704 Modified Files: deskbar-applet.spec Log Message: rebuild Index: deskbar-applet.spec =================================================================== RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- deskbar-applet.spec 9 Feb 2007 07:11:48 -0000 1.41 +++ deskbar-applet.spec 9 Feb 2007 07:26:48 -0000 1.42 @@ -3,7 +3,7 @@ Name: deskbar-applet Version: 2.17.90 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Gnome applet to allow easy access to various search engines Group: Applications/Internet @@ -105,6 +105,9 @@ /var/lib/scrollkeeper/ %changelog +* Tue Feb 9 2007 Luke Macken - 2.17.90-2 +- Rebuild + * Tue Feb 9 2007 Luke Macken - 2.17.90-1 - 2.17.90 - scrollkeeper support From fedora-extras-commits at redhat.com Fri Feb 9 08:24:31 2007 From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu)) Date: Fri, 9 Feb 2007 03:24:31 -0500 Subject: rpms/rawstudio/devel .cvsignore, 1.3, 1.4 rawstudio.spec, 1.3, 1.4 sources, 1.3, 1.4 rawstudio-0.4.1-destdir.patch, 1.1, NONE Message-ID: <200702090824.l198OVYo015436@cvs-int.fedora.redhat.com> Author: giallu Update of /cvs/extras/rpms/rawstudio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15413 Modified Files: .cvsignore rawstudio.spec sources Removed Files: rawstudio-0.4.1-destdir.patch Log Message: * Tue Feb 06 2007 Gianluca Sforna 0.5-1 - new upstream version - add libtiff-devel BR - drop upstreamed patch - drop dcraw runtime Require Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rawstudio/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Sep 2006 22:22:30 -0000 1.3 +++ .cvsignore 9 Feb 2007 08:23:58 -0000 1.4 @@ -1 +1 @@ -rawstudio-0.4.1.tar.gz +rawstudio-0.5.tar.gz Index: rawstudio.spec =================================================================== RCS file: /cvs/extras/rpms/rawstudio/devel/rawstudio.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rawstudio.spec 29 Sep 2006 10:14:39 -0000 1.3 +++ rawstudio.spec 9 Feb 2007 08:23:58 -0000 1.4 @@ -1,6 +1,6 @@ Name: rawstudio -Version: 0.4.1 -Release: 2%{?dist} +Version: 0.5 +Release: 1%{?dist} Summary: Raw-image converter Group: Applications/Multimedia @@ -10,20 +10,16 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel, libxml2-devel, GConf2-devel -BuildRequires: lcms-devel, libjpeg-devel +BuildRequires: lcms-devel, libjpeg-devel, libtiff-devel BuildRequires: desktop-file-utils -BuildRequires: automake -Requires: dcraw -Patch0: rawstudio-0.4.1-destdir.patch %description Rawstudio is an open source raw-image converter written in GTK+. + %prep %setup -q -%patch0 -p1 -b .patch0 -automake %build @@ -61,6 +57,12 @@ %changelog +* Tue Feb 06 2007 Gianluca Sforna 0.5-1 +- new upstream version +- add libtiff-devel BR +- drop upstreamed patch +- drop dcraw runtime Require + * Wed Sep 27 2006 Gianluca Sforna 0.4.1-1 - new upstream version - Add DESTDIR patch (and BR: automake) Index: sources =================================================================== RCS file: /cvs/extras/rpms/rawstudio/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Sep 2006 22:22:30 -0000 1.3 +++ sources 9 Feb 2007 08:23:58 -0000 1.4 @@ -1 +1 @@ -09844b550fbfd35f02623a549d5b4c33 rawstudio-0.4.1.tar.gz +b1f44ba45335cbf7ab8fe7cc3d8ac150 rawstudio-0.5.tar.gz --- rawstudio-0.4.1-destdir.patch DELETED --- From fedora-extras-commits at redhat.com Fri Feb 9 08:40:38 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb)) Date: Fri, 9 Feb 2007 03:40:38 -0500 Subject: rpms/nas/devel nas.spec,1.7,1.8 Message-ID: <200702090840.l198ec14015567@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/nas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15550 Modified Files: nas.spec Log Message: use the corrected patch Index: nas.spec =================================================================== RCS file: /cvs/extras/rpms/nas/devel/nas.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- nas.spec 8 Feb 2007 15:03:00 -0000 1.7 +++ nas.spec 9 Feb 2007 08:40:06 -0000 1.8 @@ -1,9 +1,9 @@ Name: nas Summary: The Network Audio System (NAS) Version: 1.8 -Release: 11%{?dist} +Release: 12%{?dist} BuildRequires: bison flex -%if 1 || "%{?fedora}" > "4" || "%{?rhel}" > "4" +if "%{?fedora}" > "4" || "%{?rhel}" > "4" BuildRequires: imake libXaw-devel libXpm-devel libXp-devel libXext-devel libXt-devel %define libdir_x11 %{_libdir}/X11 %else @@ -115,6 +115,9 @@ %changelog +* Thu Feb 09 2007 Frank B??ttner - 1.8-12%{?dist} +- use the corrected patch + * Thu Feb 08 2007 Frank B??ttner - 1.8-11%{?dist} - fix bug 227759 From fedora-extras-commits at redhat.com Fri Feb 9 08:44:07 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb)) Date: Fri, 9 Feb 2007 03:44:07 -0500 Subject: rpms/nas/devel nas.spec,1.8,1.9 Message-ID: <200702090844.l198i7kH015614@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/nas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15597 Modified Files: nas.spec Log Message: Index: nas.spec =================================================================== RCS file: /cvs/extras/rpms/nas/devel/nas.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- nas.spec 9 Feb 2007 08:40:06 -0000 1.8 +++ nas.spec 9 Feb 2007 08:43:35 -0000 1.9 @@ -1,9 +1,9 @@ Name: nas Summary: The Network Audio System (NAS) Version: 1.8 -Release: 12%{?dist} +Release: 13%{?dist} BuildRequires: bison flex -if "%{?fedora}" > "4" || "%{?rhel}" > "4" +%if "%{?fedora}" > "4" || "%{?rhel}" > "4" BuildRequires: imake libXaw-devel libXpm-devel libXp-devel libXext-devel libXt-devel %define libdir_x11 %{_libdir}/X11 %else @@ -115,7 +115,7 @@ %changelog -* Thu Feb 09 2007 Frank B??ttner - 1.8-12%{?dist} +* Thu Feb 09 2007 Frank B??ttner - 1.8-13%{?dist} - use the corrected patch * Thu Feb 08 2007 Frank B??ttner - 1.8-11%{?dist} From fedora-extras-commits at redhat.com Fri Feb 9 08:48:26 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb)) Date: Fri, 9 Feb 2007 03:48:26 -0500 Subject: rpms/nas/FC-6 nas.spec,1.7,1.8 Message-ID: <200702090848.l198mQVs015679@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/nas/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15662 Modified Files: nas.spec Log Message: use the corrected patch Index: nas.spec =================================================================== RCS file: /cvs/extras/rpms/nas/FC-6/nas.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- nas.spec 8 Feb 2007 15:14:48 -0000 1.7 +++ nas.spec 9 Feb 2007 08:47:53 -0000 1.8 @@ -1,9 +1,9 @@ Name: nas Summary: The Network Audio System (NAS) Version: 1.8 -Release: 11%{?dist} +Release: 13%{?dist} BuildRequires: bison flex -%if 1 || "%{?fedora}" > "4" || "%{?rhel}" > "4" +%if "%{?fedora}" > "4" || "%{?rhel}" > "4" BuildRequires: imake libXaw-devel libXpm-devel libXp-devel libXext-devel libXt-devel %define libdir_x11 %{_libdir}/X11 %else @@ -115,6 +115,9 @@ %changelog +* Thu Feb 09 2007 Frank B??ttner - 1.8-13%{?dist} +- use the corrected patch + * Thu Feb 08 2007 Frank B??ttner - 1.8-11%{?dist} - fix bug 227759 From fedora-extras-commits at redhat.com Fri Feb 9 09:24:15 2007 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Fri, 9 Feb 2007 04:24:15 -0500 Subject: rpms/ufraw/FC-6 COPYING,1.1,NONE Message-ID: <200702090924.l199OFrf019637@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/ufraw/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19630 Removed Files: COPYING Log Message: COPYING present in source tarball --- COPYING DELETED --- From fedora-extras-commits at redhat.com Fri Feb 9 09:25:54 2007 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Fri, 9 Feb 2007 04:25:54 -0500 Subject: rpms/ufraw/FC-5 COPYING,1.1,NONE Message-ID: <200702090925.l199PsDg019677@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/ufraw/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19670 Removed Files: COPYING Log Message: COPYING present in source tarball --- COPYING DELETED --- From fedora-extras-commits at redhat.com Fri Feb 9 09:27:00 2007 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Fri, 9 Feb 2007 04:27:00 -0500 Subject: rpms/ufraw/FC-5 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 ufraw.spec, 1.8, 1.9 Message-ID: <200702090927.l199R0RV019726@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/ufraw/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19703 Modified Files: .cvsignore sources ufraw.spec Log Message: version 0.9.1 require gimp >= 2.0 for building Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ufraw/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 21 Nov 2005 14:46:00 -0000 1.4 +++ .cvsignore 9 Feb 2007 09:26:28 -0000 1.5 @@ -1 +1 @@ -ufraw-0.6.tar.gz +ufraw-0.9.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/ufraw/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 21 Nov 2005 14:46:00 -0000 1.4 +++ sources 9 Feb 2007 09:26:28 -0000 1.5 @@ -1 +1 @@ -2074676b9437738630eee72b9fc6c50c ufraw-0.6.tar.gz +7388ed97a156ea6a7272513a1dc8f8d5 ufraw-0.9.1.tar.gz Index: ufraw.spec =================================================================== RCS file: /cvs/extras/rpms/ufraw/FC-5/ufraw.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ufraw.spec 17 Feb 2006 15:18:56 -0000 1.8 +++ ufraw.spec 9 Feb 2007 09:26:28 -0000 1.9 @@ -3,13 +3,14 @@ Summary: GIMP plugin to retrieve raw image data from digital cameras Name: ufraw -Version: 0.6 -Release: 2 +Version: 0.9.1 +Release: 1%{?dist} Group: Applications/Multimedia License: GPL URL: http://ufraw.sourceforge.net Source0: http://dl.sourceforge.net/ufraw/ufraw-%{version}.tar.gz BuildRequires: gimp-devel >= 2.0 +BuildRequires: gimp >= 2.0 BuildRequires: gtk2-devel >= 2.6.0 BuildRequires: lcms-devel BuildRequires: libexif-devel @@ -46,6 +47,10 @@ %{gimpplugindir}/ufraw-gimp %changelog +* Mon Aug 28 2006 Nils Philippsen - 0.9.1-1 +- version 0.9.1 +- require gimp >= 2.0 for building + * Fri Feb 17 2006 Nils Philippsen - 0.6-2 - rebuild From fedora-extras-commits at redhat.com Fri Feb 9 09:31:03 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb)) Date: Fri, 9 Feb 2007 04:31:03 -0500 Subject: rpms/nas/FC-5 nas.spec,1.6,1.7 Message-ID: <200702090931.l199V3Zr019818@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/nas/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19794 Modified Files: nas.spec Log Message: use the corrected patch Index: nas.spec =================================================================== RCS file: /cvs/extras/rpms/nas/FC-5/nas.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- nas.spec 8 Feb 2007 15:17:51 -0000 1.6 +++ nas.spec 9 Feb 2007 09:30:31 -0000 1.7 @@ -1,9 +1,9 @@ Name: nas Summary: The Network Audio System (NAS) Version: 1.8 -Release: 11%{?dist} +Release: 13%{?dist} BuildRequires: bison flex -%if 1 || "%{?fedora}" > "4" || "%{?rhel}" > "4" +%if "%{?fedora}" > "4" || "%{?rhel}" > "4" BuildRequires: imake libXaw-devel libXpm-devel libXp-devel libXext-devel libXt-devel %define libdir_x11 %{_libdir}/X11 %else @@ -115,6 +115,9 @@ %changelog +* Thu Feb 09 2007 Frank B??ttner - 1.8-13%{?dist} +- use the corrected patch + * Thu Feb 08 2007 Frank B??ttner - 1.8-11%{?dist} - fix bug 227759 From fedora-extras-commits at redhat.com Fri Feb 9 09:36:23 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb)) Date: Fri, 9 Feb 2007 04:36:23 -0500 Subject: rpms/nas/FC-4 nas.spec,1.8,1.9 Message-ID: <200702090936.l199aNce019914@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/nas/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19896 Modified Files: nas.spec Log Message: use the corrected patch Index: nas.spec =================================================================== RCS file: /cvs/extras/rpms/nas/FC-4/nas.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- nas.spec 8 Feb 2007 15:20:43 -0000 1.8 +++ nas.spec 9 Feb 2007 09:35:50 -0000 1.9 @@ -1,9 +1,9 @@ Name: nas Summary: The Network Audio System (NAS) Version: 1.8 -Release: 11%{?dist} +Release: 13%{?dist} BuildRequires: bison flex -%if 1 || "%{?fedora}" > "4" || "%{?rhel}" > "4" +%if "%{?fedora}" > "4" || "%{?rhel}" > "4" BuildRequires: imake libXaw-devel libXpm-devel libXp-devel libXext-devel libXt-devel %define libdir_x11 %{_libdir}/X11 %else @@ -115,6 +115,9 @@ %changelog +* Thu Feb 09 2007 Frank B??ttner - 1.8-13%{?dist} +- use the corrected patch + * Thu Feb 08 2007 Frank B??ttner - 1.8-11%{?dist} - fix bug 227759 From fedora-extras-commits at redhat.com Fri Feb 9 09:51:30 2007 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Fri, 9 Feb 2007 04:51:30 -0500 Subject: rpms/heartbeat/devel heartbeat.spec,1.13,1.14 Message-ID: <200702090951.l199pUqI019993@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/heartbeat/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19976 Modified Files: heartbeat.spec Log Message: * Fri Feb 9 2007 Joost Soeterbroek - 2.0.8-2 - change condrestart -> restart (bz #223949) Index: heartbeat.spec =================================================================== RCS file: /cvs/extras/rpms/heartbeat/devel/heartbeat.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- heartbeat.spec 21 Jan 2007 19:23:58 -0000 1.13 +++ heartbeat.spec 9 Feb 2007 09:50:57 -0000 1.14 @@ -6,7 +6,7 @@ Summary: Heartbeat subsystem for High-Availability Linux Name: heartbeat Version: 2.0.8 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/LGPL URL: http://linux-ha.org/ Group: System Environment/Daemons @@ -165,7 +165,7 @@ %postun if [ "$1" -ge "1" ] ; then - /sbin/service heartbeat condrestart + /sbin/service heartbeat restart fi /sbin/ldconfig test "$1" != 0 || /usr/sbin/fedora-userdel %{uname} &>/dev/null || : @@ -304,6 +304,9 @@ %{_libdir}/*.so %changelog +* Fri Feb 9 2007 Joost Soeterbroek - 2.0.8-2 +- change condrestart -> restart (bz #223949) + * Sun Jan 21 2007 Joost Soeterbroek - 2.0.8-1 - upstream version 2.0.8 - fix cl_status commands fail (bz #219765) From fedora-extras-commits at redhat.com Fri Feb 9 09:55:26 2007 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Fri, 9 Feb 2007 04:55:26 -0500 Subject: rpms/heartbeat/FC-5 heartbeat.spec,1.7,1.8 Message-ID: <200702090955.l199tQXu020074@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/heartbeat/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20042/FC-5 Modified Files: heartbeat.spec Log Message: change condrestart -> restart (bz #223949) Index: heartbeat.spec =================================================================== RCS file: /cvs/extras/rpms/heartbeat/FC-5/heartbeat.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- heartbeat.spec 21 Jan 2007 20:05:01 -0000 1.7 +++ heartbeat.spec 9 Feb 2007 09:54:54 -0000 1.8 @@ -6,7 +6,7 @@ Summary: Heartbeat subsystem for High-Availability Linux Name: heartbeat Version: 2.0.8 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/LGPL URL: http://linux-ha.org/ Group: System Environment/Daemons @@ -18,7 +18,7 @@ BuildRequires: iputils BuildRequires: libnet-devel BuildRequires: libtool-ltdl-devel -BuildRequires: net-snmp-devel >= 5.4 +BuildRequires: net-snmp-devel BuildRequires: bzip2-devel BuildRequires: ncurses-devel %if %{ENABLE_MGMT} @@ -165,7 +165,7 @@ %postun if [ "$1" -ge "1" ] ; then - /sbin/service heartbeat condrestart + /sbin/service heartbeat restart fi /sbin/ldconfig test "$1" != 0 || /usr/sbin/fedora-userdel %{uname} &>/dev/null || : @@ -304,6 +304,9 @@ %{_libdir}/*.so %changelog +* Fri Feb 9 2007 Joost Soeterbroek - 2.0.8-2 +- change condrestart -> restart (bz #223949) + * Sun Jan 21 2007 Joost Soeterbroek - 2.0.8-1 - upstream version 2.0.8 - fix cl_status commands fail (bz #219765) From fedora-extras-commits at redhat.com Fri Feb 9 09:55:28 2007 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Fri, 9 Feb 2007 04:55:28 -0500 Subject: rpms/heartbeat/FC-6 heartbeat.spec,1.11,1.12 Message-ID: <200702090955.l199tSMV020077@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/heartbeat/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20042/FC-6 Modified Files: heartbeat.spec Log Message: change condrestart -> restart (bz #223949) Index: heartbeat.spec =================================================================== RCS file: /cvs/extras/rpms/heartbeat/FC-6/heartbeat.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- heartbeat.spec 21 Jan 2007 20:05:01 -0000 1.11 +++ heartbeat.spec 9 Feb 2007 09:54:56 -0000 1.12 @@ -6,7 +6,7 @@ Summary: Heartbeat subsystem for High-Availability Linux Name: heartbeat Version: 2.0.8 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/LGPL URL: http://linux-ha.org/ Group: System Environment/Daemons @@ -165,7 +165,7 @@ %postun if [ "$1" -ge "1" ] ; then - /sbin/service heartbeat condrestart + /sbin/service heartbeat restart fi /sbin/ldconfig test "$1" != 0 || /usr/sbin/fedora-userdel %{uname} &>/dev/null || : @@ -304,6 +304,9 @@ %{_libdir}/*.so %changelog +* Fri Feb 9 2007 Joost Soeterbroek - 2.0.8-2 +- change condrestart -> restart (bz #223949) + * Sun Jan 21 2007 Joost Soeterbroek - 2.0.8-1 - upstream version 2.0.8 - fix cl_status commands fail (bz #219765) From fedora-extras-commits at redhat.com Fri Feb 9 12:12:36 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 9 Feb 2007 07:12:36 -0500 Subject: rpms/libmp4v2 - New directory Message-ID: <200702091212.l19CCaE1031013@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/libmp4v2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31008/libmp4v2 Log Message: Directory /cvs/extras/rpms/libmp4v2 added to the repository From fedora-extras-commits at redhat.com Fri Feb 9 12:12:43 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 9 Feb 2007 07:12:43 -0500 Subject: rpms/libmp4v2/devel - New directory Message-ID: <200702091212.l19CChkZ031030@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/libmp4v2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31008/libmp4v2/devel Log Message: Directory /cvs/extras/rpms/libmp4v2/devel added to the repository From fedora-extras-commits at redhat.com Fri Feb 9 13:17:46 2007 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 9 Feb 2007 08:17:46 -0500 Subject: rpms/mew/FC-5 mew.spec,1.6,1.7 Message-ID: <200702091317.l19DHk5p002365@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/mew/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2342 Modified Files: mew.spec Log Message: Index: mew.spec =================================================================== RCS file: /cvs/extras/rpms/mew/FC-5/mew.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mew.spec 9 Feb 2007 06:53:11 -0000 1.6 +++ mew.spec 9 Feb 2007 13:17:14 -0000 1.7 @@ -5,7 +5,7 @@ Name: mew Version: 5.2 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD-like URL: http://www.mew.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -35,7 +35,7 @@ %package xemacs Summary: Mew - Messaging in the Emacs World for XEmacs Group: Applications/Internet -Requires: xemacs-common xemacs-packages-extra +Requires: xemacs-common Requires: %{name}-common = %{version} Conflicts: xemacs <= 21.1.14-24 @@ -177,8 +177,9 @@ %changelog -* Fri Feb 9 2007 Akira TAGOH - 5.2-2 +* Fri Feb 9 2007 Akira TAGOH - 5.2-3 - Remove all MIME handler definitions in mew-init.el so that it's no longer needed. +- Remove xemacs-packages-extra deps. * Wed Feb 7 2007 Akira TAGOH - 5.2-1 - New upstream release. From fedora-extras-commits at redhat.com Fri Feb 9 16:17:51 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 9 Feb 2007 11:17:51 -0500 Subject: rpms/moin/devel .cvsignore, 1.8, 1.9 moin.spec, 1.13, 1.14 sources, 1.8, 1.9 Message-ID: <200702091617.l19GHpdE013722@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/moin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13695 Modified Files: .cvsignore moin.spec sources Log Message: Update to 1.5.7. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/moin/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 31 Oct 2006 15:11:26 -0000 1.8 +++ .cvsignore 9 Feb 2007 16:17:19 -0000 1.9 @@ -1 +1 @@ -moin-1.5.6.tar.gz +moin-1.5.7.tar.gz Index: moin.spec =================================================================== RCS file: /cvs/extras/rpms/moin/devel/moin.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- moin.spec 11 Dec 2006 14:12:15 -0000 1.13 +++ moin.spec 9 Feb 2007 16:17:19 -0000 1.14 @@ -1,7 +1,7 @@ Summary: MoinMoin is a Python clone of WikiWiki Name: moin -Version: 1.5.6 -Release: 2%{?dist} +Version: 1.5.7 +Release: 1%{?dist} License: GPL Group: Applications/Internet URL: http://moinmoin.wikiwikiweb.de/ @@ -52,6 +52,9 @@ %changelog +* Fri Feb 9 2007 Matthias Saou 1.5.7-1 +- Update to 1.5.7. + * Mon Dec 11 2006 Matthias Saou 1.5.6-2 - Rebuild against python 2.5. - Change python build requirement to python-devel, as it's needed now. Index: sources =================================================================== RCS file: /cvs/extras/rpms/moin/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 31 Oct 2006 15:11:26 -0000 1.8 +++ sources 9 Feb 2007 16:17:19 -0000 1.9 @@ -1 +1 @@ -b87046e39a13f749163a39e8ffa0e0f4 moin-1.5.6.tar.gz +b304f1c2054c7f3bf0dc48c141b28b33 moin-1.5.7.tar.gz From fedora-extras-commits at redhat.com Fri Feb 9 16:59:21 2007 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Fri, 9 Feb 2007 11:59:21 -0500 Subject: rpms/vnc-reflector/FC-5 vnc-reflector.spec,1.2,1.3 Message-ID: <200702091659.l19GxLLi014307@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/vnc-reflector/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14242/FC-5 Modified Files: vnc-reflector.spec Log Message: apply debuginfo fix from BZ#225107 Index: vnc-reflector.spec =================================================================== RCS file: /cvs/extras/rpms/vnc-reflector/FC-5/vnc-reflector.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- vnc-reflector.spec 14 Jun 2006 15:22:38 -0000 1.2 +++ vnc-reflector.spec 9 Feb 2007 16:58:49 -0000 1.3 @@ -1,13 +1,11 @@ -# $Id$ - Name: vnc-reflector Version: 1.2.4 -Release: 1%{?dist} +Release: 3%{?dist} Summary: A specialized, multiplexing vnc proxy server Group: Applications/Internet License: BSD -URL: http://sourceforge.net/projects/vnc-reflector/ +URL: http://sourceforge.net/projects/vnc-reflector Source0: http://dl.sf.net/vnc-reflector/vnc_reflector-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -23,14 +21,14 @@ %build -make %{?_smp_mflags} +make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -I." %install rm -rf %{buildroot} # no install target in the makefile.... -%{__mkdir_p} %{buildroot}%{_bindir} +mkdir -p %{buildroot}%{_bindir} cp vncreflector %{buildroot}%{_bindir} @@ -45,6 +43,12 @@ %changelog +* Fri Feb 09 2007 Chris Weyl 1.2.4-3 +- apply debuginfo fixes from BZ#225107 + +* Thu Aug 31 2006 Chris Weyl 1.2.4-2 +- bump for mass rebuild + * Wed Jun 14 2006 Chris Weyl 1.2.4-1 - bump release to -1 for F-E builds - change download source to a more generic sourceforgeish way From fedora-extras-commits at redhat.com Fri Feb 9 16:59:19 2007 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Fri, 9 Feb 2007 11:59:19 -0500 Subject: rpms/vnc-reflector Makefile,1.1,1.2 Message-ID: <200702091659.l19GxJen014304@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/vnc-reflector In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14242 Modified Files: Makefile Log Message: apply debuginfo fix from BZ#225107 Index: Makefile =================================================================== RCS file: /cvs/extras/rpms/vnc-reflector/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile 14 Jun 2006 15:16:15 -0000 1.1 +++ Makefile 9 Feb 2007 16:58:46 -0000 1.2 @@ -2,6 +2,15 @@ all : CVS/Root common-update @cvs update +# for target build-all +BRANCHES := $(shell cat ~/fedora-extras/current-branches | sed -e 's/:.*//') + +# tag & build all non-legacy branches... +build-all : + @echo NOTICE: building for ${BRANCHES} + @sleep 5s + @for br in ${BRANCHES} ; do echo Building $$br ; cd $$br && test -f dead.package || make tag plague ; cd .. ; done + common-update : common @cd common && cvs update From fedora-extras-commits at redhat.com Fri Feb 9 16:59:26 2007 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Fri, 9 Feb 2007 11:59:26 -0500 Subject: rpms/vnc-reflector/devel vnc-reflector.spec,1.3,1.4 Message-ID: <200702091659.l19GxQDf014313@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/vnc-reflector/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14242/devel Modified Files: vnc-reflector.spec Log Message: apply debuginfo fix from BZ#225107 Index: vnc-reflector.spec =================================================================== RCS file: /cvs/extras/rpms/vnc-reflector/devel/vnc-reflector.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- vnc-reflector.spec 1 Sep 2006 04:23:32 -0000 1.3 +++ vnc-reflector.spec 9 Feb 2007 16:58:54 -0000 1.4 @@ -1,13 +1,11 @@ -# $Id$ - Name: vnc-reflector Version: 1.2.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A specialized, multiplexing vnc proxy server Group: Applications/Internet License: BSD -URL: http://sourceforge.net/projects/vnc-reflector/ +URL: http://sourceforge.net/projects/vnc-reflector Source0: http://dl.sf.net/vnc-reflector/vnc_reflector-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -23,14 +21,14 @@ %build -make %{?_smp_mflags} +make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -I." %install rm -rf %{buildroot} # no install target in the makefile.... -%{__mkdir_p} %{buildroot}%{_bindir} +mkdir -p %{buildroot}%{_bindir} cp vncreflector %{buildroot}%{_bindir} @@ -45,6 +43,9 @@ %changelog +* Fri Feb 09 2007 Chris Weyl 1.2.4-3 +- apply debuginfo fixes from BZ#225107 + * Thu Aug 31 2006 Chris Weyl 1.2.4-2 - bump for mass rebuild From fedora-extras-commits at redhat.com Fri Feb 9 16:59:24 2007 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Fri, 9 Feb 2007 11:59:24 -0500 Subject: rpms/vnc-reflector/FC-6 vnc-reflector.spec,1.3,1.4 Message-ID: <200702091659.l19GxO4s014310@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/vnc-reflector/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14242/FC-6 Modified Files: vnc-reflector.spec Log Message: apply debuginfo fix from BZ#225107 Index: vnc-reflector.spec =================================================================== RCS file: /cvs/extras/rpms/vnc-reflector/FC-6/vnc-reflector.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- vnc-reflector.spec 1 Sep 2006 04:23:32 -0000 1.3 +++ vnc-reflector.spec 9 Feb 2007 16:58:51 -0000 1.4 @@ -1,13 +1,11 @@ -# $Id$ - Name: vnc-reflector Version: 1.2.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A specialized, multiplexing vnc proxy server Group: Applications/Internet License: BSD -URL: http://sourceforge.net/projects/vnc-reflector/ +URL: http://sourceforge.net/projects/vnc-reflector Source0: http://dl.sf.net/vnc-reflector/vnc_reflector-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -23,14 +21,14 @@ %build -make %{?_smp_mflags} +make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -I." %install rm -rf %{buildroot} # no install target in the makefile.... -%{__mkdir_p} %{buildroot}%{_bindir} +mkdir -p %{buildroot}%{_bindir} cp vncreflector %{buildroot}%{_bindir} @@ -45,6 +43,9 @@ %changelog +* Fri Feb 09 2007 Chris Weyl 1.2.4-3 +- apply debuginfo fixes from BZ#225107 + * Thu Aug 31 2006 Chris Weyl 1.2.4-2 - bump for mass rebuild From fedora-extras-commits at redhat.com Fri Feb 9 17:14:13 2007 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Fri, 9 Feb 2007 12:14:13 -0500 Subject: rpms/gutenprint/devel gutenprint.spec,1.9,1.10 Message-ID: <200702091714.l19HEDlb017825@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/extras/rpms/gutenprint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17808 Modified Files: gutenprint.spec Log Message: * Fri Feb 9 2007 Tim Waugh 5.0.0-5 - More obsoletes/provides for gimp-print sub-packages. Index: gutenprint.spec =================================================================== RCS file: /cvs/extras/rpms/gutenprint/devel/gutenprint.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gutenprint.spec 19 Jan 2007 18:13:28 -0000 1.9 +++ gutenprint.spec 9 Feb 2007 17:13:41 -0000 1.10 @@ -4,7 +4,7 @@ Name: gutenprint Summary: Printer Drivers Package Version: 5.0.0 -Release: 4%{?dist} +Release: 5%{?dist} Group: System Environment/Base URL: http://gimp-print.sourceforge.net/ Source0: http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2 @@ -18,8 +18,8 @@ BuildRequires: ghostscript-devel %endif BuildRequires: gimp -#Obsoletes: gimp-print,gimp-print-cups,gimp-print-devel,gimp-print-plugin,gimp-print-utils -#Provides: gimp-print,gimp-print-cups,gimp-print-devel,gimp-print-plugin,gimp-print-utils +Obsoletes: gimp-print <= 4.2.7-25 +Provides: gimp-print = 4.2.7-25 Obsoletes: gimp-print-utils <= 4.2.7-25 Provides: gimp-print-utils = 4.2.7-25 @@ -38,6 +38,8 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: gtk2-devel +Obsoletes: gimp-print-devel <= 4.2.7-25 +Provides: gimp-print-devel = 4.2.7-25 %description devel This package contains headers and libraries required to build applications that @@ -398,6 +400,9 @@ /bin/rm -f /var/cache/foomatic/* %changelog +* Fri Feb 9 2007 Tim Waugh 5.0.0-5 +- More obsoletes/provides for gimp-print sub-packages. + * Fri Jan 19 2007 Tim Waugh 5.0.0-4 - Disable libgutenprintui (GTK+ 1.2 library). Build requires gtk2-devel, not gtk+-devel. From fedora-extras-commits at redhat.com Fri Feb 9 17:17:39 2007 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Fri, 9 Feb 2007 12:17:39 -0500 Subject: rpms/dnsmasq/FC-6 dnsmasq.spec,1.14,1.15 sources,1.7,1.8 Message-ID: <200702091717.l19HHdrh017901@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17882 Modified Files: dnsmasq.spec sources Log Message: * Tue Feb 06 2007 Patrick "Jima" Laughton 2.37-1 - New upstream version (minor bugfixes, features) Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-6/dnsmasq.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- dnsmasq.spec 6 Nov 2006 18:25:32 -0000 1.14 +++ dnsmasq.spec 9 Feb 2007 17:17:07 -0000 1.15 @@ -1,6 +1,6 @@ Name: dnsmasq -Version: 2.35 -Release: 2%{?dist} +Version: 2.37 +Release: 1%{?dist} Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -92,6 +92,12 @@ %changelog +* Tue Feb 06 2007 Patrick "Jima" Laughton 2.37-1 +- New upstream version + +* Wed Jan 24 2007 Patrick "Jima" Laughton 2.36-1 +- New upstream version + * Mon Nov 06 2006 Patrick "Jima" Laughton 2.35-2 - Stop creating /etc/sysconfig on %%install - Create /etc/dnsmasq.d on %%install Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-6/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 6 Nov 2006 18:25:32 -0000 1.7 +++ sources 9 Feb 2007 17:17:07 -0000 1.8 @@ -1 +1 @@ -57b8643dc394cf2fbd1bced64536c6df dnsmasq-2.35.tar.gz +e105a41cdf5adb8b615f0a06eb17ecb9 dnsmasq-2.37.tar.gz From fedora-extras-commits at redhat.com Fri Feb 9 17:21:05 2007 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Fri, 9 Feb 2007 12:21:05 -0500 Subject: rpms/dnsmasq/FC-5 dnsmasq.spec,1.9,1.10 sources,1.7,1.8 Message-ID: <200702091721.l19HL53R017985@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17961 Modified Files: dnsmasq.spec sources Log Message: * Tue Feb 06 2007 Patrick "Jima" Laughton 2.37-1 - New upstream version (minor bugfixes, features) Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-5/dnsmasq.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- dnsmasq.spec 6 Nov 2006 18:59:20 -0000 1.9 +++ dnsmasq.spec 9 Feb 2007 17:20:33 -0000 1.10 @@ -1,6 +1,6 @@ Name: dnsmasq -Version: 2.35 -Release: 2%{?dist} +Version: 2.37 +Release: 1%{?dist} Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -92,6 +92,12 @@ %changelog +* Tue Feb 06 2007 Patrick "Jima" Laughton 2.37-1 +- New upstream version + +* Wed Jan 24 2007 Patrick "Jima" Laughton 2.36-1 +- New upstream version + * Mon Nov 06 2006 Patrick "Jima" Laughton 2.35-2 - Stop creating /etc/sysconfig on %%install - Create /etc/dnsmasq.d on %%install Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 6 Nov 2006 18:59:20 -0000 1.7 +++ sources 9 Feb 2007 17:20:33 -0000 1.8 @@ -1 +1 @@ -57b8643dc394cf2fbd1bced64536c6df dnsmasq-2.35.tar.gz +e105a41cdf5adb8b615f0a06eb17ecb9 dnsmasq-2.37.tar.gz From fedora-extras-commits at redhat.com Fri Feb 9 18:26:52 2007 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 9 Feb 2007 13:26:52 -0500 Subject: rpms/environment-modules/devel .cvsignore, 1.5, 1.6 environment-modules.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200702091826.l19IQqL0021774@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/environment-modules/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21748 Modified Files: .cvsignore environment-modules.spec sources Log Message: Update to 3.2.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/environment-modules/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 2 Jun 2006 21:59:04 -0000 1.5 +++ .cvsignore 9 Feb 2007 18:26:20 -0000 1.6 @@ -1 +1 @@ -modules-3.2.3.tar.bz2 +modules-3.2.4.tar.bz2 Index: environment-modules.spec =================================================================== RCS file: /cvs/extras/rpms/environment-modules/devel/environment-modules.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- environment-modules.spec 20 Dec 2006 15:32:27 -0000 1.6 +++ environment-modules.spec 9 Feb 2007 18:26:20 -0000 1.7 @@ -1,6 +1,6 @@ Name: environment-modules -Version: 3.2.3 -Release: 3%{?dist} +Version: 3.2.4 +Release: 1%{?dist} Summary: Provides dynamic modification of a user's environment Group: System Environment/Base @@ -67,6 +67,9 @@ %changelog +* Fri Feb 09 2007 - Orion Poplawski - 3.2.4-1 +- Update to 3.2.4 + * Wed Dec 20 2006 - Orion Poplawski - 3.2.3-3 - Add --with-version-path to set VERSIONPATH (bug 220260) Index: sources =================================================================== RCS file: /cvs/extras/rpms/environment-modules/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 2 Jun 2006 21:59:04 -0000 1.5 +++ sources 9 Feb 2007 18:26:20 -0000 1.6 @@ -1 +1 @@ -314db139bd4f2c3662468f3a3fd1e376 modules-3.2.3.tar.bz2 +16e20976195f688380d83bce3c6e6783 modules-3.2.4.tar.bz2 From fedora-extras-commits at redhat.com Fri Feb 9 18:32:01 2007 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 9 Feb 2007 13:32:01 -0500 Subject: rpms/ncarg/FC-6 ncarg.spec,1.11,1.12 Message-ID: <200702091832.l19IW1D9021900@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/ncarg/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21868/FC-6 Modified Files: ncarg.spec Log Message: Don't modify SOURCE files directly Index: ncarg.spec =================================================================== RCS file: /cvs/extras/rpms/ncarg/FC-6/ncarg.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ncarg.spec 26 Jan 2007 19:14:57 -0000 1.11 +++ ncarg.spec 9 Feb 2007 18:31:28 -0000 1.12 @@ -1,6 +1,6 @@ Name: ncarg Version: 4.4.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A Fortran and C based software package for scientific visualization Group: Development/Libraries License: GPL @@ -38,7 +38,8 @@ %patch4 -p 1 -b .deps cp %{SOURCE1} config #Fix up the lib install dir -sed -i -e s,/LIB/,/%{_lib}/, config/Site.local %{SOURCE2} %{SOURCE3} +cp %{SOURCE2} %{SOURCE3} . +sed -i -e s,/LIB/,/%{_lib}/, config/Site.local ncarg.csh ncarg.sh %build @@ -51,7 +52,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d -install %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d +install ncarg.csh ncarg.sh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d # Don't conflict with allegro-devel (generic API names) for manpage in $RPM_BUILD_ROOT%{_mandir}/man3/* do @@ -139,6 +140,9 @@ %changelog +* Fri Feb 09 2007 - Orion Poplawski - 4.4.1-8 +- Don't modify SOURCE files directly + * Fri Jan 26 2007 - Orion Poplawski - 4.4.1-7 - Bump release to try to get fixed version out for bug #223420 From fedora-extras-commits at redhat.com Fri Feb 9 18:32:03 2007 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 9 Feb 2007 13:32:03 -0500 Subject: rpms/ncarg/devel ncarg.spec,1.9,1.10 Message-ID: <200702091832.l19IW3gw021903@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/ncarg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21868/devel Modified Files: ncarg.spec Log Message: Don't modify SOURCE files directly Index: ncarg.spec =================================================================== RCS file: /cvs/extras/rpms/ncarg/devel/ncarg.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ncarg.spec 29 Jan 2007 18:37:25 -0000 1.9 +++ ncarg.spec 9 Feb 2007 18:31:31 -0000 1.10 @@ -1,6 +1,6 @@ Name: ncarg Version: 4.4.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A Fortran and C based software package for scientific visualization Group: Development/Libraries License: GPL @@ -38,7 +38,8 @@ %patch4 -p 1 -b .deps cp %{SOURCE1} config #Fix up the lib install dir -sed -i -e s,/LIB/,/%{_lib}/, config/Site.local %{SOURCE2} %{SOURCE3} +cp %{SOURCE2} %{SOURCE3} . +sed -i -e s,/LIB/,/%{_lib}/, config/Site.local ncarg.csh ncarg.sh %build @@ -51,7 +52,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d -install %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d +install ncarg.csh ncarg.sh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d # Don't conflict with allegro-devel (generic API names) for manpage in $RPM_BUILD_ROOT%{_mandir}/man3/* do @@ -139,6 +140,9 @@ %changelog +* Fri Feb 09 2007 - Orion Poplawski - 4.4.1-8 +- Don't modify SOURCE files directly + * Mon Jan 29 2007 - Orion Poplawski - 4.4.1-7 - Bump release From fedora-extras-commits at redhat.com Fri Feb 9 18:45:37 2007 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 9 Feb 2007 13:45:37 -0500 Subject: rpms/php-Smarty/devel .cvsignore, 1.3, 1.4 php-Smarty.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200702091845.l19IjbEc022167@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/php-Smarty/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22137 Modified Files: .cvsignore php-Smarty.spec sources Log Message: - Update to 2.6.16 - Install in /usr/share/php/Smarty - Update php version requirement Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-Smarty/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 16 May 2006 19:31:25 -0000 1.3 +++ .cvsignore 9 Feb 2007 18:45:04 -0000 1.4 @@ -1 +1 @@ -Smarty-2.6.13.tar.gz +Smarty-2.6.16.tar.gz Index: php-Smarty.spec =================================================================== RCS file: /cvs/extras/rpms/php-Smarty/devel/php-Smarty.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- php-Smarty.spec 16 May 2006 19:31:25 -0000 1.2 +++ php-Smarty.spec 9 Feb 2007 18:45:04 -0000 1.3 @@ -1,6 +1,6 @@ Name: php-Smarty Summary: Template/Presentation Framework for PHP -Version: 2.6.13 +Version: 2.6.16 Release: 1%{?dist} Source0: http://smarty.php.net/distributions/Smarty-%{version}.tar.gz @@ -9,7 +9,7 @@ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: php >= 4.0.6 +Requires: php >= 5.2.0-9 %description Although Smarty is known as a "Template Engine", it would be more accurately @@ -32,8 +32,8 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{_datadir}/Smarty -cp -a libs/* $RPM_BUILD_ROOT%{_datadir}/Smarty/ +install -d $RPM_BUILD_ROOT%{_datadir}/php/Smarty +cp -a libs/* $RPM_BUILD_ROOT%{_datadir}/php/Smarty/ install -d $RPM_BUILD_ROOT%{_var}/www/icons install -m644 misc/smarty_icon.gif $RPM_BUILD_ROOT%{_var}/www/icons/ @@ -46,11 +46,16 @@ %files %defattr(-,root,root) %doc BUGS ChangeLog COPYING.lib demo FAQ NEWS QUICK_START README RELEASE_NOTES TODO -%{_datadir}/Smarty/ +%{_datadir}/php/Smarty/ %{_var}/www/icons/* %changelog +* Fri Feb 09 2007 Orion Poplawski 2.6.16-1 +- Update to 2.6.16 +- Install in /usr/share/php/Smarty +- Update php version requirement + * Tue May 16 2006 Orion Poplawski 2.6.13-1 - Update to 2.6.13 Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-Smarty/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 16 May 2006 19:31:25 -0000 1.3 +++ sources 9 Feb 2007 18:45:04 -0000 1.4 @@ -1 +1 @@ -2ca9bf476cf0920b9d4fee69633f6f65 Smarty-2.6.13.tar.gz +da67591f19b69a932c1cab7df5b0303a Smarty-2.6.16.tar.gz From fedora-extras-commits at redhat.com Fri Feb 9 18:52:19 2007 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 9 Feb 2007 13:52:19 -0500 Subject: rpms/environment-modules/FC-5 environment-modules.spec,1.5,1.6 Message-ID: <200702091852.l19IqJff022349@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/environment-modules/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22305/FC-5 Modified Files: environment-modules.spec Log Message: Update to 3.2.4 Index: environment-modules.spec =================================================================== RCS file: /cvs/extras/rpms/environment-modules/FC-5/environment-modules.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- environment-modules.spec 20 Dec 2006 15:43:57 -0000 1.5 +++ environment-modules.spec 9 Feb 2007 18:51:47 -0000 1.6 @@ -1,6 +1,6 @@ Name: environment-modules -Version: 3.2.3 -Release: 2%{?dist} +Version: 3.2.4 +Release: 1%{?dist} Summary: Provides dynamic modification of a user's environment Group: System Environment/Base @@ -67,6 +67,9 @@ %changelog +* Fri Feb 09 2007 - Orion Poplawski - 3.2.4-1 +- Update to 3.2.4 + * Wed Dec 20 2006 - Orion Poplawski - 3.2.3-3 - Add --with-version-path to set VERSIONPATH (bug 220260) From fedora-extras-commits at redhat.com Fri Feb 9 18:52:22 2007 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 9 Feb 2007 13:52:22 -0500 Subject: rpms/environment-modules/FC-6 environment-modules.spec,1.6,1.7 Message-ID: <200702091852.l19IqM4K022352@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/environment-modules/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22305/FC-6 Modified Files: environment-modules.spec Log Message: Update to 3.2.4 Index: environment-modules.spec =================================================================== RCS file: /cvs/extras/rpms/environment-modules/FC-6/environment-modules.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- environment-modules.spec 20 Dec 2006 15:43:57 -0000 1.6 +++ environment-modules.spec 9 Feb 2007 18:51:49 -0000 1.7 @@ -1,6 +1,6 @@ Name: environment-modules -Version: 3.2.3 -Release: 3%{?dist} +Version: 3.2.4 +Release: 1%{?dist} Summary: Provides dynamic modification of a user's environment Group: System Environment/Base @@ -67,6 +67,9 @@ %changelog +* Fri Feb 09 2007 - Orion Poplawski - 3.2.4-1 +- Update to 3.2.4 + * Wed Dec 20 2006 - Orion Poplawski - 3.2.3-3 - Add --with-version-path to set VERSIONPATH (bug 220260) From fedora-extras-commits at redhat.com Fri Feb 9 18:54:06 2007 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 9 Feb 2007 13:54:06 -0500 Subject: rpms/environment-modules/FC-5 .cvsignore,1.5,1.6 sources,1.5,1.6 Message-ID: <200702091854.l19Is6jc022496@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/environment-modules/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22459/FC-5 Modified Files: .cvsignore sources Log Message: Update to 3.2.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/environment-modules/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 2 Jun 2006 22:00:37 -0000 1.5 +++ .cvsignore 9 Feb 2007 18:53:34 -0000 1.6 @@ -1 +1 @@ -modules-3.2.3.tar.bz2 +modules-3.2.4.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/environment-modules/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 2 Jun 2006 22:00:37 -0000 1.5 +++ sources 9 Feb 2007 18:53:34 -0000 1.6 @@ -1 +1 @@ -314db139bd4f2c3662468f3a3fd1e376 modules-3.2.3.tar.bz2 +16e20976195f688380d83bce3c6e6783 modules-3.2.4.tar.bz2 From fedora-extras-commits at redhat.com Fri Feb 9 18:54:09 2007 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 9 Feb 2007 13:54:09 -0500 Subject: rpms/environment-modules/FC-6 .cvsignore,1.5,1.6 sources,1.5,1.6 Message-ID: <200702091854.l19Is9Na022500@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/environment-modules/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22459/FC-6 Modified Files: .cvsignore sources Log Message: Update to 3.2.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/environment-modules/FC-6/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 2 Jun 2006 21:59:04 -0000 1.5 +++ .cvsignore 9 Feb 2007 18:53:36 -0000 1.6 @@ -1 +1 @@ -modules-3.2.3.tar.bz2 +modules-3.2.4.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/environment-modules/FC-6/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 2 Jun 2006 21:59:04 -0000 1.5 +++ sources 9 Feb 2007 18:53:36 -0000 1.6 @@ -1 +1 @@ -314db139bd4f2c3662468f3a3fd1e376 modules-3.2.3.tar.bz2 +16e20976195f688380d83bce3c6e6783 modules-3.2.4.tar.bz2 From fedora-extras-commits at redhat.com Fri Feb 9 19:23:45 2007 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 9 Feb 2007 14:23:45 -0500 Subject: extras-buildsys/utils/pushscript BlackList.py, NONE, 1.1 Utils.py, 1.9, 1.10 Push.py, 1.28, 1.29 Message-ID: <200702091923.l19JNjWp026143@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils/pushscript In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26077 Modified Files: Utils.py Push.py Added Files: BlackList.py Log Message: - Push.py : move mark_pkg_pushed() to Utils.py for reuse - Utils.py : add mark_pkg* and unmark_pkg* functions - BlackList.py : add rudimentary blacklist support --- NEW FILE BlackList.py --- #!/usr/bin/python -t # -*- mode: Python; indent-tabs-mode: nil; -*- # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA import Utils def get_filtered_build_results(cfg,dist,results): # Blacklist file contains one src.rpm %{name} per line. blacklist = [] blname = cfg.project+'-'+dist+'-blacklist.txt' # e.g. extras-6-blacklist.txt try: f = open(blname,'r') blacklist = f.read().splitlines() f.close() except IOError, (err, strerr): print 'WARNING: %s: %s' % (strerr,blname) pass newresults = [] for (name,pkgrelroots) in results: if name in blacklist: for pkgrelroot in pkgrelroots: Utils.mark_pkg_excluded(pkgrelroot) continue newresults.append((name,pkgrelroots)) return newresults Index: Utils.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Utils.py,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Utils.py 12 Dec 2006 10:58:24 -0000 1.9 +++ Utils.py 9 Feb 2007 19:23:42 -0000 1.10 @@ -274,3 +274,49 @@ shutil.rmtree(tmpdir) +def mark_pkg(pkgrelroot,flag): + fname = os.path.join(pkgrelroot,flag) + if os.path.isfile(fname): + return + if DEBUG: + print 'Creating %s' % fname + return + try: + f = open(fname,'w') + f.close() + except IOError, (err, strerr): + print 'ERROR: %s: %s' % (strerr,fname) + raise IOError, (err, strerr) + + +def unmark_pkg(pkgrelroot,flag): + fname = os.path.join(pkgrelroot,flag) + if not os.path.isfile(fname): + return + if DEBUG: + print 'Deleting %s' % fname + return + os.remove(fname) + + +def mark_pkg_pushed(pkgrelroot): + """create a file named PUSHED in a package build-results root directory""" + mark_pkg(pkgrelroot,'PUSHED') + unmark_pkg_excluded(pkgrelroot) + + +def unmark_pkg_pushed(pkgrelroot): + """delete a file named PUSHED in a package build-results root directory""" + unmark_pkg(pkgrelroot,'PUSHED') + + +def mark_pkg_excluded(pkgrelroot): + """create a file named EXCLUDED in a package build-results root directory""" + mark_pkg(pkgrelroot,'EXCLUDED') + + +def unmark_pkg_excluded(pkgrelroot): + """delete a file named EXCLUDED in a package build-results root directory""" + unmark_pkg(pkgrelroot,'EXCLUDED') + + Index: Push.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- Push.py 8 Feb 2007 18:45:36 -0000 1.28 +++ Push.py 9 Feb 2007 19:23:42 -0000 1.29 @@ -24,7 +24,7 @@ import tempfile import time -import Utils, MultiLib, Comps, WhatsNew +import Utils, MultiLib, Comps, WhatsNew, BlackList import RepoBuild, RepoPrune, RepoView from LockFile import LockFile, LockFileLocked @@ -113,22 +113,6 @@ return rv -def mark_pkg_pushed(pkgrelroot): - """create a file named PUSHED in a package build-results root directory""" - fname = os.path.join(pkgrelroot,'PUSHED') - if os.path.isfile(fname): - return - if DEBUG: - print 'Creating %s' % fname - return - try: - f = open(fname,'w') - f.close() - except IOError, (err, strerr): - print 'ERROR: %s: %s' % (strerr,fname) - raise IOError, (err, strerr) - - def prune_needsign_tree(needsignroot): for (name,pkgrelroots) in get_build_results(needsignroot): validbuilds = pkgrelroots @@ -151,8 +135,7 @@ break if changed: print 'New packages in PUSHED %s, clearing flag' % pkgrelroot - if not DEBUG: - os.remove(flagname) + Utils.unmark_pkg_pushed(pkrelroot) continue if ( time.time()-mtime > 3600*48 ): print 'Removing old %s' % pkgrelroot @@ -199,10 +182,10 @@ # 1 means: e,v,r is higher than nexte,nextv,nextr if rpmUtils.miscutils.compareEVR((e,v,r),(nexte,nextv,nextr)) == 1: Utils.debugprint('Ignoring: %s' % nextrelroot) - mark_pkg_pushed(nextrelroot) + Utils.mark_pkg_pushed(nextrelroot) else: Utils.debugprint('Ignoring: %s' % relroot) - mark_pkg_pushed(relroot) + Utils.mark_pkg_pushed(relroot) # Make this the next newest package for ongoing comparison. relroot = nextrelroot (n,a,e,v,r) = (nextn,nexta,nexte,nextv,nextr) @@ -326,7 +309,7 @@ # if it is a debuginfo package, move it into the 'debug' dir for that arch if len(filedict['srpm']) != 1: - mark_pkg_pushed( os.path.join(needsignroot,name,os.path.basename(pkgrelroot)) ) + Utils.mark_pkg_pushed( os.path.join(needsignroot,name,os.path.basename(pkgrelroot)) ) buildreportinfo = '%s-%s : INVALID build results, not published! INV\n' % (name,os.path.basename(pkgrelroot)) if buildreport: rundirfile.write(buildreportinfo) @@ -347,7 +330,7 @@ else: buildreportinfo = '%s-%s-%s NEW\n' % (n,v,r) else: # src.rpm published before, exclude entire build job - mark_pkg_pushed( os.path.join(needsignroot,name,os.path.basename(pkgrelroot)) ) + Utils.mark_pkg_pushed( os.path.join(needsignroot,name,os.path.basename(pkgrelroot)) ) buildreportinfo = '%s-%s : INVALID rebuild, not published! INV\n' % (name,os.path.basename(pkgrelroot)) if buildreport: rundirfile.write(buildreportinfo) @@ -395,7 +378,7 @@ Utils.install_move(package,destloc) # Mark successfully signed packages as PUSHED. - mark_pkg_pushed( os.path.join(needsignroot,name,os.path.basename(pkgrelroot)) ) + Utils.mark_pkg_pushed( os.path.join(needsignroot,name,os.path.basename(pkgrelroot)) ) rollback = [] if buildreport: rundirfile.write(buildreportinfo) @@ -439,7 +422,7 @@ prune_needsign_tree(needsignroot) results = get_build_results(needsignroot,droppushed=True) - # TODO: room for black-list checks. + results = BlackList.get_filtered_build_results(cfg,dist,results) print 'Package directories found: %d' % len(results) if len(results) == 0: return 0, changed @@ -658,7 +641,6 @@ RepoPrune.main(cfg,dist) RepoBuild.main(cfg,dist) - # TODO: multilib resolver hook MultiLib.main(cfg,changed) if changed: From fedora-extras-commits at redhat.com Fri Feb 9 19:33:38 2007 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 9 Feb 2007 14:33:38 -0500 Subject: extras-buildsys/utils/pushscript BlackList.py,1.1,1.2 Message-ID: <200702091933.l19JXciV026281@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils/pushscript In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26264 Modified Files: BlackList.py Log Message: locate blacklist files in pushscript home dir Index: BlackList.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/BlackList.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- BlackList.py 9 Feb 2007 19:23:42 -0000 1.1 +++ BlackList.py 9 Feb 2007 19:33:36 -0000 1.2 @@ -15,12 +15,13 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +import os, sys import Utils def get_filtered_build_results(cfg,dist,results): # Blacklist file contains one src.rpm %{name} per line. blacklist = [] - blname = cfg.project+'-'+dist+'-blacklist.txt' # e.g. extras-6-blacklist.txt + blname = os.path.join(sys.path[0],cfg.project+'-'+dist+'-blacklist.txt') # e.g. extras-6-blacklist.txt try: f = open(blname,'r') blacklist = f.read().splitlines() From fedora-extras-commits at redhat.com Fri Feb 9 19:48:06 2007 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Fri, 9 Feb 2007 14:48:06 -0500 Subject: rpms/dnsmasq/EL-5 dnsmasq.spec,1.15,1.16 sources,1.7,1.8 Message-ID: <200702091948.l19Jm6vf026379@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26354 Modified Files: dnsmasq.spec sources Log Message: * Tue Feb 06 2007 Patrick "Jima" Laughton 2.37-1 - New upstream version (minor bugfixes, features) Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/EL-5/dnsmasq.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- dnsmasq.spec 6 Nov 2006 18:08:15 -0000 1.15 +++ dnsmasq.spec 9 Feb 2007 19:47:34 -0000 1.16 @@ -1,6 +1,6 @@ Name: dnsmasq -Version: 2.35 -Release: 2%{?dist} +Version: 2.37 +Release: 1%{?dist} Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -92,6 +92,12 @@ %changelog +* Tue Feb 06 2007 Patrick "Jima" Laughton 2.37-1 +- New upstream version + +* Wed Jan 24 2007 Patrick "Jima" Laughton 2.36-1 +- New upstream version + * Mon Nov 06 2006 Patrick "Jima" Laughton 2.35-2 - Stop creating /etc/sysconfig on %%install - Create /etc/dnsmasq.d on %%install Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/EL-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 6 Nov 2006 17:58:49 -0000 1.7 +++ sources 9 Feb 2007 19:47:34 -0000 1.8 @@ -1 +1 @@ -57b8643dc394cf2fbd1bced64536c6df dnsmasq-2.35.tar.gz +e105a41cdf5adb8b615f0a06eb17ecb9 dnsmasq-2.37.tar.gz From fedora-extras-commits at redhat.com Fri Feb 9 21:09:16 2007 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 9 Feb 2007 16:09:16 -0500 Subject: fedora-security/audit fe5,1.151,1.152 fe6,1.65,1.66 Message-ID: <200702092109.l19L9GPh001049@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1030 Modified Files: fe5 fe6 Log Message: +CVE-2007-0160 VULNERABLE (centericq) #227791 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.151 retrieving revision 1.152 diff -u -r1.151 -r1.152 --- fe5 4 Feb 2007 13:20:53 -0000 1.151 +++ fe5 9 Feb 2007 21:09:14 -0000 1.152 @@ -17,6 +17,7 @@ CVE-2007-0341 ignore (phpMyAdmin, 2.8.x only) CVE-2007-0262 version (wordpress, fixed 2.1-0) #223101 CVE-2007-0177 version (mediawiki, fixed 1.8.3) #221958 +CVE-2007-0160 VULNERABLE (centericq) #227791 CVE-2007-0109 version (wordpress, fixed 2.1-0) #223101 CVE-2007-0107 version (wordpress, fixed 2.1-0) #223101 CVE-2007-0106 version (wordpress, fixed 2.1-0) #223101 Index: fe6 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe6,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- fe6 4 Feb 2007 13:20:53 -0000 1.65 +++ fe6 9 Feb 2007 21:09:14 -0000 1.66 @@ -17,6 +17,7 @@ CVE-2007-0341 ignore (phpMyAdmin, 2.8.x only) CVE-2007-0262 version (wordpress, fixed 2.1-0) #223101 CVE-2007-0177 version (mediawiki, fixed 1.8.3) #221958 +CVE-2007-0160 VULNERABLE (centericq) #227791 CVE-2007-0109 version (wordpress, fixed 2.1-0) #223101 CVE-2007-0107 version (wordpress, fixed 2.1-0) #223101 CVE-2007-0106 version (wordpress, fixed 2.1-0) #223101 From fedora-extras-commits at redhat.com Fri Feb 9 21:12:29 2007 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 9 Feb 2007 16:12:29 -0500 Subject: fedora-security/audit fe5,1.152,1.153 fe6,1.66,1.67 Message-ID: <200702092112.l19LCTUM001103@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1084 Modified Files: fe5 fe6 Log Message: CVE-2006-6563 (proftpd) done Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.152 retrieving revision 1.153 diff -u -r1.152 -r1.153 --- fe5 9 Feb 2007 21:09:14 -0000 1.152 +++ fe5 9 Feb 2007 21:12:27 -0000 1.153 @@ -34,7 +34,7 @@ CVE-2006-6610 version (nexuiz, fixed 2.2.1) #220034 CVE-2006-6609 version (nexuiz, fixed 2.2.1) #220034 CVE-2006-6574 backport (mantis, fixed 1.0.6-2) #219937 -CVE-2006-6563 VULNERABLE (proftpd, fixed 1.3.1rc1) #219938 +CVE-2006-6563 backport (proftpd, fixed 1.3.0a-3) #219938 CVE-2006-6515 version (mantis, fixed 1.0.6) #219720 CVE-2006-6505 version (seamonkey, fixed 1.0.7) #220516 CVE-2006-6504 version (seamonkey, fixed 1.0.7) #220516 Index: fe6 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe6,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- fe6 9 Feb 2007 21:09:14 -0000 1.66 +++ fe6 9 Feb 2007 21:12:27 -0000 1.67 @@ -34,7 +34,7 @@ CVE-2006-6610 version (nexuiz, fixed 2.2.1) #220034 CVE-2006-6609 version (nexuiz, fixed 2.2.1) #220034 CVE-2006-6574 backport (mantis, fixed 1.0.6-2) #219937 -CVE-2006-6563 VULNERABLE (proftpd, fixed 1.3.1rc1) #219938 +CVE-2006-6563 backport (proftpd, fixed 1.3.0a-3) #219938 CVE-2006-6515 version (mantis, fixed 1.0.6) #219720 CVE-2006-6505 version (seamonkey, fixed 1.0.7) #220516 CVE-2006-6504 version (seamonkey, fixed 1.0.7) #220516 From fedora-extras-commits at redhat.com Fri Feb 9 21:40:30 2007 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 9 Feb 2007 16:40:30 -0500 Subject: rpms/plplot/devel plplot.spec,1.27,1.28 Message-ID: <200702092140.l19LeUqk001441@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1422 Modified Files: plplot.spec Log Message: Rebuild for Tcl 8.5 Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/devel/plplot.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- plplot.spec 23 Jan 2007 21:37:29 -0000 1.27 +++ plplot.spec 9 Feb 2007 21:39:58 -0000 1.28 @@ -3,7 +3,7 @@ Name: plplot Version: 5.7.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library of functions for making scientific plots Group: Applications/Engineering @@ -405,6 +405,9 @@ %changelog +* Fri Feb 09 2007 - Orion Poplawski - 5.7.2-2 +- Rebuild for Tcl 8.5 + * Tue Jan 23 2007 - Orion Poplawski - 5.7.2-1 - Update to 5.7.2 which uses cmake - Add patch to use -nopgcpp with swig java generation From fedora-extras-commits at redhat.com Fri Feb 9 21:50:10 2007 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 9 Feb 2007 16:50:10 -0500 Subject: rpms/python-matplotlib/devel .cvsignore, 1.14, 1.15 python-matplotlib.spec, 1.25, 1.26 sources, 1.14, 1.15 Message-ID: <200702092150.l19LoArb001728@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-matplotlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1689 Modified Files: .cvsignore python-matplotlib.spec sources Log Message: Update to 0.90.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 21 Nov 2006 15:36:32 -0000 1.14 +++ .cvsignore 9 Feb 2007 21:49:38 -0000 1.15 @@ -1 +1 @@ -matplotlib-0.87.7.tar.gz +matplotlib-0.90.0.tar.gz Index: python-matplotlib.spec =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/python-matplotlib.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- python-matplotlib.spec 10 Jan 2007 00:07:07 -0000 1.25 +++ python-matplotlib.spec 9 Feb 2007 21:49:38 -0000 1.26 @@ -1,8 +1,8 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-matplotlib -Version: 0.87.7 -Release: 4%{?dist} +Version: 0.90.0 +Release: 1%{?dist} Summary: Python plotting library Group: Development/Libraries @@ -75,6 +75,9 @@ %changelog +* Fri Feb 09 2007 Orion Poplawski 0.90.0-1 +- Update to 0.90.0 + * Tue Jan 5 2007 Orion Poplawski 0.87.7-4 - Add examples to %docs Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 21 Nov 2006 15:36:32 -0000 1.14 +++ sources 9 Feb 2007 21:49:38 -0000 1.15 @@ -1 +1 @@ -cca3d3a644c1a84d6dcf4af8a9856b7b matplotlib-0.87.7.tar.gz +31ea12395826080b5be9c1e292cda6f1 matplotlib-0.90.0.tar.gz From fedora-extras-commits at redhat.com Sat Feb 10 07:18:48 2007 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 10 Feb 2007 02:18:48 -0500 Subject: rpms/centericq/devel centericq-ijhook.patch, NONE, 1.1 centericq-libjab-segv.patch, NONE, 1.1 centericq.spec, 1.28, 1.29 Message-ID: <200702100718.l1A7Im1u016966@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/centericq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16891/devel Modified Files: centericq.spec Added Files: centericq-ijhook.patch centericq-libjab-segv.patch Log Message: - fix CVE-2007-160 (#227791) centericq-ijhook.patch: --- NEW FILE centericq-ijhook.patch --- --- centericq-4.21.0.old/src/hooks/ljhook.cc 2005-01-07 02:27:04.000000000 +0100 +++ centericq-4.21.0/src/hooks/ljhook.cc 2007-01-08 18:53:28.776790056 +0100 @@ -667,21 +667,21 @@ friendof.push_back(in->first); if(!foempty) { bd = (string) "http://" + conf.getourid(proto).server + "/users/" + in->first; - sprintf(buf, _("The user %s (%s) has added you to his/her friend list\n\nJournal address: %s"), + snprintf(buf, sizeof(buf), _("The user %s (%s) has added you to his/her friend list\n\nJournal address: %s"), in->first.c_str(), in->second.c_str(), bd.c_str()); em.store(imnotification(self, buf)); } } for(il = friendof.begin(); il != friendof.end(); ) { if(nfriendof.find(*il) == nfriendof.end()) { bd = (string) "http://" + conf.getourid(proto).server + "/users/" + *il; - sprintf(buf, _("The user %s has removed you from his/her friend list\n\nJournal address: %s"), + snprintf(buf, sizeof(buf), _("The user %s has removed you from his/her friend list\n\nJournal address: %s"), il->c_str(), bd.c_str()); em.store(imnotification(self, buf)); friendof.erase(il); il = friendof.begin(); } else { centericq-libjab-segv.patch: --- NEW FILE centericq-libjab-segv.patch --- --- centericq-4.21.0/libjabber-0.1/jconn.c 2007-01-16 07:55:04.023053568 +0100 +++ centericq-4.21.0.new/libjabber-0.1/jconn.c 2007-01-16 07:57:27.081305408 +0100 @@ -167,12 +167,15 @@ x = jutil_header(NS_CLIENT, j->user->server); t = xmlnode2str(x); /* this is ugly, we can create the string here instead of jutil_header */ /* what do you think about it? -madcat */ t2 = strstr(t,"/>"); + if (t2 != NULL) + { *t2++ = '>'; *t2 = '\0'; + } jab_send_raw(j,""); jab_send_raw(j,t); xmlnode_free(x); j->state = JCONN_STATE_ON; --- centericq-4.21.0/libjabber-0.1/xstream.c 2002-11-19 15:26:34.000000000 +0100 +++ centericq-4.21.0.new/libjabber-0.1/xstream.c 2007-01-16 07:57:35.915962336 +0100 @@ -208,12 +208,15 @@ s = spool_new(xmlnode_pool(x)); spooler(s,"",xmlnode2str(x),s); head = spool_print(s); fixr = strstr(head,"/>"); + if (fixr != NULL) + { *fixr = '>'; ++fixr; *fixr = '\0'; + } return head; } Index: centericq.spec =================================================================== RCS file: /cvs/extras/rpms/centericq/devel/centericq.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- centericq.spec 8 Jan 2007 19:53:02 -0000 1.28 +++ centericq.spec 10 Feb 2007 07:18:16 -0000 1.29 @@ -1,6 +1,6 @@ Name: centericq Version: 4.21.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Text mode menu- and window-driven IM @@ -21,6 +21,12 @@ # and see http://www.gentoo.org/security/en/glsa/glsa-200512-11.xml # and redhat bugzilla #176451 Patch6: centericq-4.21.0-kkstrtext.patch +# and more security +) +# CVE-2007-0160 +# http://mailman.linuxpl.org/pipermail/cicq/2007-January/004866.html +# see redhat bugzilla #227791 +Patch7: centericq-ijhook.patch +Patch8: centericq-libjab-segv.patch ## feature fixes # Fix libmsn @@ -59,6 +65,8 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 +%patch8 -p1 %patch100 -p1 %patch101 -p1 %patch102 -p1 @@ -99,6 +107,10 @@ %exclude %{_includedir}/msn %changelog +* Sat Feb 10 2007 Andreas Bierfert +4.21.0-11 +- fix CVE-2007-160 (#227791) + * Mon Jan 08 2007 Kevin Fenzi 4.21.0-10 - Tweak to build on fc7 and rebuild for new curl From fedora-extras-commits at redhat.com Sat Feb 10 07:18:43 2007 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 10 Feb 2007 02:18:43 -0500 Subject: rpms/centericq/FC-5 centericq-ijhook.patch, NONE, 1.1 centericq-libjab-segv.patch, NONE, 1.1 centericq.spec, 1.25, 1.26 Message-ID: <200702100718.l1A7Ih28016960@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/centericq/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16891/FC-5 Modified Files: centericq.spec Added Files: centericq-ijhook.patch centericq-libjab-segv.patch Log Message: - fix CVE-2007-160 (#227791) centericq-ijhook.patch: --- NEW FILE centericq-ijhook.patch --- --- centericq-4.21.0.old/src/hooks/ljhook.cc 2005-01-07 02:27:04.000000000 +0100 +++ centericq-4.21.0/src/hooks/ljhook.cc 2007-01-08 18:53:28.776790056 +0100 @@ -667,21 +667,21 @@ friendof.push_back(in->first); if(!foempty) { bd = (string) "http://" + conf.getourid(proto).server + "/users/" + in->first; - sprintf(buf, _("The user %s (%s) has added you to his/her friend list\n\nJournal address: %s"), + snprintf(buf, sizeof(buf), _("The user %s (%s) has added you to his/her friend list\n\nJournal address: %s"), in->first.c_str(), in->second.c_str(), bd.c_str()); em.store(imnotification(self, buf)); } } for(il = friendof.begin(); il != friendof.end(); ) { if(nfriendof.find(*il) == nfriendof.end()) { bd = (string) "http://" + conf.getourid(proto).server + "/users/" + *il; - sprintf(buf, _("The user %s has removed you from his/her friend list\n\nJournal address: %s"), + snprintf(buf, sizeof(buf), _("The user %s has removed you from his/her friend list\n\nJournal address: %s"), il->c_str(), bd.c_str()); em.store(imnotification(self, buf)); friendof.erase(il); il = friendof.begin(); } else { centericq-libjab-segv.patch: --- NEW FILE centericq-libjab-segv.patch --- --- centericq-4.21.0/libjabber-0.1/jconn.c 2007-01-16 07:55:04.023053568 +0100 +++ centericq-4.21.0.new/libjabber-0.1/jconn.c 2007-01-16 07:57:27.081305408 +0100 @@ -167,12 +167,15 @@ x = jutil_header(NS_CLIENT, j->user->server); t = xmlnode2str(x); /* this is ugly, we can create the string here instead of jutil_header */ /* what do you think about it? -madcat */ t2 = strstr(t,"/>"); + if (t2 != NULL) + { *t2++ = '>'; *t2 = '\0'; + } jab_send_raw(j,""); jab_send_raw(j,t); xmlnode_free(x); j->state = JCONN_STATE_ON; --- centericq-4.21.0/libjabber-0.1/xstream.c 2002-11-19 15:26:34.000000000 +0100 +++ centericq-4.21.0.new/libjabber-0.1/xstream.c 2007-01-16 07:57:35.915962336 +0100 @@ -208,12 +208,15 @@ s = spool_new(xmlnode_pool(x)); spooler(s,"",xmlnode2str(x),s); head = spool_print(s); fixr = strstr(head,"/>"); + if (fixr != NULL) + { *fixr = '>'; ++fixr; *fixr = '\0'; + } return head; } Index: centericq.spec =================================================================== RCS file: /cvs/extras/rpms/centericq/FC-5/centericq.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- centericq.spec 11 Nov 2006 16:29:03 -0000 1.25 +++ centericq.spec 10 Feb 2007 07:18:10 -0000 1.26 @@ -1,6 +1,6 @@ Name: centericq Version: 4.21.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Text mode menu- and window-driven IM @@ -21,6 +21,12 @@ # and see http://www.gentoo.org/security/en/glsa/glsa-200512-11.xml # and redhat bugzilla #176451 Patch6: centericq-4.21.0-kkstrtext.patch +# and more security +) +# CVE-2007-0160 +# http://mailman.linuxpl.org/pipermail/cicq/2007-January/004866.html +# see redhat bugzilla #227791 +Patch7: centericq-ijhook.patch +Patch8: centericq-libjab-segv.patch ## feature fixes # Fix libmsn @@ -59,6 +65,8 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 +%patch8 -p1 %patch100 -p1 %patch101 -p1 %patch102 -p1 @@ -98,6 +106,10 @@ %exclude %{_includedir}/msn %changelog +* Sat Feb 10 2007 Andreas Bierfert +4.21.0-8 +- fix CVE-2007-160 (#227791) + * Thu Mar 02 2006 Andreas Bierfert 4.21.0-7 - fix #183623: ask before quit From fedora-extras-commits at redhat.com Sat Feb 10 07:18:46 2007 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 10 Feb 2007 02:18:46 -0500 Subject: rpms/centericq/FC-6 centericq-ijhook.patch, NONE, 1.1 centericq-libjab-segv.patch, NONE, 1.1 centericq.spec, 1.26, 1.27 Message-ID: <200702100718.l1A7Ik08016963@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/centericq/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16891/FC-6 Modified Files: centericq.spec Added Files: centericq-ijhook.patch centericq-libjab-segv.patch Log Message: - fix CVE-2007-160 (#227791) centericq-ijhook.patch: --- NEW FILE centericq-ijhook.patch --- --- centericq-4.21.0.old/src/hooks/ljhook.cc 2005-01-07 02:27:04.000000000 +0100 +++ centericq-4.21.0/src/hooks/ljhook.cc 2007-01-08 18:53:28.776790056 +0100 @@ -667,21 +667,21 @@ friendof.push_back(in->first); if(!foempty) { bd = (string) "http://" + conf.getourid(proto).server + "/users/" + in->first; - sprintf(buf, _("The user %s (%s) has added you to his/her friend list\n\nJournal address: %s"), + snprintf(buf, sizeof(buf), _("The user %s (%s) has added you to his/her friend list\n\nJournal address: %s"), in->first.c_str(), in->second.c_str(), bd.c_str()); em.store(imnotification(self, buf)); } } for(il = friendof.begin(); il != friendof.end(); ) { if(nfriendof.find(*il) == nfriendof.end()) { bd = (string) "http://" + conf.getourid(proto).server + "/users/" + *il; - sprintf(buf, _("The user %s has removed you from his/her friend list\n\nJournal address: %s"), + snprintf(buf, sizeof(buf), _("The user %s has removed you from his/her friend list\n\nJournal address: %s"), il->c_str(), bd.c_str()); em.store(imnotification(self, buf)); friendof.erase(il); il = friendof.begin(); } else { centericq-libjab-segv.patch: --- NEW FILE centericq-libjab-segv.patch --- --- centericq-4.21.0/libjabber-0.1/jconn.c 2007-01-16 07:55:04.023053568 +0100 +++ centericq-4.21.0.new/libjabber-0.1/jconn.c 2007-01-16 07:57:27.081305408 +0100 @@ -167,12 +167,15 @@ x = jutil_header(NS_CLIENT, j->user->server); t = xmlnode2str(x); /* this is ugly, we can create the string here instead of jutil_header */ /* what do you think about it? -madcat */ t2 = strstr(t,"/>"); + if (t2 != NULL) + { *t2++ = '>'; *t2 = '\0'; + } jab_send_raw(j,""); jab_send_raw(j,t); xmlnode_free(x); j->state = JCONN_STATE_ON; --- centericq-4.21.0/libjabber-0.1/xstream.c 2002-11-19 15:26:34.000000000 +0100 +++ centericq-4.21.0.new/libjabber-0.1/xstream.c 2007-01-16 07:57:35.915962336 +0100 @@ -208,12 +208,15 @@ s = spool_new(xmlnode_pool(x)); spooler(s,"",xmlnode2str(x),s); head = spool_print(s); fixr = strstr(head,"/>"); + if (fixr != NULL) + { *fixr = '>'; ++fixr; *fixr = '\0'; + } return head; } Index: centericq.spec =================================================================== RCS file: /cvs/extras/rpms/centericq/FC-6/centericq.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- centericq.spec 11 Nov 2006 16:29:04 -0000 1.26 +++ centericq.spec 10 Feb 2007 07:18:13 -0000 1.27 @@ -1,6 +1,6 @@ Name: centericq Version: 4.21.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Text mode menu- and window-driven IM @@ -21,6 +21,12 @@ # and see http://www.gentoo.org/security/en/glsa/glsa-200512-11.xml # and redhat bugzilla #176451 Patch6: centericq-4.21.0-kkstrtext.patch +# and more security +) +# CVE-2007-0160 +# http://mailman.linuxpl.org/pipermail/cicq/2007-January/004866.html +# see redhat bugzilla #227791 +Patch7: centericq-ijhook.patch +Patch8: centericq-libjab-segv.patch ## feature fixes # Fix libmsn @@ -59,6 +65,8 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 +%patch8 -p1 %patch100 -p1 %patch101 -p1 %patch102 -p1 @@ -98,6 +106,10 @@ %exclude %{_includedir}/msn %changelog +* Sat Feb 10 2007 Andreas Bierfert +4.21.0-9 +- fix CVE-2007-160 (#227791) + * Tue Sep 12 2006 Andreas Bierfert 4.21.0-8 - FE6 rebuild From fedora-extras-commits at redhat.com Sat Feb 10 08:41:48 2007 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 10 Feb 2007 03:41:48 -0500 Subject: fedora-security/audit fe5,1.153,1.154 fe6,1.67,1.68 Message-ID: <200702100841.l1A8fmPE021668@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21649 Modified Files: fe5 fe6 Log Message: CVE-2007-0160 (centericq) done Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.153 retrieving revision 1.154 diff -u -r1.153 -r1.154 --- fe5 9 Feb 2007 21:12:27 -0000 1.153 +++ fe5 10 Feb 2007 08:41:45 -0000 1.154 @@ -17,7 +17,7 @@ CVE-2007-0341 ignore (phpMyAdmin, 2.8.x only) CVE-2007-0262 version (wordpress, fixed 2.1-0) #223101 CVE-2007-0177 version (mediawiki, fixed 1.8.3) #221958 -CVE-2007-0160 VULNERABLE (centericq) #227791 +CVE-2007-0160 patch (centericq, fixed 4.21.0-8) #227791 CVE-2007-0109 version (wordpress, fixed 2.1-0) #223101 CVE-2007-0107 version (wordpress, fixed 2.1-0) #223101 CVE-2007-0106 version (wordpress, fixed 2.1-0) #223101 Index: fe6 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe6,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- fe6 9 Feb 2007 21:12:27 -0000 1.67 +++ fe6 10 Feb 2007 08:41:45 -0000 1.68 @@ -17,7 +17,7 @@ CVE-2007-0341 ignore (phpMyAdmin, 2.8.x only) CVE-2007-0262 version (wordpress, fixed 2.1-0) #223101 CVE-2007-0177 version (mediawiki, fixed 1.8.3) #221958 -CVE-2007-0160 VULNERABLE (centericq) #227791 +CVE-2007-0160 patch (centericq, fixed 4.21.0-9) #227791 CVE-2007-0109 version (wordpress, fixed 2.1-0) #223101 CVE-2007-0107 version (wordpress, fixed 2.1-0) #223101 CVE-2007-0106 version (wordpress, fixed 2.1-0) #223101 From fedora-extras-commits at redhat.com Sat Feb 10 09:01:11 2007 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 10 Feb 2007 04:01:11 -0500 Subject: fedora-security/audit fe5,1.154,1.155 fe6,1.68,1.69 Message-ID: <200702100901.l1A91B5W025147@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25128 Modified Files: fe5 fe6 Log Message: +CVE-2006-6979 (amarok), CVE-2007-0857 (moin) Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.154 retrieving revision 1.155 diff -u -r1.154 -r1.155 --- fe5 10 Feb 2007 08:41:45 -0000 1.154 +++ fe5 10 Feb 2007 09:01:09 -0000 1.155 @@ -2,6 +2,7 @@ ** are items that need attention +CVE-2007-0857 VULNERABLE (moin, fixed 1.5.7) #228139 CVE-2007-0657 ignore (nexuiz, 2.2.2 only (not shipped), fixed 2.2.3) CVE-2007-0619 version (chmlib, fixed 0.3.9) #225919 CVE-2007-0541 version (wordpress, fixed 2.1-0) #225469 @@ -22,6 +23,7 @@ CVE-2007-0107 version (wordpress, fixed 2.1-0) #223101 CVE-2007-0106 version (wordpress, fixed 2.1-0) #223101 CVE-2007-0095 VULNERABLE (phpMyAdmin) #221694 +CVE-2006-6979 ** (amarok) #228138 CVE-2006-6944 version (phpMyAdmin, fixed 2.9.1.1) CVE-2006-6943 version (phpMyAdmin, fixed 2.9.1.1) CVE-2006-6942 version (phpMyAdmin, fixed 2.9.1.1) Index: fe6 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe6,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- fe6 10 Feb 2007 08:41:45 -0000 1.68 +++ fe6 10 Feb 2007 09:01:09 -0000 1.69 @@ -2,6 +2,7 @@ ** are items that need attention +CVE-2007-0857 VULNERABLE (moin, fixed 1.5.7) #228139 CVE-2007-0657 ignore (nexuiz, 2.2.2 only (not shipped), fixed 2.2.3) CVE-2007-0619 version (chmlib, fixed 0.3.9) #225919 CVE-2007-0541 version (wordpress, fixed 2.1-0) #225469 @@ -22,6 +23,7 @@ CVE-2007-0107 version (wordpress, fixed 2.1-0) #223101 CVE-2007-0106 version (wordpress, fixed 2.1-0) #223101 CVE-2007-0095 VULNERABLE (phpMyAdmin) #221694 +CVE-2006-6979 ** (amarok) #228138 CVE-2006-6944 version (phpMyAdmin, fixed 2.9.1.1) CVE-2006-6943 version (phpMyAdmin, fixed 2.9.1.1) CVE-2006-6942 version (phpMyAdmin, fixed 2.9.1.1) From fedora-extras-commits at redhat.com Sat Feb 10 12:22:16 2007 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Sat, 10 Feb 2007 07:22:16 -0500 Subject: rpms/emacs-common-muse/FC-5 emacs-common-muse.spec,1.6,1.7 Message-ID: <200702101222.l1ACMGxn004324@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-common-muse/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4306 Modified Files: emacs-common-muse.spec Log Message: * Sat Feb 10 2007 Jonathan G. Underwood - 3.02.93-4 - Fix error in info file naming (BZ 227459) Index: emacs-common-muse.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-common-muse/FC-5/emacs-common-muse.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- emacs-common-muse.spec 7 Jan 2007 22:46:26 -0000 1.6 +++ emacs-common-muse.spec 10 Feb 2007 12:21:44 -0000 1.7 @@ -11,7 +11,7 @@ Name: emacs-common-muse Version: 3.02.93 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Emacs Muse is an authoring and publishing environment for Emacs Group: Applications/Editors License: GPL @@ -24,10 +24,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: emacs >= %{emacs_ver} -BuildRequires: texinfo +BuildRequires: texinfo-tex %if %{xemacs} BuildRequires: xemacs >= %{xemacs_ver} -BuildRequires: xemacs-sumo +BuildRequires: xemacs-packages-extra %endif %description @@ -146,18 +146,18 @@ rm -rf %{buildroot} %post -/sbin/install-info %{_infodir}/muse.info %{_infodir}/dir 2>/dev/null || : +/sbin/install-info %{_infodir}/muse %{_infodir}/dir 2>/dev/null || : %preun if [ $1 -eq 0 ]; then - /sbin/install-info --delete %{_infodir}/muse.info %{_infodir}/dir 2>/dev/null || : + /sbin/install-info --delete %{_infodir}/muse %{_infodir}/dir 2>/dev/null || : fi %files %defattr(-,root,root,-) %doc README NEWS AUTHORS ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 %doc examples muse.html contrib/pyblosxom scripts -%doc %{_infodir}/* +%doc %{_infodir}/muse.gz %files -n emacs-%{pkg} %defattr(-,root,root,-) @@ -194,17 +194,18 @@ %endif %changelog -* Sun Jan 7 2007 Jonathan G. Underwood - 3.02.93-3 -- Bump release +* Sat Feb 10 2007 Jonathan G. Underwood - 3.02.93-4 +- Fix error in info file naming (BZ 227459) -* Sun Jan 7 2007 Jonathan G. Underwood - 3.02.93-2 -- Fix directory ownership of {contrib,experimental} files +* Sun Jan 7 2007 Jonathan G. Underwood - 3.02.93-3 +- Fix directory ownership of contrib and experimental directories +- Release bump * Fri Dec 29 2006 Jonathan G. Underwood - 3.02.93-1 - Update to version 3.02.93 - Some spec file cleanups -- Update the BuildRequires to pull in xemacs-sumo -- Add BuildRequires texinfo so that the QuickStart.pdf file is built +- Update the BuildRequires to pull in xemacs-packages-extra +- Add BuildRequires texinfo-tex so that the QuickStart.pdf file is built - Add scripts directory to main package - Build autoload and contrib files for xemacs package From fedora-extras-commits at redhat.com Sat Feb 10 12:23:15 2007 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Sat, 10 Feb 2007 07:23:15 -0500 Subject: rpms/emacs-common-muse/FC-6 emacs-common-muse.spec,1.13,1.14 Message-ID: <200702101223.l1ACNFJh004397@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-common-muse/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4370 Modified Files: emacs-common-muse.spec Log Message: * Sat Feb 10 2007 Jonathan G. Underwood - 3.02.93-4 - Fix error in info file naming (BZ 227459) Index: emacs-common-muse.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-common-muse/FC-6/emacs-common-muse.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- emacs-common-muse.spec 7 Jan 2007 22:49:45 -0000 1.13 +++ emacs-common-muse.spec 10 Feb 2007 12:22:43 -0000 1.14 @@ -11,7 +11,7 @@ Name: emacs-common-muse Version: 3.02.93 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Emacs Muse is an authoring and publishing environment for Emacs Group: Applications/Editors License: GPL @@ -146,18 +146,18 @@ rm -rf %{buildroot} %post -/sbin/install-info %{_infodir}/muse.info %{_infodir}/dir 2>/dev/null || : +/sbin/install-info %{_infodir}/muse %{_infodir}/dir 2>/dev/null || : %preun if [ $1 -eq 0 ]; then - /sbin/install-info --delete %{_infodir}/muse.info %{_infodir}/dir 2>/dev/null || : + /sbin/install-info --delete %{_infodir}/muse %{_infodir}/dir 2>/dev/null || : fi %files %defattr(-,root,root,-) %doc README NEWS AUTHORS ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 %doc examples muse.html contrib/pyblosxom scripts -%doc %{_infodir}/* +%doc %{_infodir}/muse.gz %files -n emacs-%{pkg} %defattr(-,root,root,-) @@ -194,6 +194,9 @@ %endif %changelog +* Sat Feb 10 2007 Jonathan G. Underwood - 3.02.93-4 +- Fix error in info file naming (BZ 227459) + * Sun Jan 7 2007 Jonathan G. Underwood - 3.02.93-3 - Fix directory ownership of contrib and experimental directories - Release bump From fedora-extras-commits at redhat.com Sat Feb 10 12:24:11 2007 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Sat, 10 Feb 2007 07:24:11 -0500 Subject: rpms/emacs-common-muse/devel emacs-common-muse.spec,1.13,1.14 Message-ID: <200702101224.l1ACOBXE004460@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-common-muse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4443 Modified Files: emacs-common-muse.spec Log Message: * Sat Feb 10 2007 Jonathan G. Underwood - 3.02.93-4 - Fix error in info file naming (BZ 227459) Index: emacs-common-muse.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-common-muse/devel/emacs-common-muse.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- emacs-common-muse.spec 7 Jan 2007 22:52:32 -0000 1.13 +++ emacs-common-muse.spec 10 Feb 2007 12:23:39 -0000 1.14 @@ -11,7 +11,7 @@ Name: emacs-common-muse Version: 3.02.93 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Emacs Muse is an authoring and publishing environment for Emacs Group: Applications/Editors License: GPL @@ -146,18 +146,18 @@ rm -rf %{buildroot} %post -/sbin/install-info %{_infodir}/muse.info %{_infodir}/dir 2>/dev/null || : +/sbin/install-info %{_infodir}/muse %{_infodir}/dir 2>/dev/null || : %preun if [ $1 -eq 0 ]; then - /sbin/install-info --delete %{_infodir}/muse.info %{_infodir}/dir 2>/dev/null || : + /sbin/install-info --delete %{_infodir}/muse %{_infodir}/dir 2>/dev/null || : fi %files %defattr(-,root,root,-) %doc README NEWS AUTHORS ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 %doc examples muse.html contrib/pyblosxom scripts -%doc %{_infodir}/* +%doc %{_infodir}/muse.gz %files -n emacs-%{pkg} %defattr(-,root,root,-) @@ -194,6 +194,9 @@ %endif %changelog +* Sat Feb 10 2007 Jonathan G. Underwood - 3.02.93-4 +- Fix error in info file naming (BZ 227459) + * Sun Jan 7 2007 Jonathan G. Underwood - 3.02.93-3 - Fix directory ownership of contrib and experimental directories - Release bump From fedora-extras-commits at redhat.com Sat Feb 10 13:03:11 2007 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Sat, 10 Feb 2007 08:03:11 -0500 Subject: rpms/emacs-common-muse/FC-5 emacs-common-muse.spec,1.7,1.8 Message-ID: <200702101303.l1AD3B84008103@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-common-muse/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8086 Modified Files: emacs-common-muse.spec Log Message: * Sat Feb 10 2007 Jonathan G. Underwood - 3.02.93-5 - Revert erroneous changes made to BuildRequires in last revision Index: emacs-common-muse.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-common-muse/FC-5/emacs-common-muse.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- emacs-common-muse.spec 10 Feb 2007 12:21:44 -0000 1.7 +++ emacs-common-muse.spec 10 Feb 2007 13:02:39 -0000 1.8 @@ -11,7 +11,7 @@ Name: emacs-common-muse Version: 3.02.93 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Emacs Muse is an authoring and publishing environment for Emacs Group: Applications/Editors License: GPL @@ -24,10 +24,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: emacs >= %{emacs_ver} -BuildRequires: texinfo-tex +BuildRequires: texinfo %if %{xemacs} BuildRequires: xemacs >= %{xemacs_ver} -BuildRequires: xemacs-packages-extra +BuildRequires: xemacs-sumo %endif %description @@ -194,6 +194,10 @@ %endif %changelog +* Sat Feb 10 2007 Jonathan G. Underwood - 3.02.93-5 +- Revert erroneous changes made to BuildRequires in last +revision + * Sat Feb 10 2007 Jonathan G. Underwood - 3.02.93-4 - Fix error in info file naming (BZ 227459) From fedora-extras-commits at redhat.com Sat Feb 10 13:05:13 2007 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Sat, 10 Feb 2007 08:05:13 -0500 Subject: rpms/emacs-common-muse/FC-6 emacs-common-muse.spec,1.14,1.15 Message-ID: <200702101305.l1AD5DZt008170@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-common-muse/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8151 Modified Files: emacs-common-muse.spec Log Message: * Sat Feb 10 2007 Jonathan G. Underwood - 3.02.93-5 - Bump release Index: emacs-common-muse.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-common-muse/FC-6/emacs-common-muse.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- emacs-common-muse.spec 10 Feb 2007 12:22:43 -0000 1.14 +++ emacs-common-muse.spec 10 Feb 2007 13:04:41 -0000 1.15 @@ -11,7 +11,7 @@ Name: emacs-common-muse Version: 3.02.93 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Emacs Muse is an authoring and publishing environment for Emacs Group: Applications/Editors License: GPL @@ -194,6 +194,9 @@ %endif %changelog +* Sat Feb 10 2007 Jonathan G. Underwood - 3.02.93-5 +- Bump release + * Sat Feb 10 2007 Jonathan G. Underwood - 3.02.93-4 - Fix error in info file naming (BZ 227459) From fedora-extras-commits at redhat.com Sat Feb 10 13:07:15 2007 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Sat, 10 Feb 2007 08:07:15 -0500 Subject: rpms/emacs-common-muse/devel emacs-common-muse.spec,1.14,1.15 Message-ID: <200702101307.l1AD7F2S008235@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-common-muse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8216 Modified Files: emacs-common-muse.spec Log Message: * Sat Feb 10 2007 Jonathan G. Underwood - 3.02.93-5 - Bump release Index: emacs-common-muse.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-common-muse/devel/emacs-common-muse.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- emacs-common-muse.spec 10 Feb 2007 12:23:39 -0000 1.14 +++ emacs-common-muse.spec 10 Feb 2007 13:06:42 -0000 1.15 @@ -11,7 +11,7 @@ Name: emacs-common-muse Version: 3.02.93 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Emacs Muse is an authoring and publishing environment for Emacs Group: Applications/Editors License: GPL @@ -194,6 +194,9 @@ %endif %changelog +* Sat Feb 10 2007 Jonathan G. Underwood - 3.02.93-5 +- Bump release + * Sat Feb 10 2007 Jonathan G. Underwood - 3.02.93-4 - Fix error in info file naming (BZ 227459) From fedora-extras-commits at redhat.com Sat Feb 10 14:52:43 2007 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 10 Feb 2007 09:52:43 -0500 Subject: rpms/perl-File-HomeDir/devel .cvsignore, 1.4, 1.5 perl-File-HomeDir.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200702101452.l1AEqhoS012374@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-File-HomeDir/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12347 Modified Files: .cvsignore perl-File-HomeDir.spec sources Log Message: Update to 0.64. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-File-HomeDir/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 11 Jan 2007 14:22:06 -0000 1.4 +++ .cvsignore 10 Feb 2007 14:52:11 -0000 1.5 @@ -1 +1 @@ -File-HomeDir-0.63.tar.gz +File-HomeDir-0.64.tar.gz Index: perl-File-HomeDir.spec =================================================================== RCS file: /cvs/extras/rpms/perl-File-HomeDir/devel/perl-File-HomeDir.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-File-HomeDir.spec 11 Jan 2007 14:23:59 -0000 1.4 +++ perl-File-HomeDir.spec 10 Feb 2007 14:52:11 -0000 1.5 @@ -1,5 +1,5 @@ Name: perl-File-HomeDir -Version: 0.63 +Version: 0.64 Release: 1%{?dist} Summary: Get the home directory for yourself or other users @@ -22,7 +22,7 @@ %prep %setup -q -n File-HomeDir-%{version} -chmod -v a-x Changes lib/File/{*.pm,HomeDir/*.pm} +chmod -c a-x Changes lib/File/{*.pm,HomeDir/*.pm} %build @@ -54,6 +54,9 @@ %changelog +* Sat Feb 10 2007 Jose Pedro Oliveira - 0.64-1 +- Update to 0.64. + * Thu Jan 11 2007 Jose Pedro Oliveira - 0.63-1 - Update to 0.63. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-File-HomeDir/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 11 Jan 2007 14:22:06 -0000 1.4 +++ sources 10 Feb 2007 14:52:11 -0000 1.5 @@ -1 +1 @@ -cb49b0a39018b90d0fb6e8d0bd4387f7 File-HomeDir-0.63.tar.gz +6fc8be36a3f5e04c39530f150593e520 File-HomeDir-0.64.tar.gz From fedora-extras-commits at redhat.com Sat Feb 10 14:54:31 2007 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 10 Feb 2007 09:54:31 -0500 Subject: extras-buildsys/utils/pushscript extras-sync,1.1,1.2 Message-ID: <200702101454.l1AEsVdh012453@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils/pushscript In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12436 Modified Files: extras-sync Log Message: exclude FE3 and FE4 from default sync Index: extras-sync =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/extras-sync,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- extras-sync 30 Sep 2006 10:18:20 -0000 1.1 +++ extras-sync 10 Feb 2007 14:54:29 -0000 1.2 @@ -2,7 +2,8 @@ outputdir=/srv/rpmbuild/extras/tree/extras targetdir=fpserv.linux.duke.edu:/srv/web/docroot/extras/ -exclude="" +#exclude="" +exclude="--exclude /3/ --exclude /4/" opts="-avH --progress --delete -e ssh $exclude" umask 0002 From fedora-extras-commits at redhat.com Sat Feb 10 14:59:07 2007 From: fedora-extras-commits at redhat.com (Ruben Kerkhof (ruben)) Date: Sat, 10 Feb 2007 09:59:07 -0500 Subject: rpms/Pound/devel .cvsignore, 1.8, 1.9 Pound.spec, 1.8, 1.9 sources, 1.8, 1.9 Message-ID: <200702101459.l1AEx7NE012513@cvs-int.fedora.redhat.com> Author: ruben Update of /cvs/extras/rpms/Pound/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12490 Modified Files: .cvsignore Pound.spec sources Log Message: Sync with upstream Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/Pound/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 21 Jan 2007 00:54:34 -0000 1.8 +++ .cvsignore 10 Feb 2007 14:58:35 -0000 1.9 @@ -1 +1 @@ -Pound-2.2.3.tgz +Pound-2.2.4.tgz Index: Pound.spec =================================================================== RCS file: /cvs/extras/rpms/Pound/devel/Pound.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Pound.spec 21 Jan 2007 00:54:34 -0000 1.8 +++ Pound.spec 10 Feb 2007 14:58:35 -0000 1.9 @@ -3,7 +3,7 @@ %define pound_home %{_localstatedir}/lib/pound Name: Pound -Version: 2.2.3 +Version: 2.2.4 Release: 1%{?dist} Summary: Reverse proxy and load balancer @@ -106,6 +106,8 @@ %attr(-,%{pound_user},%{pound_group}) %dir %{pound_home} %changelog +* Sat Feb 10 2007 2.2.4-1 +- Sync with upstream * Sat Jan 20 2007 2.2.3-1 - Fix problems in bad 2.2.2 release * Mon Jan 15 2007 2.2.2-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/Pound/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 21 Jan 2007 00:54:34 -0000 1.8 +++ sources 10 Feb 2007 14:58:35 -0000 1.9 @@ -1 +1 @@ -40b291fed457e1c4fc2bc9ed69d58917 Pound-2.2.3.tgz +c27c92f6916a88a16c52f10df167fb4e Pound-2.2.4.tgz From fedora-extras-commits at redhat.com Sat Feb 10 15:11:13 2007 From: fedora-extras-commits at redhat.com (Jeff Layton (jlayton)) Date: Sat, 10 Feb 2007 10:11:13 -0500 Subject: rpms/ez-ipupdate/devel ez-ipupdate.spec,1.13,1.14 Message-ID: <200702101511.l1AFBDDf016023@cvs-int.fedora.redhat.com> Author: jlayton Update of /cvs/extras/rpms/ez-ipupdate/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15973 Modified Files: ez-ipupdate.spec Log Message: Removed obsolete requires(postun) Index: ez-ipupdate.spec =================================================================== RCS file: /cvs/extras/rpms/ez-ipupdate/devel/ez-ipupdate.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ez-ipupdate.spec 12 Sep 2006 20:17:41 -0000 1.13 +++ ez-ipupdate.spec 10 Feb 2007 15:10:41 -0000 1.14 @@ -1,6 +1,6 @@ Name: ez-ipupdate Version: 3.0.11 -Release: 0.12.b8%{?dist} +Release: 0.13.b8%{?dist} Summary: Client for Dynamic DNS Services Group: Applications/Internet @@ -15,7 +15,6 @@ Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig Requires(pre): /usr/sbin/useradd /usr/sbin/groupadd -Requires(postun): /usr/sbin/userdel /usr/sbin/groupdel %description ez-ipupdate is a small utility for updating your host name for any of the @@ -118,6 +117,9 @@ %ghost %attr(0640,root,ez-ipupd) %config(noreplace,missingok) %{_sysconfdir}/ez-ipupdate/default.conf %changelog +* Sat Feb 10 2006 Jeff Layton - 3.0.11-0.12.b8 +- remove Requires(postun) for user/groupdel since they're no longer needed + * Tue Sep 12 2006 Jeff Layton - 3.0.11-0.12.b8 - clean up changelog for specfile From fedora-extras-commits at redhat.com Sat Feb 10 15:13:36 2007 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 10 Feb 2007 10:13:36 -0500 Subject: rpms/perl-Geo-Ellipsoids/devel .cvsignore, 1.5, 1.6 perl-Geo-Ellipsoids.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200702101513.l1AFDaQM016074@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Geo-Ellipsoids/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16051 Modified Files: .cvsignore perl-Geo-Ellipsoids.spec sources Log Message: Update to 0.14. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Geo-Ellipsoids/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 21 Jan 2007 14:34:55 -0000 1.5 +++ .cvsignore 10 Feb 2007 15:13:03 -0000 1.6 @@ -1 +1 @@ -Geo-Ellipsoids-0.13.tar.gz +Geo-Ellipsoids-0.14.tar.gz Index: perl-Geo-Ellipsoids.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Geo-Ellipsoids/devel/perl-Geo-Ellipsoids.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Geo-Ellipsoids.spec 21 Jan 2007 14:34:55 -0000 1.4 +++ perl-Geo-Ellipsoids.spec 10 Feb 2007 15:13:03 -0000 1.5 @@ -1,5 +1,5 @@ Name: perl-Geo-Ellipsoids -Version: 0.13 +Version: 0.14 Release: 1%{?dist} Summary: Standard Geo:: ellipsoids @@ -53,6 +53,9 @@ %changelog +* Sat Feb 10 2007 Jose Pedro Oliveira - 0.14-1 +- Update to 0.14. + * Sun Jan 21 2007 Jose Pedro Oliveira - 0.13-1 - Update to 0.13. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Geo-Ellipsoids/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 21 Jan 2007 14:34:55 -0000 1.5 +++ sources 10 Feb 2007 15:13:03 -0000 1.6 @@ -1 +1 @@ -b4c682b9e68ad361b113c25d40326c5d Geo-Ellipsoids-0.13.tar.gz +9aedb393cd7f71d9c7822df1930fac5b Geo-Ellipsoids-0.14.tar.gz From fedora-extras-commits at redhat.com Sat Feb 10 15:15:37 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sat, 10 Feb 2007 10:15:37 -0500 Subject: rpms/jd/devel .cvsignore, 1.63, 1.64 jd.spec, 1.74, 1.75 sources, 1.63, 1.64 Message-ID: <200702101515.l1AFFb5U016171@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16148 Modified Files: .cvsignore jd.spec sources Log Message: * Sat Feb 10 2007 Mamoru Tasaka - 1.8.5-2.cvs070210 - cvs 070210 (17:20 JST) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- .cvsignore 8 Feb 2007 16:58:30 -0000 1.63 +++ .cvsignore 10 Feb 2007 15:15:05 -0000 1.64 @@ -1 +1 @@ -jd-1.8.5-cvs070208.tgz +jd-1.8.5-cvs070210.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- jd.spec 8 Feb 2007 16:58:30 -0000 1.74 +++ jd.spec 10 Feb 2007 15:15:05 -0000 1.75 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 1.8.5 -%define strtag cvs070208 +%define strtag cvs070210 %define repoid 23816 @@ -106,8 +106,8 @@ %{icondir}/%{name}.png %changelog -* Thu Feb 8 2007 Mamoru Tasaka - 1.8.5-2.cvs070208 -- cvs 070208 (24:25 JST) +* Sat Feb 10 2007 Mamoru Tasaka - 1.8.5-2.cvs070210 +- cvs 070210 (17:20 JST) * Fri Feb 2 2007 Mamoru Tasaka - 1.8.5-1 - 1.8.5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- sources 8 Feb 2007 16:58:30 -0000 1.63 +++ sources 10 Feb 2007 15:15:05 -0000 1.64 @@ -1 +1 @@ -a46a3350e6ea734f880b6d8eec9dafc2 jd-1.8.5-cvs070208.tgz +a2a0e957f9db88d1fa73bf8d1d29c03f jd-1.8.5-cvs070210.tgz From fedora-extras-commits at redhat.com Sat Feb 10 15:18:01 2007 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 10 Feb 2007 10:18:01 -0500 Subject: rpms/perl-Geo-Ellipsoids/FC-5 .cvsignore, 1.2, 1.3 perl-Geo-Ellipsoids.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200702101518.l1AFI1kk016270@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Geo-Ellipsoids/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16226/FC-5 Modified Files: .cvsignore perl-Geo-Ellipsoids.spec sources Log Message: Update to 0.14. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Geo-Ellipsoids/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Dec 2006 17:48:48 -0000 1.2 +++ .cvsignore 10 Feb 2007 15:17:29 -0000 1.3 @@ -1 +1 @@ -Geo-Ellipsoids-0.10.tar.gz +Geo-Ellipsoids-0.14.tar.gz Index: perl-Geo-Ellipsoids.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Geo-Ellipsoids/FC-5/perl-Geo-Ellipsoids.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Geo-Ellipsoids.spec 11 Dec 2006 17:48:48 -0000 1.1 +++ perl-Geo-Ellipsoids.spec 10 Feb 2007 15:17:29 -0000 1.2 @@ -1,5 +1,5 @@ Name: perl-Geo-Ellipsoids -Version: 0.10 +Version: 0.14 Release: 1%{?dist} Summary: Standard Geo:: ellipsoids @@ -32,7 +32,7 @@ rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' +find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* @@ -53,5 +53,17 @@ %changelog +* Sat Feb 10 2007 Jose Pedro Oliveira - 0.14-1 +- Update to 0.14. + +* Sun Jan 21 2007 Jose Pedro Oliveira - 0.13-1 +- Update to 0.13. + +* Fri Jan 5 2007 Jose Pedro Oliveira - 0.12-1 +- Update to 0.12. + +* Thu Jan 4 2007 Jose Pedro Oliveira - 0.11-1 +- Update to 0.11. + * Sun Dec 10 2006 Jose Pedro Oliveira - 0.10-1 - First build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Geo-Ellipsoids/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Dec 2006 17:48:48 -0000 1.2 +++ sources 10 Feb 2007 15:17:29 -0000 1.3 @@ -1 +1 @@ -6281160b1c9d6c21bb8fc261100fa35c Geo-Ellipsoids-0.10.tar.gz +9aedb393cd7f71d9c7822df1930fac5b Geo-Ellipsoids-0.14.tar.gz From fedora-extras-commits at redhat.com Sat Feb 10 15:18:04 2007 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 10 Feb 2007 10:18:04 -0500 Subject: rpms/perl-Geo-Ellipsoids/FC-6 .cvsignore, 1.2, 1.3 perl-Geo-Ellipsoids.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200702101518.l1AFI4kp016275@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Geo-Ellipsoids/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16226/FC-6 Modified Files: .cvsignore perl-Geo-Ellipsoids.spec sources Log Message: Update to 0.14. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Geo-Ellipsoids/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Dec 2006 17:48:48 -0000 1.2 +++ .cvsignore 10 Feb 2007 15:17:31 -0000 1.3 @@ -1 +1 @@ -Geo-Ellipsoids-0.10.tar.gz +Geo-Ellipsoids-0.14.tar.gz Index: perl-Geo-Ellipsoids.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Geo-Ellipsoids/FC-6/perl-Geo-Ellipsoids.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Geo-Ellipsoids.spec 11 Dec 2006 17:48:48 -0000 1.1 +++ perl-Geo-Ellipsoids.spec 10 Feb 2007 15:17:31 -0000 1.2 @@ -1,5 +1,5 @@ Name: perl-Geo-Ellipsoids -Version: 0.10 +Version: 0.14 Release: 1%{?dist} Summary: Standard Geo:: ellipsoids @@ -32,7 +32,7 @@ rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' +find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* @@ -53,5 +53,17 @@ %changelog +* Sat Feb 10 2007 Jose Pedro Oliveira - 0.14-1 +- Update to 0.14. + +* Sun Jan 21 2007 Jose Pedro Oliveira - 0.13-1 +- Update to 0.13. + +* Fri Jan 5 2007 Jose Pedro Oliveira - 0.12-1 +- Update to 0.12. + +* Thu Jan 4 2007 Jose Pedro Oliveira - 0.11-1 +- Update to 0.11. + * Sun Dec 10 2006 Jose Pedro Oliveira - 0.10-1 - First build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Geo-Ellipsoids/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Dec 2006 17:48:48 -0000 1.2 +++ sources 10 Feb 2007 15:17:31 -0000 1.3 @@ -1 +1 @@ -6281160b1c9d6c21bb8fc261100fa35c Geo-Ellipsoids-0.10.tar.gz +9aedb393cd7f71d9c7822df1930fac5b Geo-Ellipsoids-0.14.tar.gz From fedora-extras-commits at redhat.com Sat Feb 10 15:26:09 2007 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 10 Feb 2007 10:26:09 -0500 Subject: rpms/perl-Email-MIME/devel .cvsignore, 1.8, 1.9 perl-Email-MIME.spec, 1.7, 1.8 sources, 1.8, 1.9 Message-ID: <200702101526.l1AFQ9Ff016478@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Email-MIME/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16455 Modified Files: .cvsignore perl-Email-MIME.spec sources Log Message: Update to 1.858. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Email-MIME/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 1 Dec 2006 16:01:51 -0000 1.8 +++ .cvsignore 10 Feb 2007 15:25:37 -0000 1.9 @@ -1 +1 @@ -Email-MIME-1.857.tar.gz +Email-MIME-1.858.tar.gz Index: perl-Email-MIME.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Email-MIME/devel/perl-Email-MIME.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Email-MIME.spec 1 Dec 2006 16:01:51 -0000 1.7 +++ perl-Email-MIME.spec 10 Feb 2007 15:25:37 -0000 1.8 @@ -1,5 +1,5 @@ Name: perl-Email-MIME -Version: 1.857 +Version: 1.858 Release: 1%{?dist} Summary: Easy MIME message parsing @@ -40,7 +40,7 @@ rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' +find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* @@ -60,6 +60,9 @@ %changelog +* Sat Feb 10 2007 Jose Pedro Oliveira - 1.858-1 +- Update to 1.858. + * Fri Dec 1 2006 Jose Pedro Oliveira - 1.857-1 - Update to 1.857. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Email-MIME/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 1 Dec 2006 16:01:51 -0000 1.8 +++ sources 10 Feb 2007 15:25:37 -0000 1.9 @@ -1 +1 @@ -930691bb98967193e01f928935dbcbd2 Email-MIME-1.857.tar.gz +fb3646699a3c3f03c39cb8d7ec45bebd Email-MIME-1.858.tar.gz From fedora-extras-commits at redhat.com Sat Feb 10 15:28:47 2007 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 10 Feb 2007 10:28:47 -0500 Subject: rpms/perl-Email-MIME/FC-5 .cvsignore, 1.8, 1.9 perl-Email-MIME.spec, 1.7, 1.8 sources, 1.8, 1.9 Message-ID: <200702101528.l1AFSlsx016589@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Email-MIME/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16542/FC-5 Modified Files: .cvsignore perl-Email-MIME.spec sources Log Message: Update to 1.858. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Email-MIME/FC-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 1 Dec 2006 16:01:45 -0000 1.8 +++ .cvsignore 10 Feb 2007 15:28:14 -0000 1.9 @@ -1 +1 @@ -Email-MIME-1.857.tar.gz +Email-MIME-1.858.tar.gz Index: perl-Email-MIME.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Email-MIME/FC-5/perl-Email-MIME.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Email-MIME.spec 1 Dec 2006 16:01:45 -0000 1.7 +++ perl-Email-MIME.spec 10 Feb 2007 15:28:14 -0000 1.8 @@ -1,5 +1,5 @@ Name: perl-Email-MIME -Version: 1.857 +Version: 1.858 Release: 1%{?dist} Summary: Easy MIME message parsing @@ -40,7 +40,7 @@ rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' +find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* @@ -60,6 +60,9 @@ %changelog +* Sat Feb 10 2007 Jose Pedro Oliveira - 1.858-1 +- Update to 1.858. + * Fri Dec 1 2006 Jose Pedro Oliveira - 1.857-1 - Update to 1.857. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Email-MIME/FC-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 1 Dec 2006 16:01:45 -0000 1.8 +++ sources 10 Feb 2007 15:28:14 -0000 1.9 @@ -1 +1 @@ -930691bb98967193e01f928935dbcbd2 Email-MIME-1.857.tar.gz +fb3646699a3c3f03c39cb8d7ec45bebd Email-MIME-1.858.tar.gz From fedora-extras-commits at redhat.com Sat Feb 10 15:28:49 2007 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 10 Feb 2007 10:28:49 -0500 Subject: rpms/perl-Email-MIME/FC-6 .cvsignore, 1.8, 1.9 perl-Email-MIME.spec, 1.7, 1.8 sources, 1.8, 1.9 Message-ID: <200702101528.l1AFSnkV016594@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Email-MIME/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16542/FC-6 Modified Files: .cvsignore perl-Email-MIME.spec sources Log Message: Update to 1.858. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Email-MIME/FC-6/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 1 Dec 2006 16:01:46 -0000 1.8 +++ .cvsignore 10 Feb 2007 15:28:17 -0000 1.9 @@ -1 +1 @@ -Email-MIME-1.857.tar.gz +Email-MIME-1.858.tar.gz Index: perl-Email-MIME.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Email-MIME/FC-6/perl-Email-MIME.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Email-MIME.spec 1 Dec 2006 16:01:46 -0000 1.7 +++ perl-Email-MIME.spec 10 Feb 2007 15:28:17 -0000 1.8 @@ -1,5 +1,5 @@ Name: perl-Email-MIME -Version: 1.857 +Version: 1.858 Release: 1%{?dist} Summary: Easy MIME message parsing @@ -40,7 +40,7 @@ rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' +find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* @@ -60,6 +60,9 @@ %changelog +* Sat Feb 10 2007 Jose Pedro Oliveira - 1.858-1 +- Update to 1.858. + * Fri Dec 1 2006 Jose Pedro Oliveira - 1.857-1 - Update to 1.857. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Email-MIME/FC-6/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 1 Dec 2006 16:01:46 -0000 1.8 +++ sources 10 Feb 2007 15:28:17 -0000 1.9 @@ -1 +1 @@ -930691bb98967193e01f928935dbcbd2 Email-MIME-1.857.tar.gz +fb3646699a3c3f03c39cb8d7ec45bebd Email-MIME-1.858.tar.gz From fedora-extras-commits at redhat.com Sat Feb 10 15:50:53 2007 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 10 Feb 2007 10:50:53 -0500 Subject: rpms/perl-Email-Simple/devel .cvsignore, 1.10, 1.11 perl-Email-Simple.spec, 1.9, 1.10 sources, 1.10, 1.11 Message-ID: <200702101550.l1AForla016906@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Email-Simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16880 Modified Files: .cvsignore perl-Email-Simple.spec sources Log Message: Update to 1.998. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Email-Simple/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 1 Dec 2006 15:51:53 -0000 1.10 +++ .cvsignore 10 Feb 2007 15:50:20 -0000 1.11 @@ -1 +1 @@ -Email-Simple-1.996.tar.gz +Email-Simple-1.998.tar.gz Index: perl-Email-Simple.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Email-Simple/devel/perl-Email-Simple.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Email-Simple.spec 1 Dec 2006 15:51:53 -0000 1.9 +++ perl-Email-Simple.spec 10 Feb 2007 15:50:20 -0000 1.10 @@ -1,5 +1,5 @@ Name: perl-Email-Simple -Version: 1.996 +Version: 1.998 Release: 1%{?dist} Summary: Simple parsing of RFC2822 message format and headers @@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +BuildRequires: perl(Email::MIME) >= 1.857 BuildRequires: perl(Test::Pod) >= 1.14 BuildRequires: perl(Test::Pod::Coverage) >= 1.08 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -35,7 +36,7 @@ rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' +find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* @@ -55,6 +56,9 @@ %changelog +* Sat Feb 10 2007 Jose Pedro Oliveira - 1.998-1 +- Update to 1.998. + * Fri Dec 1 2006 Jose Pedro Oliveira - 1.996-1 - Update to 1.996. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Email-Simple/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 1 Dec 2006 15:51:53 -0000 1.10 +++ sources 10 Feb 2007 15:50:20 -0000 1.11 @@ -1 +1 @@ -eb35dd4f86bd0552f87916787b954d46 Email-Simple-1.996.tar.gz +dde226298b0254451f1f2a72b239c0c8 Email-Simple-1.998.tar.gz From fedora-extras-commits at redhat.com Sat Feb 10 17:15:17 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sat, 10 Feb 2007 12:15:17 -0500 Subject: rpms/jd/devel .cvsignore, 1.64, 1.65 jd.spec, 1.75, 1.76 sources, 1.64, 1.65 Message-ID: <200702101715.l1AHFH6Q024189@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24164 Modified Files: .cvsignore jd.spec sources Log Message: * Sat Feb 10 2007 Mamoru Tasaka - 1.8.5-2.cvs070210.1 - cvs 070210 (25:25 JST) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- .cvsignore 10 Feb 2007 15:15:05 -0000 1.64 +++ .cvsignore 10 Feb 2007 17:14:44 -0000 1.65 @@ -1 +1 @@ -jd-1.8.5-cvs070210.tgz +jd-1.8.5-cvs070210.1.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- jd.spec 10 Feb 2007 15:15:05 -0000 1.75 +++ jd.spec 10 Feb 2007 17:14:44 -0000 1.76 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 1.8.5 -%define strtag cvs070210 +%define strtag cvs070210.1 %define repoid 23816 @@ -106,8 +106,8 @@ %{icondir}/%{name}.png %changelog -* Sat Feb 10 2007 Mamoru Tasaka - 1.8.5-2.cvs070210 -- cvs 070210 (17:20 JST) +* Sat Feb 10 2007 Mamoru Tasaka - 1.8.5-2.cvs070210.1 +- cvs 070210 (25:25 JST) * Fri Feb 2 2007 Mamoru Tasaka - 1.8.5-1 - 1.8.5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- sources 10 Feb 2007 15:15:05 -0000 1.64 +++ sources 10 Feb 2007 17:14:44 -0000 1.65 @@ -1 +1 @@ -a2a0e957f9db88d1fa73bf8d1d29c03f jd-1.8.5-cvs070210.tgz +d04adefbc239a3e7c18d44ecb835434d jd-1.8.5-cvs070210.1.tgz From fedora-extras-commits at redhat.com Sat Feb 10 18:44:27 2007 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 10 Feb 2007 13:44:27 -0500 Subject: rpms/eventlog/devel eventlog.spec,1.3,1.4 Message-ID: <200702101844.l1AIiR15028228@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/eventlog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28211 Modified Files: eventlog.spec Log Message: Create a -static subpackage. Index: eventlog.spec =================================================================== RCS file: /cvs/extras/rpms/eventlog/devel/eventlog.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- eventlog.spec 4 Oct 2006 22:24:30 -0000 1.3 +++ eventlog.spec 10 Feb 2007 18:43:55 -0000 1.4 @@ -1,6 +1,6 @@ Name: eventlog Version: 0.2.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Syslog-ng v2 support library Group: System Environment/Libraries @@ -38,6 +38,15 @@ This package contains the development files. +%package static +Summary: Eventlog static library +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} + +%description static +The eventlog-static package includes the eventlog static library. + + %prep %setup -q @@ -69,15 +78,21 @@ %files devel %defattr(-,root,root,-) %doc doc/* -%{_libdir}/libevtlog.a %{_libdir}/libevtlog.so %{_libdir}/pkgconfig/eventlog.pc %{_includedir}/%{name}/ +%files static +%defattr(-,root,root,-) +%{_libdir}/libevtlog.a + %changelog +* Sat Feb 10 2007 Jose Pedro Oliveira - 0.2.5-3 +- Create a -static subpackage. + * Thu Oct 05 2006 Christian Iseli 0.2.5-2 - - rebuilt for unwind info generation, broken in gcc-4.1.1-21 +- rebuilt for unwind info generation, broken in gcc-4.1.1-21 * Sun Jul 16 2006 Jose Pedro Oliveira - 0.2.5-1 - Update to 0.25. From fedora-extras-commits at redhat.com Sat Feb 10 19:13:38 2007 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 10 Feb 2007 14:13:38 -0500 Subject: rpms/syslog-ng/devel syslog-ng-2.0.0-init.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 syslog-ng.spec, 1.17, 1.18 syslog-ng-1.6.7-init.patch, 1.1, NONE Message-ID: <200702101913.l1AJDcZH031843@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/syslog-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31819 Modified Files: .cvsignore sources syslog-ng.spec Added Files: syslog-ng-2.0.0-init.patch Removed Files: syslog-ng-1.6.7-init.patch Log Message: Update to 2.0.2. syslog-ng-2.0.0-init.patch: --- NEW FILE syslog-ng-2.0.0-init.patch --- diff -ruN syslog-ng-2.0.0-orig/contrib/fedora-packaging/syslog-ng.init syslog-ng-2.0.0/contrib/fedora-packaging/syslog-ng.init --- syslog-ng-2.0.0-orig/contrib/fedora-packaging/syslog-ng.init 2006-02-11 07:37:58.000000000 +0000 +++ syslog-ng-2.0.0/contrib/fedora-packaging/syslog-ng.init 2006-12-15 10:46:07.000000000 +0000 @@ -2,10 +2,7 @@ # # syslog-ng This starts and stops syslog-ng # -# chkconfig: 2345 12 88 -# description: reads and logs messages to the system console, log \ -# files, other machines and/or users as specified by \ -# its configuration file. +# chkconfig: - 12 88 # processname: /sbin/syslog-ng # config: /etc/syslog-ng/syslog-ng.conf # config: /etc/sysconfig/syslog-ng @@ -13,6 +10,10 @@ # ### BEGIN INIT INFO # Provides: $syslog +# Short-Description: System logging and kernel message trapping daemon +# Description: reads and logs messages to the system console, log \ +# files, other machines and/or users as specified by \ +# its configuration file. ### END INIT INFO # Source function library. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 6 Feb 2007 20:49:33 -0000 1.7 +++ .cvsignore 10 Feb 2007 19:13:05 -0000 1.8 @@ -1 +1 @@ -syslog-ng-1.6.12.tar.gz +syslog-ng-2.0.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 6 Feb 2007 20:49:33 -0000 1.7 +++ sources 10 Feb 2007 19:13:05 -0000 1.8 @@ -1 +1 @@ -a3cbfdb6e1e5beea181a7349749719f3 syslog-ng-1.6.12.tar.gz +7ef12e1e43a99c5b6b8d1984dde72151 syslog-ng-2.0.2.tar.gz Index: syslog-ng.spec =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/devel/syslog-ng.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- syslog-ng.spec 6 Feb 2007 20:49:33 -0000 1.17 +++ syslog-ng.spec 10 Feb 2007 19:13:05 -0000 1.18 @@ -1,36 +1,24 @@ -# -# Rebuild option: -# -# --with spoofing enables the syslog-ng feature spoof-source -# (see README.spoof for more information) -# - %define sbindir /sbin -%define libolver 0.3.18 -%define spoofing 0 - -%{?_with_spoofing:%define spoofing 1} Name: syslog-ng -Version: 1.6.12 +Version: 2.0.2 Release: 1%{?dist} Summary: Syslog replacement daemon Group: System Environment/Daemons License: GPL URL: http://www.balabit.com/products/syslog_ng/ -Source0: http://www.balabit.com/downloads/syslog-ng/1.6/src/syslog-ng-%{version}.tar.gz +Source0: http://www.balabit.com/downloads/syslog-ng/2.0/src/syslog-ng-%{version}.tar.gz Source1: syslog.log -Patch0: syslog-ng-1.6.7-init.patch +Patch0: syslog-ng-2.0.0-init.patch Patch1: syslog-ng-1.6.7-logrotate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildConflicts: libol-devel < %{libolver} -BuildRequires: flex, which -BuildRequires: tcp_wrappers-devel -%if %{spoofing} -BuildRequires: libnet-devel >= 1.1 -%endif +BuildRequires: flex +BuildRequires: pkgconfig >= 0.20 +BuildRequires: glib2-devel >= 2.2 +BuildRequires: eventlog-devel >= 0.2.5 + Requires: logrotate Requires(post): chkconfig, initscripts Requires(preun): chkconfig, initscripts @@ -41,12 +29,12 @@ Provides: syslog %description -syslog-ng, as the name shows, is a syslogd replacement, but with new -functionality for the new generation. The original syslogd allows -messages only to be sorted based on priority/facility pairs; syslog-ng -adds the possibility to filter based on message contents using regular -expressions. The new configuration scheme is intuitive and powerful. -Forwarding logs over TCP and remembering all forwarding hops makes it +syslog-ng, as the name shows, is a syslogd replacement, but with new +functionality for the new generation. The original syslogd allows +messages only to be sorted based on priority/facility pairs; syslog-ng +adds the possibility to filter based on message contents using regular +expressions. The new configuration scheme is intuitive and powerful. +Forwarding logs over TCP and remembering all forwarding hops makes it ideal for firewalled environments. @@ -55,18 +43,17 @@ %patch0 -p1 %patch1 -p1 %{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl -chmod a-x contrib/syslog2ng -mv libol-%{libolver}/{ChangeLog,ChangeLog.libol} +chmod -c a-x contrib/syslog2ng + %build %configure \ --sbindir=%{sbindir} \ -%if %{spoofing} - --enable-spoof-source \ -%endif - --enable-tcp-wrapper + --sysconfdir=%{_sysconfdir}/syslog-ng \ + --enable-ipv6 make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT @@ -141,11 +128,11 @@ %files %defattr(-,root,root,-) -%doc AUTHORS COPYING README README.spoof ChangeLog INSTALL NEWS PORTS -%doc doc/sgml/syslog-ng.txt doc/*.{demo,sample} -%doc contrib/syslog-ng.conf.doc -%doc contrib/syslog2ng doc/stresstest.sh contrib/relogger.pl -%doc libol-%{libolver}/ChangeLog.libol +%doc AUTHORS ChangeLog COPYING NEWS README +%doc doc/reference/syslog-ng.txt +%doc doc/security/*.txt +%doc doc/examples/syslog-ng.conf.sample +%doc contrib/{relogger.pl,syslog2ng,syslog-ng.conf.doc} %{sbindir}/syslog-ng %{_initrddir}/syslog-ng %dir %{_sysconfdir}/%{name} @@ -159,8 +146,17 @@ %changelog -* Tue Feb 6 2007 Jose Pedro Oliveira - 1.6.12-1 -- Update to 1.6.12. +* Mon Jan 29 2007 Jose Pedro Oliveira - 2.0.2-1 +- Update to 2.0.2. + +* Thu Jan 4 2007 Jose Pedro Oliveira - 2.0.1-1 +- Update to 2.0.1. + +* Fri Dec 15 2006 Jose Pedro Oliveira - 2.0.0-1 +- Updated the init script patch: LSB Description and Short-Description. + +* Fri Nov 3 2006 Jose Pedro Oliveira - 2.0.0-0 +- Update to 2.0.0. * Sun Sep 10 2006 Jose Pedro Oliveira - 1.6.11-3 - Rebuild for FC6. --- syslog-ng-1.6.7-init.patch DELETED --- From fedora-extras-commits at redhat.com Sat Feb 10 19:17:34 2007 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 10 Feb 2007 14:17:34 -0500 Subject: rpms/syslog-ng/devel syslog-ng.spec,1.18,1.19 Message-ID: <200702101917.l1AJHYM3031885@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/syslog-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31868 Modified Files: syslog-ng.spec Log Message: BR the static subpackages. Index: syslog-ng.spec =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/devel/syslog-ng.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- syslog-ng.spec 10 Feb 2007 19:13:05 -0000 1.18 +++ syslog-ng.spec 10 Feb 2007 19:17:02 -0000 1.19 @@ -16,8 +16,8 @@ BuildRequires: flex BuildRequires: pkgconfig >= 0.20 -BuildRequires: glib2-devel >= 2.2 -BuildRequires: eventlog-devel >= 0.2.5 +BuildRequires: glib2-static >= 2.2 +BuildRequires: eventlog-static >= 0.2.5 Requires: logrotate Requires(post): chkconfig, initscripts From fedora-extras-commits at redhat.com Sat Feb 10 19:34:52 2007 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Sat, 10 Feb 2007 14:34:52 -0500 Subject: rpms/python-matplotlib/devel python-matplotlib.spec,1.26,1.27 Message-ID: <200702101934.l1AJYqGF032140@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/python-matplotlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32119 Modified Files: python-matplotlib.spec Log Message: * Sat Feb 10 2007 Jef Spaleta 0.90.0-2 - Release bump for rebuild against new tk Index: python-matplotlib.spec =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/python-matplotlib.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- python-matplotlib.spec 9 Feb 2007 21:49:38 -0000 1.26 +++ python-matplotlib.spec 10 Feb 2007 19:34:19 -0000 1.27 @@ -2,7 +2,7 @@ Name: python-matplotlib Version: 0.90.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python plotting library Group: Development/Libraries @@ -75,6 +75,9 @@ %changelog +* Sat Feb 10 2007 Jef Spaleta 0.90.0-2 +- Release bump for rebuild against new tk + * Fri Feb 09 2007 Orion Poplawski 0.90.0-1 - Update to 0.90.0 From fedora-extras-commits at redhat.com Sat Feb 10 19:35:45 2007 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 10 Feb 2007 14:35:45 -0500 Subject: rpms/eventlog/FC-6 eventlog.spec,1.3,1.4 Message-ID: <200702101935.l1AJZjXg032205@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/eventlog/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32155/FC-6 Modified Files: eventlog.spec Log Message: Sync with devel. Index: eventlog.spec =================================================================== RCS file: /cvs/extras/rpms/eventlog/FC-6/eventlog.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- eventlog.spec 4 Oct 2006 22:24:30 -0000 1.3 +++ eventlog.spec 10 Feb 2007 19:35:13 -0000 1.4 @@ -1,6 +1,6 @@ Name: eventlog Version: 0.2.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Syslog-ng v2 support library Group: System Environment/Libraries @@ -38,6 +38,15 @@ This package contains the development files. +%package static +Summary: Eventlog static library +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} + +%description static +The eventlog-static package includes the eventlog static library. + + %prep %setup -q @@ -69,15 +78,21 @@ %files devel %defattr(-,root,root,-) %doc doc/* -%{_libdir}/libevtlog.a %{_libdir}/libevtlog.so %{_libdir}/pkgconfig/eventlog.pc %{_includedir}/%{name}/ +%files static +%defattr(-,root,root,-) +%{_libdir}/libevtlog.a + %changelog +* Sat Feb 10 2007 Jose Pedro Oliveira - 0.2.5-3 +- Create a -static subpackage. + * Thu Oct 05 2006 Christian Iseli 0.2.5-2 - - rebuilt for unwind info generation, broken in gcc-4.1.1-21 +- rebuilt for unwind info generation, broken in gcc-4.1.1-21 * Sun Jul 16 2006 Jose Pedro Oliveira - 0.2.5-1 - Update to 0.25. From fedora-extras-commits at redhat.com Sat Feb 10 19:35:43 2007 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 10 Feb 2007 14:35:43 -0500 Subject: rpms/eventlog/FC-5 eventlog.spec,1.2,1.3 Message-ID: <200702101935.l1AJZhbA032202@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/eventlog/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32155/FC-5 Modified Files: eventlog.spec Log Message: Sync with devel. Index: eventlog.spec =================================================================== RCS file: /cvs/extras/rpms/eventlog/FC-5/eventlog.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- eventlog.spec 23 Sep 2006 18:43:33 -0000 1.2 +++ eventlog.spec 10 Feb 2007 19:35:10 -0000 1.3 @@ -1,6 +1,6 @@ Name: eventlog Version: 0.2.5 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Syslog-ng v2 support library Group: System Environment/Libraries @@ -38,6 +38,15 @@ This package contains the development files. +%package static +Summary: Eventlog static library +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} + +%description static +The eventlog-static package includes the eventlog static library. + + %prep %setup -q @@ -69,13 +78,22 @@ %files devel %defattr(-,root,root,-) %doc doc/* -%{_libdir}/libevtlog.a %{_libdir}/libevtlog.so %{_libdir}/pkgconfig/eventlog.pc %{_includedir}/%{name}/ +%files static +%defattr(-,root,root,-) +%{_libdir}/libevtlog.a + %changelog +* Sat Feb 10 2007 Jose Pedro Oliveira - 0.2.5-3 +- Create a -static subpackage. + +* Thu Oct 05 2006 Christian Iseli 0.2.5-2 +- rebuilt for unwind info generation, broken in gcc-4.1.1-21 + * Sun Jul 16 2006 Jose Pedro Oliveira - 0.2.5-1 - Update to 0.25. From fedora-extras-commits at redhat.com Sat Feb 10 20:48:27 2007 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Sat, 10 Feb 2007 15:48:27 -0500 Subject: rpms/emacs-vm/FC-6 .cvsignore, 1.3, 1.4 emacs-vm.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200702102048.l1AKmRRh003696@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-vm/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3674 Modified Files: .cvsignore emacs-vm.spec sources Log Message: * Sat Feb 10 2007 Jonathan G. Underwood - 7.19-7 - Added pgg*.el from Emacs 22 CVS - Added u-vm-color.el from http://de.geocities.com/ulf_jasper/emacs.html - Added vcard support from http://www.splode.com/users/friedman/software/emacs-lisp/ - Fixed name of info files in pre and post scripts Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/emacs-vm/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 Feb 2007 15:48:20 -0000 1.3 +++ .cvsignore 10 Feb 2007 20:47:55 -0000 1.4 @@ -1,2 +1,11 @@ vm-7.19.tar.gz vm-7.19.070203.patch.gz +pgg-def.el +pgg.el +pgg-gpg.el +pgg-parse.el +pgg-pgp5.el +pgg-pgp.el +u-vm-color.el +vcard.el +vm-vcard.el Index: emacs-vm.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-vm/FC-6/emacs-vm.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- emacs-vm.spec 3 Feb 2007 15:48:20 -0000 1.3 +++ emacs-vm.spec 10 Feb 2007 20:47:55 -0000 1.4 @@ -1,30 +1,43 @@ # Upstream vm (http://www.wonderworks.com/vm/) seems to be currently -# unmaintained. This package adds the patchset maintained by Robert -# Widhopf-Fenk -# (http://www.robf.de/Hacking/elisp/vm-7.19.patch.gz). Unfortunately, -# the patch set version number is not updated with each release, so I -# have manually added a minor version number to the patch -# .YYMMDD. Some functionality of the patch is currently unavailable, -# namely that associated with pgg.el (only available on emacs >=22) is -# only available on FC>6. Currently, since bbdb and grepmail are not -# packaged, functionality associated with those is also not available. -# More details at http://www.robf.de/Hacking/elisp/ +# unmaintained. This package adds the patchset maintained by Robert Widhopf-Fenk +# (http://www.robf.de/Hacking/elisp/vm-7.19.patch.gz).I have manually added a +# minor version number to the patch (YYMMDD) to indicate when it was downloaded. +# +# In order to make the PGP stuff work with GNU Emacs <22, I have pulled pgp*.el +# from the GNU Emacs CVS - see Source11-16. These were pulled from CVS on 10th +# February 2007. +# +# Vcard handling has been added - see Source21-22. These were pulled from +# http://www.splode.com/users/friedman/software/emacs-lisp/ on 10th February +# 2007. +# +# Font-lock support of message bodies was added (Source31) from +# http://de.geocities.com/ulf_jasper/emacs.html on 10th February 2007. %define pkg vm Summary: Emacs VM mailreader Name: emacs-%{pkg} Version: 7.19 -Release: 5%{?dist} +Release: 7%{?dist} +License: GPL +Group: Applications/Internet URL: http://www.wonderworks.com/vm/ Source0: http://www.seanet.com/~kylemonger/vm/%{pkg}-%{version}.tar.gz +Source11: pgg.el +Source12: pgg-def.el +Source13: pgg-gpg.el +Source14: pgg-parse.el +Source15: pgg-pgp.el +Source16: pgg-pgp5.el +Source21: vcard.el +Source22: vm-vcard.el +Source31: u-vm-color.el Patch0: vm-7.19.070203.patch.gz -License: GPL -Group: Applications/Internet -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: emacs Requires(pre): /sbin/install-info Requires(post): /sbin/install-info +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: emacs texinfo %description @@ -34,8 +47,11 @@ messages to folders, deleting messages and so on. There are other more advanced commands that do tasks like bursting and creating digests, message forwarding, and organizing message presentation -according to various criteria. This package includes Robert -widhopf-Fenk's patchset (http://www.robf.de/Hacking/elisp/). +according to various criteria. + +This package includes Robert widhopf-Fenk's patchset +(http://www.robf.de/Hacking/elisp/). Please read that webpage to find +out how to configure the extra features offered by that patchset. %package el Group: Applications/Internet @@ -48,10 +64,21 @@ %prep %setup -q -n %{pkg}-%{version} + %patch0 -p1 mv Makefile Makefile.bk sed -e 's/mkdirhier/mkdir -p/g' Makefile.bk > Makefile +cp %{SOURCE11} . +cp %{SOURCE12} . +cp %{SOURCE13} . +cp %{SOURCE14} . +cp %{SOURCE15} . +cp %{SOURCE16} . +cp %{SOURCE21} . +cp %{SOURCE22} . +cp %{SOURCE31} . + %build %define pkgdir %{_datadir}/emacs/site-lisp/vm %define pixmapdir %{pkgdir}/pixmaps @@ -93,6 +120,11 @@ (autoload 'vm-mode "vm" "Run VM major mode on a buffer" t) (autoload 'vm-mail "vm" "Send a mail message using VM." t) (autoload 'vm-submit-bug-report "vm" "Send a bug report about VM." t) + +;; Settings for u-vm-color.el +(require 'u-vm-color) +(add-hook 'vm-summary-mode-hook 'u-vm-color-summary-mode) +(add-hook 'vm-select-message-hook 'u-vm-color-fontify-buffer) EOF %clean @@ -102,11 +134,11 @@ # Without the --entry part here, we get a malformed entry in info. /sbin/install-info \ --entry="* VM: (vm). An Emacs mailreader" \ - %{_infodir}/%{name}.info.gz %{_infodir}/dir 2>/dev/null || : + %{_infodir}/vm.info.gz %{_infodir}/dir 2>/dev/null || : %preun if [ "$1" = "0" ] ; then - /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir 2>/dev/null || : + /sbin/install-info --delete %{_infodir}/vm.info.gz %{_infodir}/dir 2>/dev/null || : fi %files @@ -124,6 +156,12 @@ %{pkgdir}/*.el %changelog +* Sat Feb 10 2007 Jonathan G. Underwood - 7.19-7 +- Added pgg*.el from Emacs 22 CVS +- Added u-vm-color.el from http://de.geocities.com/ulf_jasper/emacs.html +- Added vcard support from http://www.splode.com/users/friedman/software/emacs-lisp/ +- Fixed name of info files in pre and post scripts + * Sat Feb 3 2007 Jonathan G. Underwood - 7.19-5 - Add patch from http://www.robf.de/Hacking/elisp/ (resolves bug 224501) - Ensure CFLAGS="$RPM_OPT_FLAGS" (bug 225101) Index: sources =================================================================== RCS file: /cvs/extras/rpms/emacs-vm/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Feb 2007 15:48:20 -0000 1.3 +++ sources 10 Feb 2007 20:47:55 -0000 1.4 @@ -1,2 +1,11 @@ 7866f6243e398d76ae32356a4af76fa3 vm-7.19.tar.gz fadfef52b6b8eded9a84afdcd0282de9 vm-7.19.070203.patch.gz +13f1830392aeba72443483fa8d8d60ae pgg-def.el +e74a78646320b62299925eb60f89c0a7 pgg.el +6f9c568414e4871dea5af2c059d87a1d pgg-gpg.el +dd1ef66498597788cd7ecb32e4d079ed pgg-parse.el +0fbd82bb43a1136210c11fcb34aa0768 pgg-pgp5.el +b2c210f93534a9b8c342439d43629827 pgg-pgp.el +55a7c54b0de0959550675c18016073a1 u-vm-color.el +1ae781a8e5565b5ba88b74a507a84822 vcard.el +e7269b9591ba0378f445097e494e312c vm-vcard.el From fedora-extras-commits at redhat.com Sat Feb 10 20:50:51 2007 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Sat, 10 Feb 2007 15:50:51 -0500 Subject: rpms/emacs-vm/FC-5 .cvsignore, 1.3, 1.4 emacs-vm.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200702102050.l1AKopoH003792@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-vm/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3764 Modified Files: .cvsignore emacs-vm.spec sources Log Message: * Sat Feb 10 2007 Jonathan G. Underwood - 7.19-7 - Added pgg*.el from Emacs 22 CVS - Added u-vm-color.el from http://de.geocities.com/ulf_jasper/emacs.html - Added vcard support from http://www.splode.com/users/friedman/software/emacs-lisp/ - Fixed name of info files in pre and post scripts Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/emacs-vm/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 Feb 2007 15:45:14 -0000 1.3 +++ .cvsignore 10 Feb 2007 20:50:19 -0000 1.4 @@ -1,2 +1,11 @@ vm-7.19.tar.gz vm-7.19.070203.patch.gz +pgg-def.el +pgg.el +pgg-gpg.el +pgg-parse.el +pgg-pgp5.el +pgg-pgp.el +u-vm-color.el +vcard.el +vm-vcard.el Index: emacs-vm.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-vm/FC-5/emacs-vm.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- emacs-vm.spec 3 Feb 2007 15:45:14 -0000 1.2 +++ emacs-vm.spec 10 Feb 2007 20:50:19 -0000 1.3 @@ -1,30 +1,43 @@ # Upstream vm (http://www.wonderworks.com/vm/) seems to be currently -# unmaintained. This package adds the patchset maintained by Robert -# Widhopf-Fenk -# (http://www.robf.de/Hacking/elisp/vm-7.19.patch.gz). Unfortunately, -# the patch set version number is not updated with each release, so I -# have manually added a minor version number to the patch -# .YYMMDD. Some functionality of the patch is currently unavailable, -# namely that associated with pgg.el (only available on emacs >=22) is -# only available on FC>6. Currently, since bbdb and grepmail are not -# packaged, functionality associated with those is also not available. -# More details at http://www.robf.de/Hacking/elisp/ +# unmaintained. This package adds the patchset maintained by Robert Widhopf-Fenk +# (http://www.robf.de/Hacking/elisp/vm-7.19.patch.gz).I have manually added a +# minor version number to the patch (YYMMDD) to indicate when it was downloaded. +# +# In order to make the PGP stuff work with GNU Emacs <22, I have pulled pgp*.el +# from the GNU Emacs CVS - see Source11-16. These were pulled from CVS on 10th +# February 2007. +# +# Vcard handling has been added - see Source21-22. These were pulled from +# http://www.splode.com/users/friedman/software/emacs-lisp/ on 10th February +# 2007. +# +# Font-lock support of message bodies was added (Source31) from +# http://de.geocities.com/ulf_jasper/emacs.html on 10th February 2007. %define pkg vm Summary: Emacs VM mailreader Name: emacs-%{pkg} Version: 7.19 -Release: 5%{?dist} +Release: 7%{?dist} +License: GPL +Group: Applications/Internet URL: http://www.wonderworks.com/vm/ Source0: http://www.seanet.com/~kylemonger/vm/%{pkg}-%{version}.tar.gz +Source11: pgg.el +Source12: pgg-def.el +Source13: pgg-gpg.el +Source14: pgg-parse.el +Source15: pgg-pgp.el +Source16: pgg-pgp5.el +Source21: vcard.el +Source22: vm-vcard.el +Source31: u-vm-color.el Patch0: vm-7.19.070203.patch.gz -License: GPL -Group: Applications/Internet -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: emacs Requires(pre): /sbin/install-info Requires(post): /sbin/install-info +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: emacs texinfo %description @@ -34,8 +47,11 @@ messages to folders, deleting messages and so on. There are other more advanced commands that do tasks like bursting and creating digests, message forwarding, and organizing message presentation -according to various criteria. This package includes Robert -widhopf-Fenk's patchset (http://www.robf.de/Hacking/elisp/). +according to various criteria. + +This package includes Robert widhopf-Fenk's patchset +(http://www.robf.de/Hacking/elisp/). Please read that webpage to find +out how to configure the extra features offered by that patchset. %package el Group: Applications/Internet @@ -48,10 +64,21 @@ %prep %setup -q -n %{pkg}-%{version} + %patch0 -p1 mv Makefile Makefile.bk sed -e 's/mkdirhier/mkdir -p/g' Makefile.bk > Makefile +cp %{SOURCE11} . +cp %{SOURCE12} . +cp %{SOURCE13} . +cp %{SOURCE14} . +cp %{SOURCE15} . +cp %{SOURCE16} . +cp %{SOURCE21} . +cp %{SOURCE22} . +cp %{SOURCE31} . + %build %define pkgdir %{_datadir}/emacs/site-lisp/vm %define pixmapdir %{pkgdir}/pixmaps @@ -93,6 +120,11 @@ (autoload 'vm-mode "vm" "Run VM major mode on a buffer" t) (autoload 'vm-mail "vm" "Send a mail message using VM." t) (autoload 'vm-submit-bug-report "vm" "Send a bug report about VM." t) + +;; Settings for u-vm-color.el +(require 'u-vm-color) +(add-hook 'vm-summary-mode-hook 'u-vm-color-summary-mode) +(add-hook 'vm-select-message-hook 'u-vm-color-fontify-buffer) EOF %clean @@ -102,11 +134,11 @@ # Without the --entry part here, we get a malformed entry in info. /sbin/install-info \ --entry="* VM: (vm). An Emacs mailreader" \ - %{_infodir}/%{name}.info.gz %{_infodir}/dir 2>/dev/null || : + %{_infodir}/vm.info.gz %{_infodir}/dir 2>/dev/null || : %preun if [ "$1" = "0" ] ; then - /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir 2>/dev/null || : + /sbin/install-info --delete %{_infodir}/vm.info.gz %{_infodir}/dir 2>/dev/null || : fi %files @@ -124,6 +156,12 @@ %{pkgdir}/*.el %changelog +* Sat Feb 10 2007 Jonathan G. Underwood - 7.19-7 +- Added pgg*.el from Emacs 22 CVS +- Added u-vm-color.el from http://de.geocities.com/ulf_jasper/emacs.html +- Added vcard support from http://www.splode.com/users/friedman/software/emacs-lisp/ +- Fixed name of info files in pre and post scripts + * Sat Feb 3 2007 Jonathan G. Underwood - 7.19-5 - Add patch from http://www.robf.de/Hacking/elisp/ (resolves bug 224501) - Ensure CFLAGS="$RPM_OPT_FLAGS" (bug 225101) Index: sources =================================================================== RCS file: /cvs/extras/rpms/emacs-vm/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Feb 2007 15:45:14 -0000 1.3 +++ sources 10 Feb 2007 20:50:19 -0000 1.4 @@ -1,2 +1,11 @@ 7866f6243e398d76ae32356a4af76fa3 vm-7.19.tar.gz fadfef52b6b8eded9a84afdcd0282de9 vm-7.19.070203.patch.gz +13f1830392aeba72443483fa8d8d60ae pgg-def.el +e74a78646320b62299925eb60f89c0a7 pgg.el +6f9c568414e4871dea5af2c059d87a1d pgg-gpg.el +dd1ef66498597788cd7ecb32e4d079ed pgg-parse.el +0fbd82bb43a1136210c11fcb34aa0768 pgg-pgp5.el +b2c210f93534a9b8c342439d43629827 pgg-pgp.el +55a7c54b0de0959550675c18016073a1 u-vm-color.el +1ae781a8e5565b5ba88b74a507a84822 vcard.el +e7269b9591ba0378f445097e494e312c vm-vcard.el From fedora-extras-commits at redhat.com Sat Feb 10 20:54:50 2007 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Sat, 10 Feb 2007 15:54:50 -0500 Subject: rpms/emacs-vm/devel .cvsignore, 1.3, 1.4 emacs-vm.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200702102054.l1AKsoac003902@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-vm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3872 Modified Files: .cvsignore emacs-vm.spec sources Log Message: * Sat Feb 10 2007 Jonathan G. Underwood - 7.19-8 - Added u-vm-color.el from http://de.geocities.com/ulf_jasper/emacs.html - Added vcard support from http://www.splode.com/users/friedman/software/emacs-lisp/ - Fixed name of info files in pre and post scripts Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/emacs-vm/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 Feb 2007 15:49:56 -0000 1.3 +++ .cvsignore 10 Feb 2007 20:54:18 -0000 1.4 @@ -1,2 +1,5 @@ vm-7.19.tar.gz vm-7.19.070203.patch.gz +u-vm-color.el +vcard.el +vm-vcard.el Index: emacs-vm.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-vm/devel/emacs-vm.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- emacs-vm.spec 3 Feb 2007 15:49:56 -0000 1.3 +++ emacs-vm.spec 10 Feb 2007 20:54:18 -0000 1.4 @@ -1,30 +1,33 @@ # Upstream vm (http://www.wonderworks.com/vm/) seems to be currently -# unmaintained. This package adds the patchset maintained by Robert -# Widhopf-Fenk -# (http://www.robf.de/Hacking/elisp/vm-7.19.patch.gz). Unfortunately, -# the patch set version number is not updated with each release, so I -# have manually added a minor version number to the patch -# .YYMMDD. Some functionality of the patch is currently unavailable, -# namely that associated with pgg.el (only available on emacs >=22) is -# only available on FC>6. Currently, since bbdb and grepmail are not -# packaged, functionality associated with those is also not available. -# More details at http://www.robf.de/Hacking/elisp/ +# unmaintained. This package adds the patchset maintained by Robert Widhopf-Fenk +# (http://www.robf.de/Hacking/elisp/vm-7.19.patch.gz).I have manually added a +# minor version number to the patch (YYMMDD) to indicate when it was downloaded. +# +# Vcard handling has been added - see Source21-22. These were pulled from +# http://www.splode.com/users/friedman/software/emacs-lisp/ on 10th February +# 2007. +# +# Font-lock support of message bodies was added (Source31) from +# http://de.geocities.com/ulf_jasper/emacs.html on 10th February 2007. %define pkg vm Summary: Emacs VM mailreader Name: emacs-%{pkg} Version: 7.19 -Release: 5%{?dist} +Release: 8%{?dist} +License: GPL +Group: Applications/Internet URL: http://www.wonderworks.com/vm/ Source0: http://www.seanet.com/~kylemonger/vm/%{pkg}-%{version}.tar.gz +Source21: vcard.el +Source22: vm-vcard.el +Source31: u-vm-color.el Patch0: vm-7.19.070203.patch.gz -License: GPL -Group: Applications/Internet -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: emacs Requires(pre): /sbin/install-info Requires(post): /sbin/install-info +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: emacs texinfo %description @@ -34,8 +37,11 @@ messages to folders, deleting messages and so on. There are other more advanced commands that do tasks like bursting and creating digests, message forwarding, and organizing message presentation -according to various criteria. This package includes Robert -widhopf-Fenk's patchset (http://www.robf.de/Hacking/elisp/). +according to various criteria. + +This package includes Robert widhopf-Fenk's patchset +(http://www.robf.de/Hacking/elisp/). Please read that webpage to find +out how to configure the extra features offered by that patchset. %package el Group: Applications/Internet @@ -48,10 +54,15 @@ %prep %setup -q -n %{pkg}-%{version} + %patch0 -p1 mv Makefile Makefile.bk sed -e 's/mkdirhier/mkdir -p/g' Makefile.bk > Makefile +cp %{SOURCE21} . +cp %{SOURCE22} . +cp %{SOURCE31} . + %build %define pkgdir %{_datadir}/emacs/site-lisp/vm %define pixmapdir %{pkgdir}/pixmaps @@ -93,6 +104,11 @@ (autoload 'vm-mode "vm" "Run VM major mode on a buffer" t) (autoload 'vm-mail "vm" "Send a mail message using VM." t) (autoload 'vm-submit-bug-report "vm" "Send a bug report about VM." t) + +;; Settings for u-vm-color.el +(require 'u-vm-color) +(add-hook 'vm-summary-mode-hook 'u-vm-color-summary-mode) +(add-hook 'vm-select-message-hook 'u-vm-color-fontify-buffer) EOF %clean @@ -102,11 +118,11 @@ # Without the --entry part here, we get a malformed entry in info. /sbin/install-info \ --entry="* VM: (vm). An Emacs mailreader" \ - %{_infodir}/%{name}.info.gz %{_infodir}/dir 2>/dev/null || : + %{_infodir}/vm.info.gz %{_infodir}/dir 2>/dev/null || : %preun if [ "$1" = "0" ] ; then - /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir 2>/dev/null || : + /sbin/install-info --delete %{_infodir}/vm.info.gz %{_infodir}/dir 2>/dev/null || : fi %files @@ -124,6 +140,11 @@ %{pkgdir}/*.el %changelog +* Sat Feb 10 2007 Jonathan G. Underwood - 7.19-8 +- Added u-vm-color.el from http://de.geocities.com/ulf_jasper/emacs.html +- Added vcard support from http://www.splode.com/users/friedman/software/emacs-lisp/ +- Fixed name of info files in pre and post scripts + * Sat Feb 3 2007 Jonathan G. Underwood - 7.19-5 - Add patch from http://www.robf.de/Hacking/elisp/ (resolves bug 224501) - Ensure CFLAGS="$RPM_OPT_FLAGS" (bug 225101) Index: sources =================================================================== RCS file: /cvs/extras/rpms/emacs-vm/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Feb 2007 15:49:56 -0000 1.3 +++ sources 10 Feb 2007 20:54:18 -0000 1.4 @@ -1,2 +1,5 @@ 7866f6243e398d76ae32356a4af76fa3 vm-7.19.tar.gz fadfef52b6b8eded9a84afdcd0282de9 vm-7.19.070203.patch.gz +55a7c54b0de0959550675c18016073a1 u-vm-color.el +1ae781a8e5565b5ba88b74a507a84822 vcard.el +e7269b9591ba0378f445097e494e312c vm-vcard.el From fedora-extras-commits at redhat.com Sun Feb 11 02:10:54 2007 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Sat, 10 Feb 2007 21:10:54 -0500 Subject: rpms/inkscape/FC-5 inkscape-0.44.1-psinput.patch, NONE, 1.1 inkscape-0.45-python.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 inkscape.spec, 1.31, 1.32 sources, 1.10, 1.11 Message-ID: <200702110210.l1B2AsYF025702@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/inkscape/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25667 Modified Files: .cvsignore inkscape.spec sources Added Files: inkscape-0.44.1-psinput.patch inkscape-0.45-python.patch Log Message: - Update to 0.45 - Enabled inkboard, perl and python extensions - Added patch for correct python autodetection - LaTex patch integrated upstreamed, removed - Some rpmlint cleanups inkscape-0.44.1-psinput.patch: --- NEW FILE inkscape-0.44.1-psinput.patch --- --- inkscape-0.44.1/share/extensions/ps_input.inx.orig 2006-12-06 11:47:27.000000000 +0100 +++ inkscape-0.44.1/share/extensions/ps_input.inx 2006-12-06 11:46:40.000000000 +0100 @@ -1,7 +1,6 @@ <_name>Postscript Input org.inkscape.input.ps - org.inkscape.input.sk pstoedit .ps @@ -11,7 +10,6 @@ org.inkscape.output.ps --- inkscape-0.44.1/share/extensions/eps_input.inx.orig 2006-12-06 12:19:56.000000000 +0100 +++ inkscape-0.44.1/share/extensions/eps_input.inx 2006-12-06 12:19:42.000000000 +0100 @@ -1,9 +1,8 @@ <_name>EPS Input org.inkscape.input.eps - org.inkscape.input.ps - gs - + pstoedit + .eps image/x-encapsulated-postscript <_filetypename>Encapsulated Postscript (*.eps) @@ -11,7 +10,6 @@ org.inkscape.output.eps inkscape-0.45-python.patch: --- NEW FILE inkscape-0.45-python.patch --- --- inkscape-0.45/configure.orig 2007-02-07 12:08:44.000000000 -0800 +++ inkscape-0.45/configure 2007-02-07 12:22:34.000000000 -0800 @@ -10769,7 +10769,7 @@ if test "$?" -gt "0"; then with_python="no" else - checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null` + checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('DBLIB'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null` if test "$?" -gt "0"; then with_python="no" else Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/inkscape/FC-5/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 7 Sep 2006 12:09:20 -0000 1.10 +++ .cvsignore 11 Feb 2007 02:10:21 -0000 1.11 @@ -1 +1 @@ -inkscape-0.44.1.tar.gz +inkscape-0.45.tar.gz Index: inkscape.spec =================================================================== RCS file: /cvs/extras/rpms/inkscape/FC-5/inkscape.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- inkscape.spec 7 Sep 2006 12:09:20 -0000 1.31 +++ inkscape.spec 11 Feb 2007 02:10:21 -0000 1.32 @@ -1,5 +1,7 @@ +%define _with_inkboard 1 + Name: inkscape -Version: 0.44.1 +Version: 0.45 Release: 1%{?dist} Summary: Vector-based drawing program using SVG @@ -7,6 +9,8 @@ License: GPL URL: http://inkscape.sourceforge.net/ Source0: http://download.sourceforge.net/inkscape/inkscape-%{version}.tar.gz +Patch0: inkscape-0.44.1-psinput.patch +Patch1: inkscape-0.45-python.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: atk-devel @@ -16,30 +20,26 @@ BuildRequires: gettext BuildRequires: gtkmm24-devel BuildRequires: gtkspell-devel -BuildRequires: libart_lgpl-devel >= 2.3.10 -BuildRequires: libgnomeprintui22-devel >= 2.2.0 BuildRequires: gnome-vfs2-devel >= 2.0 BuildRequires: libpng-devel >= 1.2 -BuildRequires: libsigc++20-devel -BuildRequires: libxml2-devel >= 2.4.24 -BuildRequires: libxslt-devel +BuildRequires: libsigc++20-devel >= 2.0.12 +BuildRequires: libxml2-devel >= 2.6.11 +BuildRequires: libxslt-devel >= 1.0.15 BuildRequires: pango-devel BuildRequires: pkgconfig -BuildRequires: lcms-devel >= 1.13 -BuildRequires: boost-devel >= 1.33.1 -%{?_with_perl: BuildRequires: perl-XML-Parser, perl-libxml-enno} -%{?_with_python: BuildRequires: python-devel} -%{?_with_inkboard: BuildRequires: loudmouth-devel >= 1.0} -%{?_with_gnomeprint: BuildRequires: libgnomeprint22-devel >= 2.2.0} +BuildRequires: lcms-devel >= 1.13 +BuildRequires: cairo-devel +BuildRequires: openssl-devel +BuildRequires: dos2unix +BuildRequires: perl-XML-Parser +BuildRequires: python-devel +%{?_with_inkboard:BuildRequires: loudmouth-devel >= 1.0} -Requires: pstoedit +Requires: pstoedit Requires(post): desktop-file-utils Requires(postun): desktop-file-utils -Provides: perl(SpSVG) -Provides: perl(SVG) - %description Inkscape is a vector-based drawing program, like CorelDraw?? or Adobe @@ -57,6 +57,11 @@ %prep %setup -q +%patch0 -p1 -b .psinput +%patch1 -p1 -b .python +find -type f -regex '.*\.\(cpp\|h\)' -perm +111 -exec chmod -x {} ';' +find share/extensions/ -type f -regex '.*\.py' -perm +111 -exec chmod -x {} ';' +dos2unix share/extensions/*.py %build @@ -64,20 +69,11 @@ --disable-dependency-tracking \ --with-xinerama \ --enable-static=no \ -%if "%{?_with_python}" --with-python \ -%endif -%if "%{?_with_perl}" --with-perl \ -%endif --with-gnome-vfs \ --with-inkjar \ -%if "%{?_with_inkboard}" --enable-inkboard \ -%endif -%if "%{?_with_gnomeprint}" ---with-gnome-print \ -%endif --enable-lcms make %{?_smp_mflags} @@ -89,6 +85,9 @@ %find_lang %{name} find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' +rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/outline2svg.* +rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/txt2svg.* + desktop-file-install --vendor fedora --delete-original \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ @@ -119,6 +118,13 @@ %changelog +* Sat Feb 10 2007 Denis Leroy - 0.45-1 +- Update to 0.45 +- Enabled inkboard, perl and python extensions +- Added patch for correct python autodetection +- LaTex patch integrated upstreamed, removed +- Some rpmlint cleanups + * Thu Sep 7 2006 Denis Leroy - 0.44.1-1 - Update to 0.44.1 - Removed png export patch, integrated upstream Index: sources =================================================================== RCS file: /cvs/extras/rpms/inkscape/FC-5/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 7 Sep 2006 12:09:20 -0000 1.10 +++ sources 11 Feb 2007 02:10:21 -0000 1.11 @@ -1 +1 @@ -ae2929f70403004038963ef2448728f3 inkscape-0.44.1.tar.gz +82d7cff90a7de42460e65d289e0d4d33 inkscape-0.45.tar.gz From fedora-extras-commits at redhat.com Sun Feb 11 02:56:04 2007 From: fedora-extras-commits at redhat.com (Ian Burrell (iburrell)) Date: Sat, 10 Feb 2007 21:56:04 -0500 Subject: rpms/perl-File-Next - New directory Message-ID: <200702110256.l1B2u4u2026070@cvs-int.fedora.redhat.com> Author: iburrell Update of /cvs/extras/rpms/perl-File-Next In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26065/perl-File-Next Log Message: Directory /cvs/extras/rpms/perl-File-Next added to the repository From fedora-extras-commits at redhat.com Sun Feb 11 02:56:11 2007 From: fedora-extras-commits at redhat.com (Ian Burrell (iburrell)) Date: Sat, 10 Feb 2007 21:56:11 -0500 Subject: rpms/perl-File-Next/devel - New directory Message-ID: <200702110256.l1B2uBFa026084@cvs-int.fedora.redhat.com> Author: iburrell Update of /cvs/extras/rpms/perl-File-Next/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26065/perl-File-Next/devel Log Message: Directory /cvs/extras/rpms/perl-File-Next/devel added to the repository From fedora-extras-commits at redhat.com Sun Feb 11 09:17:13 2007 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Sun, 11 Feb 2007 04:17:13 -0500 Subject: rpms/gpodder import.log,1.2,1.3 Message-ID: <200702110917.l1B9HDUw019565@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/gpodder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19529 Modified Files: import.log Log Message: auto-import gpodder-0.8.9-1.fc7 on branch devel from gpodder-0.8.9-1.fc7.src.rpm Updating to latest gpodder release Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gpodder/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 28 Dec 2006 05:46:02 -0000 1.2 +++ import.log 11 Feb 2007 09:16:41 -0000 1.3 @@ -1 +1,2 @@ gpodder-0_8_0-3_fc7:HEAD:gpodder-0.8.0-3.fc7.src.rpm:1167252899 +gpodder-0_8_9-1_fc7:HEAD:gpodder-0.8.9-1.fc7.src.rpm:1171185395 From fedora-extras-commits at redhat.com Sun Feb 11 09:17:16 2007 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Sun, 11 Feb 2007 04:17:16 -0500 Subject: rpms/gpodder/devel .cvsignore, 1.2, 1.3 gpodder.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200702110917.l1B9HGw2019570@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/gpodder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19529/devel Modified Files: .cvsignore gpodder.spec sources Log Message: auto-import gpodder-0.8.9-1.fc7 on branch devel from gpodder-0.8.9-1.fc7.src.rpm Updating to latest gpodder release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gpodder/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Dec 2006 05:46:03 -0000 1.2 +++ .cvsignore 11 Feb 2007 09:16:44 -0000 1.3 @@ -1 +1 @@ -gpodder-0.8.0.tar.gz +gpodder-0.8.9.tar.gz Index: gpodder.spec =================================================================== RCS file: /cvs/extras/rpms/gpodder/devel/gpodder.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gpodder.spec 28 Dec 2006 05:46:03 -0000 1.1 +++ gpodder.spec 11 Feb 2007 09:16:44 -0000 1.2 @@ -2,8 +2,8 @@ Name: gpodder -Version: 0.8.0 -Release: 3%{?dist} +Version: 0.8.9 +Release: 1%{?dist} Summary: Podcast receiver/catcher written in Python Group: Applications/Multimedia @@ -12,7 +12,7 @@ Source0: http://perli.net/projekte/gpodder/releases/0.8.0/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: python-devel +BuildRequires: python-devel ImageMagick BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: intltool @@ -58,9 +58,13 @@ %{_datadir}/%{name}/ %{_mandir}/man1/* %{_datadir}/applications/*.desktop +%{_datadir}/pixmaps/%{name}*.png %{python_sitelib}/%{name}/ %changelog +* Sun Feb 11 2007 Jef Spaleta 0.8.9-1 +- Update to 0.8.9 release and adjust specfile accordingly + * Wed Dec 27 2006 Jef Spaleta 0.8.0-3 - Rmove X-Fedora-Extras Category and python dependancy as per review comments Index: sources =================================================================== RCS file: /cvs/extras/rpms/gpodder/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Dec 2006 05:46:03 -0000 1.2 +++ sources 11 Feb 2007 09:16:44 -0000 1.3 @@ -1 +1 @@ -8c58c613d049bd2387e09876c574ebf9 gpodder-0.8.0.tar.gz +f2bd0d00c9a6503242ff9ecc96b3ea48 gpodder-0.8.9.tar.gz From fedora-extras-commits at redhat.com Sun Feb 11 10:31:01 2007 From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar)) Date: Sun, 11 Feb 2007 05:31:01 -0500 Subject: rpms/listen/devel listen.spec,1.21,1.22 Message-ID: <200702111031.l1BAV1ea012130@cvs-int.fedora.redhat.com> Author: hguemar Update of /cvs/extras/rpms/listen/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12093 Modified Files: listen.spec Log Message: Updated to svn657 (improved python 2.5) support Index: listen.spec =================================================================== RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- listen.spec 14 Dec 2006 19:36:03 -0000 1.21 +++ listen.spec 11 Feb 2007 10:30:29 -0000 1.22 @@ -1,27 +1,22 @@ +%define real_name listen-snapshot-r657 Name: listen Version: 0.5 -Release: 10.beta1%{?dist}.4 +Release: 12.svn657%{?dist} Summary: A music manager and player for GNOME Group: Applications/Multimedia License: GPL URL: http://listengnome.free.fr -Source0: %name-%{version}b1.tar.gz -Patch0: Makefile.patch -Patch1: check.py.patch -Patch2: const.py.patch -Patch3: dialog.py.patch -BuildRoot: %{_tmppath}/%{name}-%{version}b1-%{release}-root-%(%{__id_u} -n) +Source0: %{real_name}.tar.bz2 +Patch0: %{name}-gecko.patch +BuildRoot: %{_tmppath}/%{name}-%{real_name}-root-%(%{__id_u} -n) +Buildrequires: python-devel >= 2.4 - -Buildrequires: python-devel -# python-ctypes included in python 2.5.x -#BuildRequires: python-ctypes -BuildRequires: python-mutagen >= 1.6 +BuildRequires: python-mutagen >= 1.8 BuildRequires: python-sqlite2 BuildRequires: dbus-python -BuildRequires: pygtk2-devel -BuildRequires: gtk2-devel +BuildRequires: pygtk2-devel >= 2.8 +BuildRequires: gtk2-devel >= 2.8 BuildRequires: gstreamer-python BuildRequires: gnome-python2 BuildRequires: gnome-python2-extras @@ -34,6 +29,7 @@ Buildrequires: xorg-x11-fonts-base Buildrequires: xorg-x11-fonts-misc Buildrequires: docbook2X +Buildrequires: intltool >= 0.35 BuildRequires: gettext Buildrequires: pkgconfig BuildRequires: desktop-file-utils @@ -41,12 +37,11 @@ Requires(postun): /sbin/ldconfig # added explicit Requires -Requires: python -Requires: python-ctypes -Requires: python-mutagen >= 1.6 +Requires: python >= 2.4 +Requires: python-mutagen >= 1.8 Requires: python-sqlite2 Requires: dbus-python -Requires: pygtk2 +Requires: pygtk2 >= 2.8 Requires: gstreamer-python Requires: gnome-python2 Requires: gnome-python2-extras @@ -62,6 +57,14 @@ # optional requires an updated libgpod package from Core #Requires: python-libgpod +# the workaround requires this +Requires: gecko-libs + +%ifarch x86_64 ia64 ppc64 s390x +%define gre_conf_file gre64.conf +%else +%define gre_conf_file gre.conf +%endif %description Listen is a music manager and player for GNOME @@ -88,15 +91,12 @@ %prep -%setup -q -n %{name}-%{version}b1 -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%ifarch x86_64 +%setup -q -n build/%{real_name} +%{__sed} -i 's/python2.4/python/' src/listen.py +%patch0 -p0 +%{__sed} -i 's at GRE_CONF_FILE@/etc/gre.d/%{gre_conf_file}@' src/widget/mozembed_wrap.py # correct path issue on x86_64 box -%{__sed} -i 's/= \/lib/= \/lib64/' Makefile -%endif +%{__sed} -i 's/= \/lib/= \/%{_lib}/' Makefile %build # (misc) for import gtk, as gtk requires a X server to be imported @@ -146,11 +146,19 @@ %{_datadir}/%{name}/ %{_datadir}/pixmaps/%{name}.png %{_datadir}/applications/*.desktop +%{_datadir}/dbus-1/services/org.gnome.Listen.service +%{_mandir}/man1/listen.1.gz + %changelog -* Thu Dec 14 2006 Ha??kel Gu??mar 0.5-10.beta1 -- removed python-ctypes as BR as it is now included in mainstream -python 2.5.x +* Sat Feb 10 2007 Ha??kel Gu??mar 0.5-12.svn657 +- Updated to svn (better python 2.5 support) + +* Sat Jan 13 2007 Remi Collet - 0.5-11.beta1 +- Change workaround to use /etc/gre.d/gre.conf + +* Fri Jan 11 2007 Ha??kel Gu??mar 0.5-10.beta1 +- workaround to prevent listen crashing when using gtkmozembed widget * Mon Nov 13 2006 Ha??kel Gu??mar 0.5-9.beta1 - Fixed build issue @@ -200,3 +208,4 @@ + From fedora-extras-commits at redhat.com Sun Feb 11 10:37:44 2007 From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar)) Date: Sun, 11 Feb 2007 05:37:44 -0500 Subject: rpms/listen/devel .cvsignore,1.4,1.5 sources,1.5,1.6 Message-ID: <200702111037.l1BAbiwR012232@cvs-int.fedora.redhat.com> Author: hguemar Update of /cvs/extras/rpms/listen/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12213 Modified Files: .cvsignore sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/listen/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 14 Nov 2006 14:13:35 -0000 1.4 +++ .cvsignore 11 Feb 2007 10:37:11 -0000 1.5 @@ -1 +1 @@ -listen-0.5b1.tar.gz +listen-snapshot-r657.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/listen/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 14 Nov 2006 14:13:35 -0000 1.5 +++ sources 11 Feb 2007 10:37:11 -0000 1.6 @@ -1 +1 @@ -9dd7b4252ccdddc44199ac0820ac4b91 listen-0.5b1.tar.gz +bae2044f71521ce0d4ed017bfcbeffc2 listen-snapshot-r657.tar.bz2 From fedora-extras-commits at redhat.com Sun Feb 11 10:41:01 2007 From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar)) Date: Sun, 11 Feb 2007 05:41:01 -0500 Subject: rpms/listen/devel listen-gecko.patch,NONE,1.1 Message-ID: <200702111041.l1BAf1NO012331@cvs-int.fedora.redhat.com> Author: hguemar Update of /cvs/extras/rpms/listen/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12318 Added Files: listen-gecko.patch Log Message: Add listen-gecko.patch fix listen-gecko.patch: --- NEW FILE listen-gecko.patch --- --- src/widget/mozembed_wrap.py.orig 2007-01-13 11:56:03.000000000 +0100 +++ src/widget/mozembed_wrap.py 2007-01-13 12:01:13.000000000 +0100 @@ -22,6 +22,15 @@ import gtkmozembed import const +import ConfigParser + +try: + cf = ConfigParser.ConfigParser() + cf.read('GRE_CONF_FILE') + comp_path=cf.get(cf.sections()[0], 'GRE_PATH') + gtkmozembed.set_comp_path(comp_path) +except: + print "** Cannot locate GECKO installation dir **\n" gtkmozembed.set_profile_path(const.CONFIG_DIR+"/mozembed/","listen") """ From fedora-extras-commits at redhat.com Sun Feb 11 11:02:50 2007 From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar)) Date: Sun, 11 Feb 2007 06:02:50 -0500 Subject: rpms/listen/devel listen.spec,1.22,1.23 Message-ID: <200702111102.l1BB2o6s015779@cvs-int.fedora.redhat.com> Author: hguemar Update of /cvs/extras/rpms/listen/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15755 Modified Files: listen.spec Log Message: x86_64 path issue fix Index: listen.spec =================================================================== RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- listen.spec 11 Feb 2007 10:30:29 -0000 1.22 +++ listen.spec 11 Feb 2007 11:02:18 -0000 1.23 @@ -1,7 +1,7 @@ %define real_name listen-snapshot-r657 Name: listen Version: 0.5 -Release: 12.svn657%{?dist} +Release: 12.svn657%{?dist}.1 Summary: A music manager and player for GNOME Group: Applications/Multimedia License: GPL @@ -96,7 +96,8 @@ %patch0 -p0 %{__sed} -i 's at GRE_CONF_FILE@/etc/gre.d/%{gre_conf_file}@' src/widget/mozembed_wrap.py # correct path issue on x86_64 box -%{__sed} -i 's/= \/lib/= \/%{_lib}/' Makefile +%{__sed} -i 's#/lib/#/lib64/#' Makefile + %build # (misc) for import gtk, as gtk requires a X server to be imported From fedora-extras-commits at redhat.com Sun Feb 11 11:14:27 2007 From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar)) Date: Sun, 11 Feb 2007 06:14:27 -0500 Subject: rpms/listen/devel listen.spec,1.23,1.24 Message-ID: <200702111114.l1BBERpf015887@cvs-int.fedora.redhat.com> Author: hguemar Update of /cvs/extras/rpms/listen/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15864 Modified Files: listen.spec Log Message: Silly maintainer had forgotten something Index: listen.spec =================================================================== RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- listen.spec 11 Feb 2007 11:02:18 -0000 1.23 +++ listen.spec 11 Feb 2007 11:13:54 -0000 1.24 @@ -1,7 +1,7 @@ %define real_name listen-snapshot-r657 Name: listen Version: 0.5 -Release: 12.svn657%{?dist}.1 +Release: 12.svn657%{?dist}.2 Summary: A music manager and player for GNOME Group: Applications/Multimedia License: GPL @@ -96,8 +96,9 @@ %patch0 -p0 %{__sed} -i 's at GRE_CONF_FILE@/etc/gre.d/%{gre_conf_file}@' src/widget/mozembed_wrap.py # correct path issue on x86_64 box +%ifarch x86_64 %{__sed} -i 's#/lib/#/lib64/#' Makefile - +%endif %build # (misc) for import gtk, as gtk requires a X server to be imported From fedora-extras-commits at redhat.com Sun Feb 11 11:18:19 2007 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Sun, 11 Feb 2007 06:18:19 -0500 Subject: rpms/libnetfilter_conntrack/devel .cvsignore, 1.3, 1.4 libnetfilter_conntrack.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200702111118.l1BBIJlh015960@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/libnetfilter_conntrack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15935 Modified Files: .cvsignore libnetfilter_conntrack.spec sources Log Message: libnetfilter_conntrack 0.0.50-1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libnetfilter_conntrack/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 16 Jul 2006 20:34:57 -0000 1.3 +++ .cvsignore 11 Feb 2007 11:17:47 -0000 1.4 @@ -1 +1 @@ -libnetfilter_conntrack-0.0.31.tar.bz2 +libnetfilter_conntrack-0.0.50.tar.bz2 Index: libnetfilter_conntrack.spec =================================================================== RCS file: /cvs/extras/rpms/libnetfilter_conntrack/devel/libnetfilter_conntrack.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libnetfilter_conntrack.spec 14 Sep 2006 21:16:12 -0000 1.3 +++ libnetfilter_conntrack.spec 11 Feb 2007 11:17:47 -0000 1.4 @@ -1,6 +1,6 @@ Name: libnetfilter_conntrack -Version: 0.0.31 -Release: 3%{?dist} +Version: 0.0.50 +Release: 1%{?dist} Summary: Netfilter conntrack userspace library Group: System Environment/Libraries License: GPL @@ -8,7 +8,7 @@ Source0: http://netfilter.org/projects/libnetfilter_conntrack/files/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libnfnetlink-devel +BuildRequires: libnfnetlink-devel, autoconf, automake, libtool, pkgconfig %description libnetfilter_conntrack is a userspace library providing a programming @@ -25,6 +25,7 @@ %prep %setup -q +autoreconf -i --force %build %configure --disable-static @@ -47,7 +48,7 @@ %{_libdir}/*.so.* %{_libdir}/libnetfilter_conntrack/*.so %{_bindir}/ctnl_test - +%{_bindir}/new_api_test %files devel %defattr(-,root,root,-) @@ -56,6 +57,9 @@ %{_includedir}/libnetfilter_conntrack/*.h %changelog +* Sun Feb 11 2007 Paul P. Komkoff Jr - 0.0.50-1 +- upstream version 0.0.50 + * Fri Sep 15 2006 Paul P. Komkoff Jr - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/libnetfilter_conntrack/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 16 Jul 2006 20:34:57 -0000 1.3 +++ sources 11 Feb 2007 11:17:47 -0000 1.4 @@ -1 +1 @@ -1871339b180b1b95a55517430bfb7d2b libnetfilter_conntrack-0.0.31.tar.bz2 +b22d7878ff86ba9e1193ec08c3cd5747 libnetfilter_conntrack-0.0.50.tar.bz2 From fedora-extras-commits at redhat.com Sun Feb 11 13:15:23 2007 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sun, 11 Feb 2007 08:15:23 -0500 Subject: rpms/boo import.log,1.6,1.7 Message-ID: <200702111315.l1BDFN7X027526@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/boo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27482 Modified Files: import.log Log Message: auto-import boo-0.7.6.2237-12 on branch devel from boo-0.7.6.2237-12.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/boo/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 7 Aug 2006 22:08:47 -0000 1.6 +++ import.log 11 Feb 2007 13:14:51 -0000 1.7 @@ -3,3 +3,4 @@ boo-0_7_6_2237-7:FC-5:boo-0.7.6.2237-7.src.rpm:1154036287 boo-0_7_6_2237-8:FC-5:boo-0.7.6.2237-8.src.rpm:1154988437 boo-0_7_6_2237-8:HEAD:boo-0.7.6.2237-8.src.rpm:1154988521 +boo-0_7_6_2237-12:HEAD:boo-0.7.6.2237-12.src.rpm:1171199678 From fedora-extras-commits at redhat.com Sun Feb 11 13:15:26 2007 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sun, 11 Feb 2007 08:15:26 -0500 Subject: rpms/boo/devel boo-libdir.patch,NONE,1.1 boo.spec,1.5,1.6 Message-ID: <200702111315.l1BDFQGH027529@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/boo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27482/devel Modified Files: boo.spec Added Files: boo-libdir.patch Log Message: auto-import boo-0.7.6.2237-12 on branch devel from boo-0.7.6.2237-12.src.rpm boo-libdir.patch: --- NEW FILE boo-libdir.patch --- --- boo-0.7.6.2237/configure.in.in 2005-08-12 18:43:59.000000000 +0100 +++ boo-0.7.6.2237/configure-new.in.in 2006-09-06 22:14:52.000000000 +0100 @@ -14,7 +14,7 @@ AC_PATH_PROG(GACUTIL, gacutil, no) -GACUTIL_FLAGS='/package $(PACKAGE) /gacdir $(DESTDIR)/$(prefix)/lib' +GACUTIL_FLAGS='/package $(PACKAGE) /gacdir $(DESTDIR)/$(libdir)' AC_SUBST(GACUTIL_FLAGS) AC_OUTPUT([ --- boo-0.7.6.2237/bin/Makefile.am 2006-04-04 22:45:36.000000000 +0100 +++ boo-0.7.6.2237/bin/Makefile-new.am 2006-09-06 22:16:36.000000000 +0100 @@ -1,4 +1,4 @@ -boodir = $(prefix)/lib/boo +boodir = ${libdir}/boo boo_DATA = booc.exe booi.exe booish.exe booc.rsp booc.exe.config booi.exe.config booish.exe.config BOO_GAC_DLLS = Boo.Lang.dll \ --- boo-0.7.6.2237/extras/boo.pc.in 2005-08-12 18:43:45.000000000 +0100 +++ boo-0.7.6.2237/extras/boo-new.pc.in 2006-09-06 22:18:20.000000000 +0100 @@ -1,6 +1,6 @@ prefix=@prefix@ exec_prefix=${prefix} -libdir=${prefix}/lib +libdir=${libdir} Name: Boo --- boo-0.7.6.2237/extras/Makefile.am 2005-08-12 18:43:45.000000000 +0100 +++ boo-0.7.6.2237/extras/Makefile-new.am 2006-09-06 22:19:03.000000000 +0100 @@ -1,4 +1,4 @@ -pkgconfigdir = $(prefix)/lib/pkgconfig +pkgconfigdir = ${libdir}/pkgconfig pkgconfig_DATA = boo.pc gtksourceviewdir = $(GTKSOURCEVIEW_PREFIX)/share/gtksourceview-1.0/language-specs/ --- boo-0.7.6.2237/extras/booish.in 2005-08-12 18:43:45.000000000 +0100 +++ boo-0.7.6.2237/extras/booish-new.in 2006-09-06 22:19:57.000000000 +0100 @@ -1,2 +1,2 @@ #!/bin/sh -env @RUNTIME@ @prefix@/lib/boo/booish.exe "$@" +env @RUNTIME@ ${libdir}/boo/booish.exe "$@" --- boo-0.7.6.2237/extras/booc.in 2005-08-12 18:43:45.000000000 +0100 +++ boo-0.7.6.2237/extras/booc-new.in 2006-09-06 22:20:45.000000000 +0100 @@ -1,2 +1,2 @@ #!/bin/sh -env @RUNTIME@ @prefix@/lib/boo/booc.exe "$@" +env @RUNTIME@ ${libdir}/boo/booc.exe "$@" --- boo-0.7.6.2237/extras/booi.in 2005-08-12 18:43:45.000000000 +0100 +++ boo-0.7.6.2237/extras/booi-new.in 2006-09-06 22:21:16.000000000 +0100 @@ -1,2 +1,2 @@ #!/bin/sh -env @RUNTIME@ @prefix@/lib/boo/booi.exe "$@" +env @RUNTIME@ ${libdir}/boo/booi.exe "$@" --- boo-0.7.6.2237/default.build.libdir 2007-02-11 10:40:57.000000000 +0100 +++ boo-0.7.6.2237/default.build 2007-02-11 10:43:46.000000000 +0100 @@ -108,7 +108,7 @@ - + @@ -142,7 +142,7 @@ - + @@ -230,7 +230,7 @@ - + Index: boo.spec =================================================================== RCS file: /cvs/extras/rpms/boo/devel/boo.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- boo.spec 20 Dec 2006 21:36:01 -0000 1.5 +++ boo.spec 11 Feb 2007 13:14:54 -0000 1.6 @@ -7,12 +7,13 @@ Summary: Boo is an OO statically typed language for CLI Name: boo Version: 0.7.6.2237 -Release: 11%{?dist} +Release: 12%{?dist} License: MIT Group: Development/Languages BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://boo.codehaus.org Source0: http://dist.codehaus.org/boo/distributions/%{name}-%{version}-src.tar.bz2 +Patch0: boo-libdir.patch BuildRequires: mono-devel, gtksourceview-devel, shared-mime-info, pkgconfig, nant %description @@ -30,6 +31,9 @@ %prep %setup -q +%if "%{?fedora}" > "5" +%patch0 -p1 -b .original +%endif %build nant -D:install.prefix=%{_prefix} -D:install.libdir=%{monodir} From fedora-extras-commits at redhat.com Sun Feb 11 13:16:57 2007 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sun, 11 Feb 2007 08:16:57 -0500 Subject: rpms/boo import.log,1.7,1.8 Message-ID: <200702111316.l1BDGvPI027626@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/boo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27589 Modified Files: import.log Log Message: auto-import boo-0.7.6.2237-12 on branch FC-6 from boo-0.7.6.2237-12.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/boo/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 11 Feb 2007 13:14:51 -0000 1.7 +++ import.log 11 Feb 2007 13:16:25 -0000 1.8 @@ -4,3 +4,4 @@ boo-0_7_6_2237-8:FC-5:boo-0.7.6.2237-8.src.rpm:1154988437 boo-0_7_6_2237-8:HEAD:boo-0.7.6.2237-8.src.rpm:1154988521 boo-0_7_6_2237-12:HEAD:boo-0.7.6.2237-12.src.rpm:1171199678 +boo-0_7_6_2237-12:FC-6:boo-0.7.6.2237-12.src.rpm:1171199772 From fedora-extras-commits at redhat.com Sun Feb 11 13:17:00 2007 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sun, 11 Feb 2007 08:17:00 -0500 Subject: rpms/boo/FC-6 boo-libdir.patch,NONE,1.1 boo.spec,1.5,1.6 Message-ID: <200702111317.l1BDH0Dm027629@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/boo/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27589/FC-6 Modified Files: boo.spec Added Files: boo-libdir.patch Log Message: auto-import boo-0.7.6.2237-12 on branch FC-6 from boo-0.7.6.2237-12.src.rpm boo-libdir.patch: --- NEW FILE boo-libdir.patch --- --- boo-0.7.6.2237/configure.in.in 2005-08-12 18:43:59.000000000 +0100 +++ boo-0.7.6.2237/configure-new.in.in 2006-09-06 22:14:52.000000000 +0100 @@ -14,7 +14,7 @@ AC_PATH_PROG(GACUTIL, gacutil, no) -GACUTIL_FLAGS='/package $(PACKAGE) /gacdir $(DESTDIR)/$(prefix)/lib' +GACUTIL_FLAGS='/package $(PACKAGE) /gacdir $(DESTDIR)/$(libdir)' AC_SUBST(GACUTIL_FLAGS) AC_OUTPUT([ --- boo-0.7.6.2237/bin/Makefile.am 2006-04-04 22:45:36.000000000 +0100 +++ boo-0.7.6.2237/bin/Makefile-new.am 2006-09-06 22:16:36.000000000 +0100 @@ -1,4 +1,4 @@ -boodir = $(prefix)/lib/boo +boodir = ${libdir}/boo boo_DATA = booc.exe booi.exe booish.exe booc.rsp booc.exe.config booi.exe.config booish.exe.config BOO_GAC_DLLS = Boo.Lang.dll \ --- boo-0.7.6.2237/extras/boo.pc.in 2005-08-12 18:43:45.000000000 +0100 +++ boo-0.7.6.2237/extras/boo-new.pc.in 2006-09-06 22:18:20.000000000 +0100 @@ -1,6 +1,6 @@ prefix=@prefix@ exec_prefix=${prefix} -libdir=${prefix}/lib +libdir=${libdir} Name: Boo --- boo-0.7.6.2237/extras/Makefile.am 2005-08-12 18:43:45.000000000 +0100 +++ boo-0.7.6.2237/extras/Makefile-new.am 2006-09-06 22:19:03.000000000 +0100 @@ -1,4 +1,4 @@ -pkgconfigdir = $(prefix)/lib/pkgconfig +pkgconfigdir = ${libdir}/pkgconfig pkgconfig_DATA = boo.pc gtksourceviewdir = $(GTKSOURCEVIEW_PREFIX)/share/gtksourceview-1.0/language-specs/ --- boo-0.7.6.2237/extras/booish.in 2005-08-12 18:43:45.000000000 +0100 +++ boo-0.7.6.2237/extras/booish-new.in 2006-09-06 22:19:57.000000000 +0100 @@ -1,2 +1,2 @@ #!/bin/sh -env @RUNTIME@ @prefix@/lib/boo/booish.exe "$@" +env @RUNTIME@ ${libdir}/boo/booish.exe "$@" --- boo-0.7.6.2237/extras/booc.in 2005-08-12 18:43:45.000000000 +0100 +++ boo-0.7.6.2237/extras/booc-new.in 2006-09-06 22:20:45.000000000 +0100 @@ -1,2 +1,2 @@ #!/bin/sh -env @RUNTIME@ @prefix@/lib/boo/booc.exe "$@" +env @RUNTIME@ ${libdir}/boo/booc.exe "$@" --- boo-0.7.6.2237/extras/booi.in 2005-08-12 18:43:45.000000000 +0100 +++ boo-0.7.6.2237/extras/booi-new.in 2006-09-06 22:21:16.000000000 +0100 @@ -1,2 +1,2 @@ #!/bin/sh -env @RUNTIME@ @prefix@/lib/boo/booi.exe "$@" +env @RUNTIME@ ${libdir}/boo/booi.exe "$@" --- boo-0.7.6.2237/default.build.libdir 2007-02-11 10:40:57.000000000 +0100 +++ boo-0.7.6.2237/default.build 2007-02-11 10:43:46.000000000 +0100 @@ -108,7 +108,7 @@ - + @@ -142,7 +142,7 @@ - + @@ -230,7 +230,7 @@ - + Index: boo.spec =================================================================== RCS file: /cvs/extras/rpms/boo/FC-6/boo.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- boo.spec 20 Dec 2006 21:34:35 -0000 1.5 +++ boo.spec 11 Feb 2007 13:16:28 -0000 1.6 @@ -7,12 +7,13 @@ Summary: Boo is an OO statically typed language for CLI Name: boo Version: 0.7.6.2237 -Release: 11%{?dist} +Release: 12%{?dist} License: MIT Group: Development/Languages BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://boo.codehaus.org Source0: http://dist.codehaus.org/boo/distributions/%{name}-%{version}-src.tar.bz2 +Patch0: boo-libdir.patch BuildRequires: mono-devel, gtksourceview-devel, shared-mime-info, pkgconfig, nant %description @@ -30,6 +31,9 @@ %prep %setup -q +%if "%{?fedora}" > "5" +%patch0 -p1 -b .original +%endif %build nant -D:install.prefix=%{_prefix} -D:install.libdir=%{monodir} From fedora-extras-commits at redhat.com Sun Feb 11 13:45:11 2007 From: fedora-extras-commits at redhat.com (Julian Sikorski (belegdol)) Date: Sun, 11 Feb 2007 08:45:11 -0500 Subject: rpms/chemical-mime-data/devel .cvsignore, 1.2, 1.3 chemical-mime-data.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200702111345.l1BDjB7G027997@cvs-int.fedora.redhat.com> Author: belegdol Update of /cvs/extras/rpms/chemical-mime-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27972 Modified Files: .cvsignore chemical-mime-data.spec sources Log Message: * Sun Feb 11 2007 Julian Sikorski - 0.1.94-1 - Updated to 0.1.94 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/chemical-mime-data/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 5 Dec 2006 07:32:31 -0000 1.2 +++ .cvsignore 11 Feb 2007 13:44:38 -0000 1.3 @@ -1 +1 @@ -chemical-mime-data-0.1.93.tar.bz2 +chemical-mime-data-0.1.94.tar.bz2 Index: chemical-mime-data.spec =================================================================== RCS file: /cvs/extras/rpms/chemical-mime-data/devel/chemical-mime-data.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- chemical-mime-data.spec 29 Jan 2007 15:23:20 -0000 1.3 +++ chemical-mime-data.spec 11 Feb 2007 13:44:38 -0000 1.4 @@ -1,6 +1,6 @@ Name: chemical-mime-data -Version: 0.1.93 -Release: 4%{?dist} +Version: 0.1.94 +Release: 1%{?dist} Summary: Support for chemical/* MIME types Group: System Environment/Libraries @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl-XML-Parser +BuildRequires: perl(XML::Parser) BuildRequires: libxml2 BuildRequires: libxslt BuildRequires: librsvg2 @@ -33,7 +33,7 @@ %build %configure --disable-update-database \ - --without-gnome2_4-mime \ + --without-gnome-mime \ --without-pixmaps make %{?_smp_mflags} @@ -41,6 +41,9 @@ %install rm -rf $RPM_BUILD_ROOT make INSTALL="install -p" install DESTDIR=$RPM_BUILD_ROOT +cp -pR $RPM_BUILD_ROOT%{_docdir}/%{name} __docs +rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name} +%find_lang %{name} %post update-mime-database %{_datadir}/mime &> /dev/null || : @@ -56,10 +59,10 @@ rm -rf $RPM_BUILD_ROOT -%files +%files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING HACKING NEWS README THANKS TODO -%{_datadir}/icons/crystalsvg +%doc __docs/* %{_datadir}/icons/hicolor/*/mimetypes/gnome-mime-chemical.png %{_datadir}/icons/hicolor/scalable/mimetypes/gnome-mime-chemical.svgz %{_datadir}/mime/packages/chemical-mime-data.xml @@ -68,6 +71,9 @@ %changelog +* Sun Feb 11 2007 Julian Sikorski - 0.1.94-1 +- Updated to 0.1.94 + * Mon Jan 29 2007 Ville Skytt?? - 0.1.93-4 - Install *.pc to %%{_datadir}/pkgconfig, change to noarch (#225095). Index: sources =================================================================== RCS file: /cvs/extras/rpms/chemical-mime-data/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 5 Dec 2006 07:32:31 -0000 1.2 +++ sources 11 Feb 2007 13:44:38 -0000 1.3 @@ -1 +1 @@ -22705a35c232cf46d3fcfa91ec748fa8 chemical-mime-data-0.1.93.tar.bz2 +51c6a94b71ccd1d53ce53199e91ef985 chemical-mime-data-0.1.94.tar.bz2 From fedora-extras-commits at redhat.com Sun Feb 11 14:06:08 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sun, 11 Feb 2007 09:06:08 -0500 Subject: rpms/manedit/devel manedit-0.8.1-allow-more_section.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 manedit.spec, 1.14, 1.15 sources, 1.5, 1.6 manedit-0.7.1-allow-more_section.patch, 1.1, NONE manedit-0.7.1-remove-some-warning.patch, 1.1, NONE Message-ID: <200702111406.l1BE68ZR031446@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/manedit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31420 Modified Files: .cvsignore manedit.spec sources Added Files: manedit-0.8.1-allow-more_section.patch Removed Files: manedit-0.7.1-allow-more_section.patch manedit-0.7.1-remove-some-warning.patch Log Message: * Sun Feb 11 2007 Mamoru Tasaka - 0.8.1-1 - 0.8.1 manedit-0.8.1-allow-more_section.patch: --- NEW FILE manedit-0.8.1-allow-more_section.patch --- --- manedit-0.8.1/manedit/editorcb.c.section 2007-02-10 20:24:48.000000000 +0900 +++ manedit-0.8.1/manedit/editorcb.c 2007-02-11 22:54:17.000000000 +0900 @@ -22,6 +22,12 @@ #include "manedit.h" #include "config.h" +#include +#include + +static char *suffix = NULL; + +static void init_suffix(); void EditorItemDestroyCB(gpointer data); @@ -148,6 +154,26 @@ static editor_struct *editor_processing_undo = NULL; +void init_suffix(){ + char *suf = strdup(""); + char *tmp; + char *_suf []= { "", "x", ".gz", ".bz2", NULL }; + int i, j; + + if (suffix) return; + + for (j = 0; _suf[j]; j++){ + for (i = 1; i <= 9; i++){ + tmp = strdup(suf); + free(suf); + suf = (char *) malloc (strlen(tmp) + 10); + sprintf(suf, "%s .%i%s", tmp, i, _suf[j]); + free(tmp); + } + } + suffix = suf; +} + /* * Destroys a branch's editor_item_struct. */ @@ -455,9 +481,10 @@ gint nftypes = 0, path_total_rtns; fb_type_struct **ftypes_list = NULL, *ftype_rtn = NULL; + init_suffix(); FileBrowserTypeListNew( &ftypes_list, &nftypes, - ".1 .2 .3 .4 .5 .6 .bz2 .gz", + suffix, "Manual page" ); FileBrowserTypeListNew( @@ -739,9 +766,10 @@ gint nftypes = 0, path_total_rtns; fb_type_struct **ftypes_list = NULL, *type_rtn; + init_suffix(); FileBrowserTypeListNew( &ftypes_list, &nftypes, - ".1 .2 .3 .4 .5 .6 .bz2 .gz", + suffix, "Manual page" ); FileBrowserTypeListNew( @@ -1250,9 +1278,10 @@ fb_type_struct **ftypes_list = NULL, *type_rtn; /* Query the user to save the manual page */ + init_suffix(); FileBrowserTypeListNew( &ftypes_list, &nftypes, - ".1 .2 .3 .4 .5 .6 .bz2 .gz", + suffix, "Manual page" ); FileBrowserTypeListNew( @@ -1678,7 +1707,7 @@ FileBrowserTypeListNew( &ftypes_list, &nftypes, - ".1 .2 .3 .4 .5 .6 .bz2 .gz", + suffix, "Manual page" ); FileBrowserTypeListNew( Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/manedit/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 13 Nov 2006 08:38:09 -0000 1.5 +++ .cvsignore 11 Feb 2007 14:05:35 -0000 1.6 @@ -1 +1 @@ -manedit-0.7.1.tar.bz2 +manedit-0.8.1.tar.bz2 Index: manedit.spec =================================================================== RCS file: /cvs/extras/rpms/manedit/devel/manedit.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- manedit.spec 13 Nov 2006 08:38:09 -0000 1.14 +++ manedit.spec 11 Feb 2007 14:05:35 -0000 1.15 @@ -1,6 +1,6 @@ Name: manedit -Version: 0.7.1 -Release: 5%{?dist} +Version: 0.8.1 +Release: 1%{?dist} Summary: UNIX Manual Page Editor Group: Development/Tools @@ -10,9 +10,8 @@ Source1: manedit.desktop Source2: manview.desktop Patch0: manedit-0.7.1-makefile.patch -Patch1: manedit-0.7.1-allow-more_section.patch +Patch1: manedit-0.8.1-allow-more_section.patch Patch2: manedit-0.7.1-manbase.patch -Patch3: manedit-0.7.1-remove-some-warning.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # This is gtk+ package @@ -38,7 +37,6 @@ %patch0 -p1 -b .fedora %patch1 -p1 -b .section %patch2 -p1 -b .manbase -%patch3 -p1 -b .warn %build # I cannot understand this configure!! @@ -61,14 +59,6 @@ # remove manwrap %{__rm} -f $RPM_BUILD_ROOT%{_bindir}/manwrap -# install desktop file -# Note: Category "Application" is now regarded as -# redundant -# -# Original desktop-file-utils 0.11 no longer accepts -# "Application" "X-Fedora" categories and "X-Fedora" -# should not be used any longer. -# desktop-file-install \ --vendor fedora \ --remove-category Application \ @@ -118,6 +108,9 @@ %{_mandir}/man1/%{name}.1* %changelog +* Sun Feb 11 2007 Mamoru Tasaka - 0.8.1-1 +- 0.8.1 + * Sat Nov 11 2006 Mamoru Tasaka - 0.7.1-5 - Remove some warnings. Index: sources =================================================================== RCS file: /cvs/extras/rpms/manedit/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 13 Nov 2006 08:38:09 -0000 1.5 +++ sources 11 Feb 2007 14:05:35 -0000 1.6 @@ -1 +1 @@ -229586101245eb61018ff031c2efb247 manedit-0.7.1.tar.bz2 +a3124ad8e5234c54c1493a821501c64d manedit-0.8.1.tar.bz2 --- manedit-0.7.1-allow-more_section.patch DELETED --- --- manedit-0.7.1-remove-some-warning.patch DELETED --- From fedora-extras-commits at redhat.com Sun Feb 11 14:08:59 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sun, 11 Feb 2007 09:08:59 -0500 Subject: rpms/manedit/FC-6 manedit-0.8.1-allow-more_section.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 manedit.spec, 1.14, 1.15 sources, 1.5, 1.6 manedit-0.7.1-allow-more_section.patch, 1.1, NONE manedit-0.7.1-remove-some-warning.patch, 1.1, NONE Message-ID: <200702111408.l1BE8xLR031564@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/manedit/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31526 Modified Files: .cvsignore manedit.spec sources Added Files: manedit-0.8.1-allow-more_section.patch Removed Files: manedit-0.7.1-allow-more_section.patch manedit-0.7.1-remove-some-warning.patch Log Message: * Sun Feb 11 2007 Mamoru Tasaka - 0.8.1-1 - 0.8.1 manedit-0.8.1-allow-more_section.patch: --- NEW FILE manedit-0.8.1-allow-more_section.patch --- --- manedit-0.8.1/manedit/editorcb.c.section 2007-02-10 20:24:48.000000000 +0900 +++ manedit-0.8.1/manedit/editorcb.c 2007-02-11 22:54:17.000000000 +0900 @@ -22,6 +22,12 @@ #include "manedit.h" #include "config.h" +#include +#include + +static char *suffix = NULL; + +static void init_suffix(); void EditorItemDestroyCB(gpointer data); @@ -148,6 +154,26 @@ static editor_struct *editor_processing_undo = NULL; +void init_suffix(){ + char *suf = strdup(""); + char *tmp; + char *_suf []= { "", "x", ".gz", ".bz2", NULL }; + int i, j; + + if (suffix) return; + + for (j = 0; _suf[j]; j++){ + for (i = 1; i <= 9; i++){ + tmp = strdup(suf); + free(suf); + suf = (char *) malloc (strlen(tmp) + 10); + sprintf(suf, "%s .%i%s", tmp, i, _suf[j]); + free(tmp); + } + } + suffix = suf; +} + /* * Destroys a branch's editor_item_struct. */ @@ -455,9 +481,10 @@ gint nftypes = 0, path_total_rtns; fb_type_struct **ftypes_list = NULL, *ftype_rtn = NULL; + init_suffix(); FileBrowserTypeListNew( &ftypes_list, &nftypes, - ".1 .2 .3 .4 .5 .6 .bz2 .gz", + suffix, "Manual page" ); FileBrowserTypeListNew( @@ -739,9 +766,10 @@ gint nftypes = 0, path_total_rtns; fb_type_struct **ftypes_list = NULL, *type_rtn; + init_suffix(); FileBrowserTypeListNew( &ftypes_list, &nftypes, - ".1 .2 .3 .4 .5 .6 .bz2 .gz", + suffix, "Manual page" ); FileBrowserTypeListNew( @@ -1250,9 +1278,10 @@ fb_type_struct **ftypes_list = NULL, *type_rtn; /* Query the user to save the manual page */ + init_suffix(); FileBrowserTypeListNew( &ftypes_list, &nftypes, - ".1 .2 .3 .4 .5 .6 .bz2 .gz", + suffix, "Manual page" ); FileBrowserTypeListNew( @@ -1678,7 +1707,7 @@ FileBrowserTypeListNew( &ftypes_list, &nftypes, - ".1 .2 .3 .4 .5 .6 .bz2 .gz", + suffix, "Manual page" ); FileBrowserTypeListNew( Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/manedit/FC-6/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 13 Nov 2006 08:38:09 -0000 1.5 +++ .cvsignore 11 Feb 2007 14:08:27 -0000 1.6 @@ -1 +1 @@ -manedit-0.7.1.tar.bz2 +manedit-0.8.1.tar.bz2 Index: manedit.spec =================================================================== RCS file: /cvs/extras/rpms/manedit/FC-6/manedit.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- manedit.spec 13 Nov 2006 08:38:09 -0000 1.14 +++ manedit.spec 11 Feb 2007 14:08:27 -0000 1.15 @@ -1,6 +1,6 @@ Name: manedit -Version: 0.7.1 -Release: 5%{?dist} +Version: 0.8.1 +Release: 1%{?dist} Summary: UNIX Manual Page Editor Group: Development/Tools @@ -10,9 +10,8 @@ Source1: manedit.desktop Source2: manview.desktop Patch0: manedit-0.7.1-makefile.patch -Patch1: manedit-0.7.1-allow-more_section.patch +Patch1: manedit-0.8.1-allow-more_section.patch Patch2: manedit-0.7.1-manbase.patch -Patch3: manedit-0.7.1-remove-some-warning.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # This is gtk+ package @@ -38,7 +37,6 @@ %patch0 -p1 -b .fedora %patch1 -p1 -b .section %patch2 -p1 -b .manbase -%patch3 -p1 -b .warn %build # I cannot understand this configure!! @@ -61,14 +59,6 @@ # remove manwrap %{__rm} -f $RPM_BUILD_ROOT%{_bindir}/manwrap -# install desktop file -# Note: Category "Application" is now regarded as -# redundant -# -# Original desktop-file-utils 0.11 no longer accepts -# "Application" "X-Fedora" categories and "X-Fedora" -# should not be used any longer. -# desktop-file-install \ --vendor fedora \ --remove-category Application \ @@ -118,6 +108,9 @@ %{_mandir}/man1/%{name}.1* %changelog +* Sun Feb 11 2007 Mamoru Tasaka - 0.8.1-1 +- 0.8.1 + * Sat Nov 11 2006 Mamoru Tasaka - 0.7.1-5 - Remove some warnings. Index: sources =================================================================== RCS file: /cvs/extras/rpms/manedit/FC-6/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 13 Nov 2006 08:38:09 -0000 1.5 +++ sources 11 Feb 2007 14:08:27 -0000 1.6 @@ -1 +1 @@ -229586101245eb61018ff031c2efb247 manedit-0.7.1.tar.bz2 +a3124ad8e5234c54c1493a821501c64d manedit-0.8.1.tar.bz2 --- manedit-0.7.1-allow-more_section.patch DELETED --- --- manedit-0.7.1-remove-some-warning.patch DELETED --- From fedora-extras-commits at redhat.com Sun Feb 11 14:10:22 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sun, 11 Feb 2007 09:10:22 -0500 Subject: rpms/manedit/FC-5 manedit-0.8.1-allow-more_section.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 manedit.spec, 1.13, 1.14 sources, 1.4, 1.5 manedit-0.7.1-allow-more_section.patch, 1.1, NONE manedit-0.7.1-remove-some-warning.patch, 1.1, NONE Message-ID: <200702111410.l1BEAMX6031647@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/manedit/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31619 Modified Files: .cvsignore manedit.spec sources Added Files: manedit-0.8.1-allow-more_section.patch Removed Files: manedit-0.7.1-allow-more_section.patch manedit-0.7.1-remove-some-warning.patch Log Message: * Sun Feb 11 2007 Mamoru Tasaka - 0.8.1-1 - 0.8.1 manedit-0.8.1-allow-more_section.patch: --- NEW FILE manedit-0.8.1-allow-more_section.patch --- --- manedit-0.8.1/manedit/editorcb.c.section 2007-02-10 20:24:48.000000000 +0900 +++ manedit-0.8.1/manedit/editorcb.c 2007-02-11 22:54:17.000000000 +0900 @@ -22,6 +22,12 @@ #include "manedit.h" #include "config.h" +#include +#include + +static char *suffix = NULL; + +static void init_suffix(); void EditorItemDestroyCB(gpointer data); @@ -148,6 +154,26 @@ static editor_struct *editor_processing_undo = NULL; +void init_suffix(){ + char *suf = strdup(""); + char *tmp; + char *_suf []= { "", "x", ".gz", ".bz2", NULL }; + int i, j; + + if (suffix) return; + + for (j = 0; _suf[j]; j++){ + for (i = 1; i <= 9; i++){ + tmp = strdup(suf); + free(suf); + suf = (char *) malloc (strlen(tmp) + 10); + sprintf(suf, "%s .%i%s", tmp, i, _suf[j]); + free(tmp); + } + } + suffix = suf; +} + /* * Destroys a branch's editor_item_struct. */ @@ -455,9 +481,10 @@ gint nftypes = 0, path_total_rtns; fb_type_struct **ftypes_list = NULL, *ftype_rtn = NULL; + init_suffix(); FileBrowserTypeListNew( &ftypes_list, &nftypes, - ".1 .2 .3 .4 .5 .6 .bz2 .gz", + suffix, "Manual page" ); FileBrowserTypeListNew( @@ -739,9 +766,10 @@ gint nftypes = 0, path_total_rtns; fb_type_struct **ftypes_list = NULL, *type_rtn; + init_suffix(); FileBrowserTypeListNew( &ftypes_list, &nftypes, - ".1 .2 .3 .4 .5 .6 .bz2 .gz", + suffix, "Manual page" ); FileBrowserTypeListNew( @@ -1250,9 +1278,10 @@ fb_type_struct **ftypes_list = NULL, *type_rtn; /* Query the user to save the manual page */ + init_suffix(); FileBrowserTypeListNew( &ftypes_list, &nftypes, - ".1 .2 .3 .4 .5 .6 .bz2 .gz", + suffix, "Manual page" ); FileBrowserTypeListNew( @@ -1678,7 +1707,7 @@ FileBrowserTypeListNew( &ftypes_list, &nftypes, - ".1 .2 .3 .4 .5 .6 .bz2 .gz", + suffix, "Manual page" ); FileBrowserTypeListNew( Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/manedit/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Nov 2006 09:10:27 -0000 1.4 +++ .cvsignore 11 Feb 2007 14:09:50 -0000 1.5 @@ -1 +1 @@ -manedit-0.7.1.tar.bz2 +manedit-0.8.1.tar.bz2 Index: manedit.spec =================================================================== RCS file: /cvs/extras/rpms/manedit/FC-5/manedit.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- manedit.spec 13 Nov 2006 09:10:27 -0000 1.13 +++ manedit.spec 11 Feb 2007 14:09:50 -0000 1.14 @@ -1,6 +1,6 @@ Name: manedit -Version: 0.7.1 -Release: 5%{?dist} +Version: 0.8.1 +Release: 1%{?dist} Summary: UNIX Manual Page Editor Group: Development/Tools @@ -10,9 +10,8 @@ Source1: manedit.desktop Source2: manview.desktop Patch0: manedit-0.7.1-makefile.patch -Patch1: manedit-0.7.1-allow-more_section.patch +Patch1: manedit-0.8.1-allow-more_section.patch Patch2: manedit-0.7.1-manbase.patch -Patch3: manedit-0.7.1-remove-some-warning.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # This is gtk+ package @@ -38,7 +37,6 @@ %patch0 -p1 -b .fedora %patch1 -p1 -b .section %patch2 -p1 -b .manbase -%patch3 -p1 -b .warn %build # I cannot understand this configure!! @@ -61,14 +59,6 @@ # remove manwrap %{__rm} -f $RPM_BUILD_ROOT%{_bindir}/manwrap -# install desktop file -# Note: Category "Application" is now regarded as -# redundant -# -# Original desktop-file-utils 0.11 no longer accepts -# "Application" "X-Fedora" categories and "X-Fedora" -# should not be used any longer. -# desktop-file-install \ --vendor fedora \ --remove-category Application \ @@ -118,6 +108,9 @@ %{_mandir}/man1/%{name}.1* %changelog +* Sun Feb 11 2007 Mamoru Tasaka - 0.8.1-1 +- 0.8.1 + * Sat Nov 11 2006 Mamoru Tasaka - 0.7.1-5 - Remove some warnings. Index: sources =================================================================== RCS file: /cvs/extras/rpms/manedit/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Nov 2006 09:10:27 -0000 1.4 +++ sources 11 Feb 2007 14:09:50 -0000 1.5 @@ -1 +1 @@ -229586101245eb61018ff031c2efb247 manedit-0.7.1.tar.bz2 +a3124ad8e5234c54c1493a821501c64d manedit-0.8.1.tar.bz2 --- manedit-0.7.1-allow-more_section.patch DELETED --- --- manedit-0.7.1-remove-some-warning.patch DELETED --- From fedora-extras-commits at redhat.com Sun Feb 11 14:36:42 2007 From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz)) Date: Sun, 11 Feb 2007 09:36:42 -0500 Subject: rpms/pan/devel .cvsignore, 1.17, 1.18 pan.spec, 1.27, 1.28 sources, 1.17, 1.18 Message-ID: <200702111436.l1BEag4r031892@cvs-int.fedora.redhat.com> Author: adalloz Update of /cvs/extras/rpms/pan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31853 Modified Files: .cvsignore pan.spec sources Log Message: Update to new upstream version 0.123 February 6, 2007 - Pan 0.123: "El Nuevo Barretto" This is a quickie release to fix a couple of problems introduced in 0.122. Bug Tickets addressed in this release: 404515 0.122 build problems in `po' (Pteer) 404309 0.122 build problems for uint64_t (Geoff) 404837 newsgroups disappear in 0.121 and 0.122 (Kevin Brammer) 404183 null pointer in printf (Laurent Bigonville) 371838 header pane not updated for scores on bytes or lines (Mike) 370195 uulib/fptools.c assert issue - crash (Samuli Karkkainen) 404979 in 0.122, `cache' behaves like `read' (Michael Bernstein) 395318 show `wait' cursor when filtering (Kreao Kunjas) 404347 indicate offline status more clearly (Samuli Karkkainen) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pan/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 4 Feb 2007 14:43:05 -0000 1.17 +++ .cvsignore 11 Feb 2007 14:36:10 -0000 1.18 @@ -1 +1 @@ -pan-0.122.tar.bz2 +pan-0.123.tar.bz2 Index: pan.spec =================================================================== RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- pan.spec 4 Feb 2007 14:43:05 -0000 1.27 +++ pan.spec 11 Feb 2007 14:36:10 -0000 1.28 @@ -1,6 +1,6 @@ Summary: A GNOME/GTK+ news reader for X Name: pan -Version: 0.122 +Version: 0.123 Release: 1%{?dist} Epoch: 1 License: GPL @@ -59,6 +59,9 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Sun Feb 11 2007 Alexander Dalloz - 1:0.123-1 +- Update to 0.123 + * Sun Feb 04 2007 Alexander Dalloz - 1:0.122-1 - Update to 0.122 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pan/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 4 Feb 2007 14:43:05 -0000 1.17 +++ sources 11 Feb 2007 14:36:10 -0000 1.18 @@ -1 +1 @@ -ae8a20d11555262fe640cdf51d05eb81 pan-0.122.tar.bz2 +1414ffdddbdfa6c71e528a9268239044 pan-0.123.tar.bz2 From fedora-extras-commits at redhat.com Sun Feb 11 14:40:50 2007 From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz)) Date: Sun, 11 Feb 2007 09:40:50 -0500 Subject: rpms/pan/FC-6 .cvsignore, 1.17, 1.18 pan.spec, 1.27, 1.28 sources, 1.17, 1.18 Message-ID: <200702111440.l1BEeo8X031970@cvs-int.fedora.redhat.com> Author: adalloz Update of /cvs/extras/rpms/pan/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31945 Modified Files: .cvsignore pan.spec sources Log Message: Update to new upstream version 0.123 February 6, 2007 - Pan 0.123: "El Nuevo Barretto" This is a quickie release to fix a couple of problems introduced in 0.122. Bug Tickets addressed in this release: 404515 0.122 build problems in `po' (Pteer) 404309 0.122 build problems for uint64_t (Geoff) 404837 newsgroups disappear in 0.121 and 0.122 (Kevin Brammer) 404183 null pointer in printf (Laurent Bigonville) 371838 header pane not updated for scores on bytes or lines (Mike) 370195 uulib/fptools.c assert issue - crash (Samuli Karkkainen) 404979 in 0.122, `cache' behaves like `read' (Michael Bernstein) 395318 show `wait' cursor when filtering (Kreao Kunjas) 404347 indicate offline status more clearly (Samuli Karkkainen) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pan/FC-6/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 4 Feb 2007 14:37:30 -0000 1.17 +++ .cvsignore 11 Feb 2007 14:40:17 -0000 1.18 @@ -1 +1 @@ -pan-0.122.tar.bz2 +pan-0.123.tar.bz2 Index: pan.spec =================================================================== RCS file: /cvs/extras/rpms/pan/FC-6/pan.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- pan.spec 4 Feb 2007 14:37:30 -0000 1.27 +++ pan.spec 11 Feb 2007 14:40:17 -0000 1.28 @@ -1,6 +1,6 @@ Summary: A GNOME/GTK+ news reader for X Name: pan -Version: 0.122 +Version: 0.123 Release: 1%{?dist} Epoch: 1 License: GPL @@ -59,6 +59,9 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Sun Feb 11 2007 Alexander Dalloz - 1:0.123-1 +- Update to 0.123 + * Sun Feb 04 2007 Alexander Dalloz - 1:0.122-1 - Update to 0.122 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pan/FC-6/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 4 Feb 2007 14:37:30 -0000 1.17 +++ sources 11 Feb 2007 14:40:17 -0000 1.18 @@ -1 +1 @@ -ae8a20d11555262fe640cdf51d05eb81 pan-0.122.tar.bz2 +1414ffdddbdfa6c71e528a9268239044 pan-0.123.tar.bz2 From fedora-extras-commits at redhat.com Sun Feb 11 15:34:06 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sun, 11 Feb 2007 10:34:06 -0500 Subject: rpms/jd/devel .cvsignore, 1.65, 1.66 jd.spec, 1.76, 1.77 sources, 1.65, 1.66 Message-ID: <200702111534.l1BFY6cr003146@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3123 Modified Files: .cvsignore jd.spec sources Log Message: * Sun Feb 11 2007 Mamoru Tasaka - 1.8.5-2.cvs070211 - cvs 070211 (24:05 JST) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- .cvsignore 10 Feb 2007 17:14:44 -0000 1.65 +++ .cvsignore 11 Feb 2007 15:33:34 -0000 1.66 @@ -1 +1 @@ -jd-1.8.5-cvs070210.1.tgz +jd-1.8.5-cvs070211.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- jd.spec 10 Feb 2007 17:14:44 -0000 1.76 +++ jd.spec 11 Feb 2007 15:33:34 -0000 1.77 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 1.8.5 -%define strtag cvs070210.1 +%define strtag cvs070211 %define repoid 23816 @@ -106,8 +106,8 @@ %{icondir}/%{name}.png %changelog -* Sat Feb 10 2007 Mamoru Tasaka - 1.8.5-2.cvs070210.1 -- cvs 070210 (25:25 JST) +* Sun Feb 11 2007 Mamoru Tasaka - 1.8.5-2.cvs070211 +- cvs 070211 (24:05 JST) * Fri Feb 2 2007 Mamoru Tasaka - 1.8.5-1 - 1.8.5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- sources 10 Feb 2007 17:14:44 -0000 1.65 +++ sources 11 Feb 2007 15:33:34 -0000 1.66 @@ -1 +1 @@ -d04adefbc239a3e7c18d44ecb835434d jd-1.8.5-cvs070210.1.tgz +7eb2277bbb3d1b1dde6fffe5f2271a3a jd-1.8.5-cvs070211.tgz From fedora-extras-commits at redhat.com Sun Feb 11 16:01:39 2007 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Sun, 11 Feb 2007 11:01:39 -0500 Subject: rpms/hspell/devel hspell.spec,1.8,1.9 Message-ID: <200702111601.l1BG1dkQ006624@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3263 Modified Files: hspell.spec Log Message: sed though Makefile.in to replace gzip by gzip -n Index: hspell.spec =================================================================== RCS file: /cvs/extras/rpms/hspell/devel/hspell.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- hspell.spec 11 Sep 2006 15:05:57 -0000 1.8 +++ hspell.spec 11 Feb 2007 16:01:06 -0000 1.9 @@ -1,7 +1,7 @@ Summary: A Hebrew spell checker Name: hspell Version: 1.0 -Release: 5%{?dist} +Release: 6%{?dist} URL: http://ivrix.org.il/projects/spell-checker/ Source: http://ivrix.org.il/projects/spell-checker/hspell-%{version}.tar.gz License: GPL @@ -47,6 +47,7 @@ %prep %setup -q sed -i -e '/^\s\+strip\s/d' Makefile.in +sed -i -e 's/gzip/gzip -n/g' Makefile.in %build %configure --enable-fatverb --enable-linginfo @@ -75,6 +76,8 @@ %{_mandir}/man3/hspell.3* %changelog +* Sun Feb 11 2007 Dan Kenigsberg 1.0-6 +- Use gzip -n to exclude MTIME from compressed data and resolve bug #228171 * Tue Sep 11 2006 Dan Kenigsberg 1.0-5 - Rebuild for Fedora Extras 6 * Sun Jul 9 2006 Dan Kenigsberg 1.0-4 From fedora-extras-commits at redhat.com Sun Feb 11 16:21:55 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sun, 11 Feb 2007 11:21:55 -0500 Subject: rpms/jd/devel .cvsignore, 1.66, 1.67 jd.spec, 1.77, 1.78 sources, 1.66, 1.67 Message-ID: <200702111621.l1BGLtDa006781@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6756 Modified Files: .cvsignore jd.spec sources Log Message: * Sun Feb 11 2007 Mamoru Tasaka - 1.8.5-2.cvs070211.1 - cvs 070211 (24:40 JST) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- .cvsignore 11 Feb 2007 15:33:34 -0000 1.66 +++ .cvsignore 11 Feb 2007 16:21:22 -0000 1.67 @@ -1 +1 @@ -jd-1.8.5-cvs070211.tgz +jd-1.8.5-cvs070211.1.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- jd.spec 11 Feb 2007 15:33:34 -0000 1.77 +++ jd.spec 11 Feb 2007 16:21:22 -0000 1.78 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 1.8.5 -%define strtag cvs070211 +%define strtag cvs070211.1 %define repoid 23816 @@ -106,8 +106,8 @@ %{icondir}/%{name}.png %changelog -* Sun Feb 11 2007 Mamoru Tasaka - 1.8.5-2.cvs070211 -- cvs 070211 (24:05 JST) +* Sun Feb 11 2007 Mamoru Tasaka - 1.8.5-2.cvs070211.1 +- cvs 070211 (24:40 JST) * Fri Feb 2 2007 Mamoru Tasaka - 1.8.5-1 - 1.8.5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- sources 11 Feb 2007 15:33:34 -0000 1.66 +++ sources 11 Feb 2007 16:21:22 -0000 1.67 @@ -1 +1 @@ -7eb2277bbb3d1b1dde6fffe5f2271a3a jd-1.8.5-cvs070211.tgz +0caa674cac5357831c40da1ba7f9220b jd-1.8.5-cvs070211.1.tgz From fedora-extras-commits at redhat.com Sun Feb 11 16:44:58 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Sun, 11 Feb 2007 11:44:58 -0500 Subject: rpms/graveman/devel graveman-0.3.12-5-optflags.patch, NONE, 1.1 graveman.spec, 1.16, 1.17 Message-ID: <200702111644.l1BGiwOk007105@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/graveman/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7085 Modified Files: graveman.spec Added Files: graveman-0.3.12-5-optflags.patch Log Message: build with flac support graveman-0.3.12-5-optflags.patch: --- NEW FILE graveman-0.3.12-5-optflags.patch --- --- graveman-0.3.12-5/configure.in~ 2006-06-06 04:30:17.000000000 +0300 +++ graveman-0.3.12-5/configure.in 2007-02-05 01:25:35.000000000 +0200 @@ -285,9 +285,9 @@ if test "A$enable_debug" = "A"; then enable_debug=no - CFLAGS="-Wall" + CFLAGS="$CFLAGS -Wall" else - CFLAGS="-Wall -g" + CFLAGS="$CFLAGS -Wall -g" fi dnl Ecriture des fichiers --- graveman-0.3.12-5/configure~ 2006-06-06 04:32:15.000000000 +0300 +++ graveman-0.3.12-5/configure 2007-02-05 01:25:19.000000000 +0200 @@ -10269,9 +10269,9 @@ if test "A$enable_debug" = "A"; then enable_debug=no - CFLAGS="-Wall" + CFLAGS="$CFLAGS -Wall" else - CFLAGS="-Wall -g" + CFLAGS="$CFLAGS -Wall -g" fi ac_config_files="$ac_config_files m4/Makefile Makefile desktop/Makefile glade/Makefile man/Makefile pixmaps/Makefile po/Makefile.in src/Makefile themes/Makefile" Index: graveman.spec =================================================================== RCS file: /cvs/extras/rpms/graveman/devel/graveman.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- graveman.spec 28 Aug 2006 00:57:07 -0000 1.16 +++ graveman.spec 11 Feb 2007 16:44:25 -0000 1.17 @@ -1,25 +1,27 @@ Name: graveman Version: 0.3.12.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A frontend for cdrtools, dvd+rw-tools and sox Group: Applications/Archiving License: GPL URL: http://graveman.tuxfamily.org Source0: http://graveman.tuxfamily.org/sources/graveman-0.3.12-5.tar.bz2 +Patch0: %{name}-0.3.12-5-optflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libid3tag-devel -BuildRequires: libvorbis-devel -BuildRequires: gtk2-devel -BuildRequires: libogg-devel BuildRequires: desktop-file-utils -BuildRequires: libmng-devel -BuildRequires: zlib-devel -BuildRequires: libjpeg-devel -BuildRequires: libglade2-devel BuildRequires: gettext +BuildRequires: gtk2-devel BuildRequires: intltool +BuildRequires: libglade2-devel +BuildRequires: libjpeg-devel +BuildRequires: libmng-devel +BuildRequires: libogg-devel +BuildRequires: libvorbis-devel +BuildRequires: zlib-devel +BuildRequires: flac-devel +BuildRequires: libid3tag-devel Requires: cdrecord Requires: sox Requires: dvd+rw-tools @@ -32,11 +34,14 @@ %prep %setup -q -n graveman-0.3.12-5 +touch -r configure.in configure.in.stamp +%patch0 -p1 +touch -r configure.in.stamp configure.in perl -pi -e 's|^Applicationman = .*|Applicationman=\$(DESTDIR)%{_mandir}|' man/Makefile.in %build -%configure +%configure --disable-dependency-tracking make %{?_smp_mflags} @@ -76,6 +81,10 @@ %changelog +* Sun Feb 11 2007 Gerard Milmeister - 0.3.12.5-3 +- build with flac support +- enable optflags (bugzilla 227381) + * Mon Aug 28 2006 Gerard Milmeister - 0.3.12.5-2 - Rebuild for FE6 From fedora-extras-commits at redhat.com Sun Feb 11 16:47:38 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Sun, 11 Feb 2007 11:47:38 -0500 Subject: rpms/graveman/FC-6 graveman-0.3.12-5-optflags.patch, NONE, 1.1 graveman.spec, 1.16, 1.17 Message-ID: <200702111647.l1BGlcnB007206@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/graveman/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7163/FC-6 Modified Files: graveman.spec Added Files: graveman-0.3.12-5-optflags.patch Log Message: build with flac support graveman-0.3.12-5-optflags.patch: --- NEW FILE graveman-0.3.12-5-optflags.patch --- --- graveman-0.3.12-5/configure.in~ 2006-06-06 04:30:17.000000000 +0300 +++ graveman-0.3.12-5/configure.in 2007-02-05 01:25:35.000000000 +0200 @@ -285,9 +285,9 @@ if test "A$enable_debug" = "A"; then enable_debug=no - CFLAGS="-Wall" + CFLAGS="$CFLAGS -Wall" else - CFLAGS="-Wall -g" + CFLAGS="$CFLAGS -Wall -g" fi dnl Ecriture des fichiers --- graveman-0.3.12-5/configure~ 2006-06-06 04:32:15.000000000 +0300 +++ graveman-0.3.12-5/configure 2007-02-05 01:25:19.000000000 +0200 @@ -10269,9 +10269,9 @@ if test "A$enable_debug" = "A"; then enable_debug=no - CFLAGS="-Wall" + CFLAGS="$CFLAGS -Wall" else - CFLAGS="-Wall -g" + CFLAGS="$CFLAGS -Wall -g" fi ac_config_files="$ac_config_files m4/Makefile Makefile desktop/Makefile glade/Makefile man/Makefile pixmaps/Makefile po/Makefile.in src/Makefile themes/Makefile" Index: graveman.spec =================================================================== RCS file: /cvs/extras/rpms/graveman/FC-6/graveman.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- graveman.spec 28 Aug 2006 00:57:07 -0000 1.16 +++ graveman.spec 11 Feb 2007 16:47:06 -0000 1.17 @@ -1,25 +1,27 @@ Name: graveman Version: 0.3.12.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A frontend for cdrtools, dvd+rw-tools and sox Group: Applications/Archiving License: GPL URL: http://graveman.tuxfamily.org Source0: http://graveman.tuxfamily.org/sources/graveman-0.3.12-5.tar.bz2 +Patch0: %{name}-0.3.12-5-optflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libid3tag-devel -BuildRequires: libvorbis-devel -BuildRequires: gtk2-devel -BuildRequires: libogg-devel BuildRequires: desktop-file-utils -BuildRequires: libmng-devel -BuildRequires: zlib-devel -BuildRequires: libjpeg-devel -BuildRequires: libglade2-devel BuildRequires: gettext +BuildRequires: gtk2-devel BuildRequires: intltool +BuildRequires: libglade2-devel +BuildRequires: libjpeg-devel +BuildRequires: libmng-devel +BuildRequires: libogg-devel +BuildRequires: libvorbis-devel +BuildRequires: zlib-devel +BuildRequires: flac-devel +BuildRequires: libid3tag-devel Requires: cdrecord Requires: sox Requires: dvd+rw-tools @@ -32,11 +34,14 @@ %prep %setup -q -n graveman-0.3.12-5 +touch -r configure.in configure.in.stamp +%patch0 -p1 +touch -r configure.in.stamp configure.in perl -pi -e 's|^Applicationman = .*|Applicationman=\$(DESTDIR)%{_mandir}|' man/Makefile.in %build -%configure +%configure --disable-dependency-tracking make %{?_smp_mflags} @@ -76,6 +81,10 @@ %changelog +* Sun Feb 11 2007 Gerard Milmeister - 0.3.12.5-3 +- build with flac support +- enable optflags (bugzilla 227381) + * Mon Aug 28 2006 Gerard Milmeister - 0.3.12.5-2 - Rebuild for FE6 From fedora-extras-commits at redhat.com Sun Feb 11 16:47:36 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Sun, 11 Feb 2007 11:47:36 -0500 Subject: rpms/graveman/FC-5 graveman-0.3.12-5-optflags.patch, NONE, 1.1 graveman.spec, 1.16, 1.17 Message-ID: <200702111647.l1BGlalI007203@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/graveman/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7163/FC-5 Modified Files: graveman.spec Added Files: graveman-0.3.12-5-optflags.patch Log Message: build with flac support graveman-0.3.12-5-optflags.patch: --- NEW FILE graveman-0.3.12-5-optflags.patch --- --- graveman-0.3.12-5/configure.in~ 2006-06-06 04:30:17.000000000 +0300 +++ graveman-0.3.12-5/configure.in 2007-02-05 01:25:35.000000000 +0200 @@ -285,9 +285,9 @@ if test "A$enable_debug" = "A"; then enable_debug=no - CFLAGS="-Wall" + CFLAGS="$CFLAGS -Wall" else - CFLAGS="-Wall -g" + CFLAGS="$CFLAGS -Wall -g" fi dnl Ecriture des fichiers --- graveman-0.3.12-5/configure~ 2006-06-06 04:32:15.000000000 +0300 +++ graveman-0.3.12-5/configure 2007-02-05 01:25:19.000000000 +0200 @@ -10269,9 +10269,9 @@ if test "A$enable_debug" = "A"; then enable_debug=no - CFLAGS="-Wall" + CFLAGS="$CFLAGS -Wall" else - CFLAGS="-Wall -g" + CFLAGS="$CFLAGS -Wall -g" fi ac_config_files="$ac_config_files m4/Makefile Makefile desktop/Makefile glade/Makefile man/Makefile pixmaps/Makefile po/Makefile.in src/Makefile themes/Makefile" Index: graveman.spec =================================================================== RCS file: /cvs/extras/rpms/graveman/FC-5/graveman.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- graveman.spec 6 Jun 2006 09:30:13 -0000 1.16 +++ graveman.spec 11 Feb 2007 16:47:03 -0000 1.17 @@ -1,18 +1,30 @@ Name: graveman Version: 0.3.12.5 -Release: 1%{?dist} +Release: 3%{?dist} Summary: A frontend for cdrtools, dvd+rw-tools and sox Group: Applications/Archiving License: GPL URL: http://graveman.tuxfamily.org Source0: http://graveman.tuxfamily.org/sources/graveman-0.3.12-5.tar.bz2 +Patch0: %{name}-0.3.12-5-optflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libid3tag-devel, libvorbis-devel, gtk2-devel, libogg-devel, desktop-file-utils -BuildRequires: libmng-devel, zlib-devel, libjpeg-devel -BuildRequires: libglade2-devel, gettext -Requires: cdrecord, sox, dvd+rw-tools +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: gtk2-devel +BuildRequires: intltool +BuildRequires: libglade2-devel +BuildRequires: libjpeg-devel +BuildRequires: libmng-devel +BuildRequires: libogg-devel +BuildRequires: libvorbis-devel +BuildRequires: zlib-devel +BuildRequires: flac-devel +BuildRequires: libid3tag-devel +Requires: cdrecord +Requires: sox +Requires: dvd+rw-tools %description @@ -22,11 +34,14 @@ %prep %setup -q -n graveman-0.3.12-5 +touch -r configure.in configure.in.stamp +%patch0 -p1 +touch -r configure.in.stamp configure.in perl -pi -e 's|^Applicationman = .*|Applicationman=\$(DESTDIR)%{_mandir}|' man/Makefile.in %build -%configure +%configure --disable-dependency-tracking make %{?_smp_mflags} @@ -66,9 +81,19 @@ %changelog +* Sun Feb 11 2007 Gerard Milmeister - 0.3.12.5-3 +- build with flac support +- enable optflags (bugzilla 227381) + +* Mon Aug 28 2006 Gerard Milmeister - 0.3.12.5-2 +- Rebuild for FE6 + * Tue Jun 6 2006 Gerard Milmeister - 0.3.12.5-1 - new version 0.3.12-5 +* Sat Jun 3 2006 Gerard Milmeister - 0.3.12.4-6 +- added BuildReq: intltool + * Sat Apr 1 2006 Gerard Milmeister - 0.3.12.4-4 - Patch for memory bug From fedora-extras-commits at redhat.com Sun Feb 11 16:53:47 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Sun, 11 Feb 2007 11:53:47 -0500 Subject: rpms/TeXmacs/devel TeXmacs.spec,1.44,1.45 Message-ID: <200702111653.l1BGrlgK007352@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7317/devel Modified Files: TeXmacs.spec Log Message: build with optflags Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/TeXmacs.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- TeXmacs.spec 19 Jan 2007 21:25:15 -0000 1.44 +++ TeXmacs.spec 11 Feb 2007 16:53:14 -0000 1.45 @@ -1,6 +1,6 @@ Name: TeXmacs Version: 1.0.6.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors @@ -59,13 +59,13 @@ %build -%configure +%configure --enable-optimize="$RPM_OPT_FLAGS" make %{?_smp_mflags} %install rm -fr $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install +make DESTDIR=$RPM_BUILD_ROOT install STRIP=/bin/true export GUILE_DATA_PATH=%{_datadir}/guile export GUILE_LOAD_PATH=$GUILE_DATA_PATH/1.8/ice-9 cp -r -f $GUILE_LOAD_PATH $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs @@ -154,6 +154,9 @@ %changelog +* Sun Feb 11 2007 Gerard Milmeister - 1.0.6.8-2 +- build with optflags (bugzilla 228152) + * Fri Jan 19 2007 Gerard Milmeister - 1.0.6.8-1 - new version 1.0.6.8 From fedora-extras-commits at redhat.com Sun Feb 11 16:53:44 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Sun, 11 Feb 2007 11:53:44 -0500 Subject: rpms/TeXmacs/FC-6 TeXmacs.spec,1.46,1.47 Message-ID: <200702111653.l1BGriYO007349@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7317/FC-6 Modified Files: TeXmacs.spec Log Message: build with optflags Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-6/TeXmacs.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- TeXmacs.spec 19 Jan 2007 21:25:15 -0000 1.46 +++ TeXmacs.spec 11 Feb 2007 16:53:12 -0000 1.47 @@ -1,6 +1,6 @@ Name: TeXmacs Version: 1.0.6.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors @@ -59,13 +59,13 @@ %build -%configure +%configure --enable-optimize="$RPM_OPT_FLAGS" make %{?_smp_mflags} %install rm -fr $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install +make DESTDIR=$RPM_BUILD_ROOT install STRIP=/bin/true export GUILE_DATA_PATH=%{_datadir}/guile export GUILE_LOAD_PATH=$GUILE_DATA_PATH/1.8/ice-9 cp -r -f $GUILE_LOAD_PATH $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs @@ -154,6 +154,9 @@ %changelog +* Sun Feb 11 2007 Gerard Milmeister - 1.0.6.8-2 +- build with optflags (bugzilla 228152) + * Fri Jan 19 2007 Gerard Milmeister - 1.0.6.8-1 - new version 1.0.6.8 From fedora-extras-commits at redhat.com Sun Feb 11 16:56:46 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Sun, 11 Feb 2007 11:56:46 -0500 Subject: rpms/genius/devel genius.spec,1.2,1.3 Message-ID: <200702111656.l1BGuktE007467@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/genius/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7446 Modified Files: genius.spec Log Message: rebuild to use ncurses Index: genius.spec =================================================================== RCS file: /cvs/extras/rpms/genius/devel/genius.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- genius.spec 2 Feb 2007 21:24:08 -0000 1.2 +++ genius.spec 11 Feb 2007 16:56:14 -0000 1.3 @@ -1,6 +1,6 @@ Name: genius Version: 0.7.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An arbitrary precision integer and multiple precision floatingpoint calculator Group: Applications/Engineering @@ -123,6 +123,9 @@ %changelog +* Sun Feb 11 2007 Gerard Milmeister - 0.7.7-2 +- rebuild to use ncurses + * Fri Feb 2 2007 Gerard Milmeister - 0.7.7-1 - new version 0.7.7 From fedora-extras-commits at redhat.com Sun Feb 11 16:58:24 2007 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 11 Feb 2007 11:58:24 -0500 Subject: rpms/perl-Glib/FC-5 .cvsignore, 1.13, 1.14 perl-Glib.spec, 1.18, 1.19 sources, 1.13, 1.14 Message-ID: <200702111658.l1BGwOMP007607@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Glib/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7538/FC-5 Modified Files: .cvsignore perl-Glib.spec sources Log Message: Update to 1.143. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Glib/FC-5/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 1 Dec 2006 16:20:24 -0000 1.13 +++ .cvsignore 11 Feb 2007 16:57:51 -0000 1.14 @@ -1 +1 @@ -Glib-1.141.tar.gz +Glib-1.143.tar.gz Index: perl-Glib.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Glib/FC-5/perl-Glib.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- perl-Glib.spec 1 Dec 2006 16:20:24 -0000 1.18 +++ perl-Glib.spec 11 Feb 2007 16:57:51 -0000 1.19 @@ -1,5 +1,5 @@ Name: perl-Glib -Version: 1.141 +Version: 1.143 Release: 1%{?dist} Summary: Perl interface to GLib @@ -36,8 +36,8 @@ %build -CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor -make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS" +%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" +make %{?_smp_mflags} %install @@ -45,7 +45,7 @@ make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' +find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* @@ -66,6 +66,12 @@ %changelog +* Sun Feb 11 2007 Jose Pedro Oliveira - 1.143-1 +- Update to 1.143. + +* Thu Dec 7 2006 Jose Pedro Oliveira - 1.142-1 +- Update to 1.142. + * Wed Nov 22 2006 Jose Pedro Oliveira - 1.141-1 - Update to 1.141. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Glib/FC-5/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 1 Dec 2006 16:20:24 -0000 1.13 +++ sources 11 Feb 2007 16:57:51 -0000 1.14 @@ -1 +1 @@ -ab90e68a745e771a8b6af8fadcce4c38 Glib-1.141.tar.gz +a99215c806de26acf285edf90fc15cb4 Glib-1.143.tar.gz From fedora-extras-commits at redhat.com Sun Feb 11 16:58:26 2007 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 11 Feb 2007 11:58:26 -0500 Subject: rpms/perl-Glib/FC-6 .cvsignore, 1.13, 1.14 perl-Glib.spec, 1.18, 1.19 sources, 1.13, 1.14 Message-ID: <200702111658.l1BGwQK0007614@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Glib/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7538/FC-6 Modified Files: .cvsignore perl-Glib.spec sources Log Message: Update to 1.143. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Glib/FC-6/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 1 Dec 2006 16:20:24 -0000 1.13 +++ .cvsignore 11 Feb 2007 16:57:54 -0000 1.14 @@ -1 +1 @@ -Glib-1.141.tar.gz +Glib-1.143.tar.gz Index: perl-Glib.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Glib/FC-6/perl-Glib.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- perl-Glib.spec 1 Dec 2006 16:20:24 -0000 1.18 +++ perl-Glib.spec 11 Feb 2007 16:57:54 -0000 1.19 @@ -1,5 +1,5 @@ Name: perl-Glib -Version: 1.141 +Version: 1.143 Release: 1%{?dist} Summary: Perl interface to GLib @@ -36,8 +36,8 @@ %build -CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor -make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS" +%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" +make %{?_smp_mflags} %install @@ -45,7 +45,7 @@ make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' +find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* @@ -66,6 +66,12 @@ %changelog +* Sun Feb 11 2007 Jose Pedro Oliveira - 1.143-1 +- Update to 1.143. + +* Thu Dec 7 2006 Jose Pedro Oliveira - 1.142-1 +- Update to 1.142. + * Wed Nov 22 2006 Jose Pedro Oliveira - 1.141-1 - Update to 1.141. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Glib/FC-6/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 1 Dec 2006 16:20:24 -0000 1.13 +++ sources 11 Feb 2007 16:57:54 -0000 1.14 @@ -1 +1 @@ -ab90e68a745e771a8b6af8fadcce4c38 Glib-1.141.tar.gz +a99215c806de26acf285edf90fc15cb4 Glib-1.143.tar.gz From fedora-extras-commits at redhat.com Sun Feb 11 16:58:22 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Sun, 11 Feb 2007 11:58:22 -0500 Subject: rpms/hugs98/devel hugs98.spec,1.10,1.11 Message-ID: <200702111658.l1BGwMeG007602@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/hugs98/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7531 Modified Files: hugs98.spec Log Message: rebuild to use ncurses Index: hugs98.spec =================================================================== RCS file: /cvs/extras/rpms/hugs98/devel/hugs98.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- hugs98.spec 30 Oct 2006 10:18:33 -0000 1.10 +++ hugs98.spec 11 Feb 2007 16:57:50 -0000 1.11 @@ -2,7 +2,7 @@ Name: hugs98 Version: 2006.09 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Haskell Interpreter Group: Development/Languages @@ -194,6 +194,9 @@ %changelog +* Sun Feb 11 2007 Gerard Milmeister - 2006.09-2 +- rebuild to use ncurses + * Mon Oct 30 2006 Gerard Milmeister - 2006.09-1 - new version Sep2006 From fedora-extras-commits at redhat.com Sun Feb 11 16:58:29 2007 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 11 Feb 2007 11:58:29 -0500 Subject: rpms/perl-Glib/devel .cvsignore, 1.14, 1.15 perl-Glib.spec, 1.19, 1.20 sources, 1.14, 1.15 Message-ID: <200702111658.l1BGwTWZ007646@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Glib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7538/devel Modified Files: .cvsignore perl-Glib.spec sources Log Message: Update to 1.143. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Glib/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 7 Dec 2006 17:13:59 -0000 1.14 +++ .cvsignore 11 Feb 2007 16:57:57 -0000 1.15 @@ -1 +1 @@ -Glib-1.142.tar.gz +Glib-1.143.tar.gz Index: perl-Glib.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Glib/devel/perl-Glib.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- perl-Glib.spec 7 Dec 2006 17:13:59 -0000 1.19 +++ perl-Glib.spec 11 Feb 2007 16:57:57 -0000 1.20 @@ -1,5 +1,5 @@ Name: perl-Glib -Version: 1.142 +Version: 1.143 Release: 1%{?dist} Summary: Perl interface to GLib @@ -36,8 +36,8 @@ %build -CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor -make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS" +%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" +make %{?_smp_mflags} %install @@ -45,7 +45,7 @@ make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' +find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* @@ -66,6 +66,9 @@ %changelog +* Sun Feb 11 2007 Jose Pedro Oliveira - 1.143-1 +- Update to 1.143. + * Thu Dec 7 2006 Jose Pedro Oliveira - 1.142-1 - Update to 1.142. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Glib/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 7 Dec 2006 17:13:59 -0000 1.14 +++ sources 11 Feb 2007 16:57:57 -0000 1.15 @@ -1 +1 @@ -60e26957f890accb29b755fd9ce57a57 Glib-1.142.tar.gz +a99215c806de26acf285edf90fc15cb4 Glib-1.143.tar.gz From fedora-extras-commits at redhat.com Sun Feb 11 17:00:06 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Sun, 11 Feb 2007 12:00:06 -0500 Subject: rpms/hugs98/devel hugs98.spec,1.11,1.12 Message-ID: <200702111700.l1BH066H007755@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/hugs98/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7702 Modified Files: hugs98.spec Log Message: rebuild to use ncurses Index: hugs98.spec =================================================================== RCS file: /cvs/extras/rpms/hugs98/devel/hugs98.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- hugs98.spec 11 Feb 2007 16:57:50 -0000 1.11 +++ hugs98.spec 11 Feb 2007 16:59:33 -0000 1.12 @@ -2,7 +2,7 @@ Name: hugs98 Version: 2006.09 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Haskell Interpreter Group: Development/Languages From fedora-extras-commits at redhat.com Sun Feb 11 17:01:39 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Sun, 11 Feb 2007 12:01:39 -0500 Subject: rpms/yap/devel yap.spec,1.11,1.12 Message-ID: <200702111701.l1BH1dXX011147@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/yap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11094 Modified Files: yap.spec Log Message: rebuild to use ncurses Index: yap.spec =================================================================== RCS file: /cvs/extras/rpms/yap/devel/yap.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- yap.spec 28 Aug 2006 10:55:46 -0000 1.11 +++ yap.spec 11 Feb 2007 17:01:06 -0000 1.12 @@ -1,6 +1,6 @@ Name: yap Version: 5.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: High-performance Prolog Compiler @@ -120,6 +120,9 @@ %changelog +* Sun Feb 11 2007 Gerard Milmeister - 5.1.1-3 +- rebuild to use ncurses + * Mon Aug 28 2006 Gerard Milmeister - 5.1.1-2 - Rebuild for FE6 From fedora-extras-commits at redhat.com Sun Feb 11 17:03:17 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Sun, 11 Feb 2007 12:03:17 -0500 Subject: rpms/ucblogo/devel ucblogo.spec,1.3,1.4 Message-ID: <200702111703.l1BH3H6h011362@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/ucblogo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11287 Modified Files: ucblogo.spec Log Message: rebuild to use ncurses Index: ucblogo.spec =================================================================== RCS file: /cvs/extras/rpms/ucblogo/devel/ucblogo.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ucblogo.spec 28 Aug 2006 09:22:07 -0000 1.3 +++ ucblogo.spec 11 Feb 2007 17:02:44 -0000 1.4 @@ -1,6 +1,6 @@ Name: ucblogo Version: 5.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: An interpreter for the Logo programming language Group: Development/Languages @@ -100,6 +100,9 @@ %changelog +* Sun Feb 11 2007 Gerard Milmeister - 5.5-6 +- rebuild to use ncurses + * Mon Aug 28 2006 Gerard Milmeister - 5.5-5 - Rebuild for FE6 From fedora-extras-commits at redhat.com Sun Feb 11 17:09:58 2007 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 11 Feb 2007 12:09:58 -0500 Subject: rpms/liferea/devel .cvsignore, 1.45, 1.46 liferea.spec, 1.65, 1.66 sources, 1.46, 1.47 Message-ID: <200702111709.l1BH9wSZ011545@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11468 Modified Files: .cvsignore liferea.spec sources Log Message: * Sun Feb 11 2007 Brian Pepple - 1.2.6b-1 - Update to 1.2.6b. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- .cvsignore 8 Feb 2007 20:13:20 -0000 1.45 +++ .cvsignore 11 Feb 2007 17:09:25 -0000 1.46 @@ -1 +1 @@ -liferea-1.2.6.tar.gz +liferea-1.2.6b.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- liferea.spec 8 Feb 2007 20:13:20 -0000 1.65 +++ liferea.spec 11 Feb 2007 17:09:25 -0000 1.66 @@ -1,5 +1,5 @@ Name: liferea -Version: 1.2.6 +Version: 1.2.6b Release: 1%{?dist} Summary: An RSS/RDF feed reader @@ -112,6 +112,9 @@ %changelog +* Sun Feb 11 2007 Brian Pepple - 1.2.6b-1 +- Update to 1.2.6b. + * Thu Feb 8 2007 Brian Pepple - 1.2.6-1 - Update to 1.2.6. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/sources,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- sources 8 Feb 2007 20:13:20 -0000 1.46 +++ sources 11 Feb 2007 17:09:25 -0000 1.47 @@ -1 +1 @@ -57d6dccc89d2a05af027b9c06dd145c4 liferea-1.2.6.tar.gz +0ec6000cf3e63a2aed341a69bb3b0367 liferea-1.2.6b.tar.gz From fedora-extras-commits at redhat.com Sun Feb 11 17:10:10 2007 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 11 Feb 2007 12:10:10 -0500 Subject: rpms/perl-Log-Log4perl/FC-6 .cvsignore, 1.7, 1.8 perl-Log-Log4perl.spec, 1.9, 1.10 sources, 1.7, 1.8 Message-ID: <200702111710.l1BHAAs3011555@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Log-Log4perl/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11490/FC-6 Modified Files: .cvsignore perl-Log-Log4perl.spec sources Log Message: Update to 1.09. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Log-Log4perl/FC-6/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 25 Nov 2006 21:24:05 -0000 1.7 +++ .cvsignore 11 Feb 2007 17:09:38 -0000 1.8 @@ -1 +1 @@ -Log-Log4perl-1.08.tar.gz +Log-Log4perl-1.09.tar.gz Index: perl-Log-Log4perl.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Log-Log4perl/FC-6/perl-Log-Log4perl.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Log-Log4perl.spec 25 Nov 2006 21:24:05 -0000 1.9 +++ perl-Log-Log4perl.spec 11 Feb 2007 17:09:38 -0000 1.10 @@ -1,5 +1,5 @@ Name: perl-Log-Log4perl -Version: 1.08 +Version: 1.09 Release: 1%{?dist} Summary: Log4j implementation for Perl @@ -19,7 +19,7 @@ BuildRequires: perl(SQL::Statement) BuildRequires: perl(DBD::CSV) BuildRequires: perl(XML::DOM) -# perl(RRDs) is provided by the rrdtool-perl package +# perl(RRDs) is provided by rrdtool-perl (a rrdtool subpackage) BuildRequires: perl(RRDs) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -47,7 +47,7 @@ rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' +find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* @@ -67,6 +67,9 @@ %changelog +* Sun Feb 11 2007 Jose Pedro Oliveira - 1.09-1 +- Update to 1.09. + * Sat Nov 25 2006 Jose Pedro Oliveira - 1.08-1 - Update to 1.08. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Log-Log4perl/FC-6/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 25 Nov 2006 21:24:05 -0000 1.7 +++ sources 11 Feb 2007 17:09:38 -0000 1.8 @@ -1 +1 @@ -54fa5628deac4130f34208e4cb18328b Log-Log4perl-1.08.tar.gz +4d272cc5bf0307781d9d5d8b99d8e58e Log-Log4perl-1.09.tar.gz From fedora-extras-commits at redhat.com Sun Feb 11 17:10:08 2007 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 11 Feb 2007 12:10:08 -0500 Subject: rpms/perl-Log-Log4perl/FC-5 .cvsignore, 1.7, 1.8 perl-Log-Log4perl.spec, 1.9, 1.10 sources, 1.7, 1.8 Message-ID: <200702111710.l1BHA84W011550@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Log-Log4perl/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11490/FC-5 Modified Files: .cvsignore perl-Log-Log4perl.spec sources Log Message: Update to 1.09. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Log-Log4perl/FC-5/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 25 Nov 2006 21:24:00 -0000 1.7 +++ .cvsignore 11 Feb 2007 17:09:35 -0000 1.8 @@ -1 +1 @@ -Log-Log4perl-1.08.tar.gz +Log-Log4perl-1.09.tar.gz Index: perl-Log-Log4perl.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Log-Log4perl/FC-5/perl-Log-Log4perl.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Log-Log4perl.spec 25 Nov 2006 21:24:00 -0000 1.9 +++ perl-Log-Log4perl.spec 11 Feb 2007 17:09:35 -0000 1.10 @@ -1,5 +1,5 @@ Name: perl-Log-Log4perl -Version: 1.08 +Version: 1.09 Release: 1%{?dist} Summary: Log4j implementation for Perl @@ -19,7 +19,7 @@ BuildRequires: perl(SQL::Statement) BuildRequires: perl(DBD::CSV) BuildRequires: perl(XML::DOM) -# perl(RRDs) is provided by the rrdtool-perl package +# perl(RRDs) is provided by rrdtool-perl (a rrdtool subpackage) BuildRequires: perl(RRDs) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -47,7 +47,7 @@ rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' +find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* @@ -67,6 +67,9 @@ %changelog +* Sun Feb 11 2007 Jose Pedro Oliveira - 1.09-1 +- Update to 1.09. + * Sat Nov 25 2006 Jose Pedro Oliveira - 1.08-1 - Update to 1.08. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Log-Log4perl/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 25 Nov 2006 21:24:00 -0000 1.7 +++ sources 11 Feb 2007 17:09:35 -0000 1.8 @@ -1 +1 @@ -54fa5628deac4130f34208e4cb18328b Log-Log4perl-1.08.tar.gz +4d272cc5bf0307781d9d5d8b99d8e58e Log-Log4perl-1.09.tar.gz From fedora-extras-commits at redhat.com Sun Feb 11 17:10:12 2007 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 11 Feb 2007 12:10:12 -0500 Subject: rpms/perl-Log-Log4perl/devel .cvsignore, 1.7, 1.8 perl-Log-Log4perl.spec, 1.9, 1.10 sources, 1.7, 1.8 Message-ID: <200702111710.l1BHACpX011560@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Log-Log4perl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11490/devel Modified Files: .cvsignore perl-Log-Log4perl.spec sources Log Message: Update to 1.09. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Log-Log4perl/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 25 Nov 2006 21:24:05 -0000 1.7 +++ .cvsignore 11 Feb 2007 17:09:40 -0000 1.8 @@ -1 +1 @@ -Log-Log4perl-1.08.tar.gz +Log-Log4perl-1.09.tar.gz Index: perl-Log-Log4perl.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Log-Log4perl/devel/perl-Log-Log4perl.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Log-Log4perl.spec 25 Nov 2006 21:24:05 -0000 1.9 +++ perl-Log-Log4perl.spec 11 Feb 2007 17:09:40 -0000 1.10 @@ -1,5 +1,5 @@ Name: perl-Log-Log4perl -Version: 1.08 +Version: 1.09 Release: 1%{?dist} Summary: Log4j implementation for Perl @@ -19,7 +19,7 @@ BuildRequires: perl(SQL::Statement) BuildRequires: perl(DBD::CSV) BuildRequires: perl(XML::DOM) -# perl(RRDs) is provided by the rrdtool-perl package +# perl(RRDs) is provided by rrdtool-perl (a rrdtool subpackage) BuildRequires: perl(RRDs) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -47,7 +47,7 @@ rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' +find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* @@ -67,6 +67,9 @@ %changelog +* Sun Feb 11 2007 Jose Pedro Oliveira - 1.09-1 +- Update to 1.09. + * Sat Nov 25 2006 Jose Pedro Oliveira - 1.08-1 - Update to 1.08. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Log-Log4perl/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 25 Nov 2006 21:24:05 -0000 1.7 +++ sources 11 Feb 2007 17:09:40 -0000 1.8 @@ -1 +1 @@ -54fa5628deac4130f34208e4cb18328b Log-Log4perl-1.08.tar.gz +4d272cc5bf0307781d9d5d8b99d8e58e Log-Log4perl-1.09.tar.gz From fedora-extras-commits at redhat.com Sun Feb 11 18:48:53 2007 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Sun, 11 Feb 2007 13:48:53 -0500 Subject: rpms/blt/devel blt.spec,1.11,1.12 Message-ID: <200702111848.l1BImrTQ015753@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/blt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15734 Modified Files: blt.spec Log Message: require tk < 8.5. Index: blt.spec =================================================================== RCS file: /cvs/extras/rpms/blt/devel/blt.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- blt.spec 28 Aug 2006 09:52:50 -0000 1.11 +++ blt.spec 11 Feb 2007 18:48:20 -0000 1.12 @@ -1,7 +1,7 @@ Summary: BLT widget extension to Tcl/Tk scripting language development Name: blt Version: 2.4 -Release: 14.z%{?dist} +Release: 15.z%{?dist} License: MIT Group: Development/Libraries @@ -9,8 +9,8 @@ Patch0: http://download.sourceforge.net/blt/blt2.4z-patch-2 Patch1: http://jfontain.free.fr/blt2.4z-patch-64 URL: http://sourceforge.net/projects/blt/ -BuildRequires: tk-devel >= 8.4.7 -Requires: tk >= 8.4.7 +BuildRequires: tk-devel >= 8.4.7, tk-devel < 8.5 +Requires: tk >= 8.4.7, tk < 8.5 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n) %description @@ -52,6 +52,9 @@ %changelog +* Thu Feb 8 2007 Jean-Luc Fontaine 2.4-15.z +- require tk < 8.5 + * Mon Aug 28 2006 Jean-Luc Fontaine 2.4-14.z - added dist tag - rebuild for Fedora Extras 6 From fedora-extras-commits at redhat.com Sun Feb 11 19:58:03 2007 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Sun, 11 Feb 2007 14:58:03 -0500 Subject: rpms/gnu-smalltalk/devel gnu-smalltalk.spec,1.7,1.8 Message-ID: <200702111958.l1BJw3hA019752@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/gnu-smalltalk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19735 Modified Files: gnu-smalltalk.spec Log Message: Rebuild to fix broken deps Index: gnu-smalltalk.spec =================================================================== RCS file: /cvs/extras/rpms/gnu-smalltalk/devel/gnu-smalltalk.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gnu-smalltalk.spec 31 Jan 2007 16:00:06 -0000 1.7 +++ gnu-smalltalk.spec 11 Feb 2007 19:57:31 -0000 1.8 @@ -1,7 +1,7 @@ Summary: GNU Smalltalk Name: gnu-smalltalk Version: 2.3.2 -Release: 4%{?dist} +Release: 5%{?dist} # Source: smalltalk-2.2b.tar.gz Source: ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-%{version}.tar.gz Patch1: gst-2.3.2-am.patch @@ -143,6 +143,9 @@ %{_datadir}/emacs/site-lisp/* %changelog +* Sun Feb 11 2007 Jochen Schmitt 2.3.2-5 +- Rebuild to fix broken deps. + * Wed Jan 31 2007 Jochen Schmitt 2.3.2-4 - New upstream release From fedora-extras-commits at redhat.com Sun Feb 11 21:02:13 2007 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Sun, 11 Feb 2007 16:02:13 -0500 Subject: rpms/deskbar-applet/devel deskbar-applet.spec,1.42,1.43 Message-ID: <200702112102.l1BL2D3A027814@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/deskbar-applet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27743 Modified Files: deskbar-applet.spec Log Message: disable scrollkeeper support, for now Index: deskbar-applet.spec =================================================================== RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- deskbar-applet.spec 9 Feb 2007 07:26:48 -0000 1.42 +++ deskbar-applet.spec 11 Feb 2007 21:01:41 -0000 1.43 @@ -3,7 +3,7 @@ Name: deskbar-applet Version: 2.17.90 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A Gnome applet to allow easy access to various search engines Group: Applications/Internet @@ -17,13 +17,12 @@ BuildRequires: gettext evolution-data-server-devel gnome-desktop-devel BuildRequires: libSM-devel gnome-python2-applet desktop-file-utils BuildRequires: perl(XML::Parser) gnome-python2-devel -BuildRequires: gnome-doc-utils scrollkeeper +BuildRequires: gnome-doc-utils Requires: gnome-python2 gnome-python2-applet gnome-python2-bonobo Requires: gnome-python2-gconf pygtk2 gnome-python2-libwnck Requires(pre): GConf2 -Requires(post): GConf2 desktop-file-utils scrollkeeper +Requires(post): GConf2 desktop-file-utils Requires(preun): GConf2 desktop-file-utils -Requires(postun): scrollkeeper Provides: deskbar-applet-fedorabz %description @@ -39,7 +38,7 @@ %setup -q %build -%configure --disable-schemas-install +%configure --disable-schemas-install --disable-scrollkeeper make %{_smp_mflags} %install @@ -75,7 +74,6 @@ touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : %preun if [ "$1" -eq 0 ]; then @@ -88,7 +86,6 @@ %postun touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -scrollkeeper-update -q || : %files -f %{name}.lang %defattr(-,root,root,-) @@ -102,9 +99,11 @@ %{_datadir}/icons/hicolor/*/apps/%{name}.* %{_datadir}/gnome/help/deskbar/C/ %{_datadir}/omf/deskbar/ -/var/lib/scrollkeeper/ %changelog +* Tue Feb 11 2007 Luke Macken - 2.17.90-3 +- Disable scrollkeeper support, for now + * Tue Feb 9 2007 Luke Macken - 2.17.90-2 - Rebuild From fedora-extras-commits at redhat.com Sun Feb 11 21:15:02 2007 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sun, 11 Feb 2007 16:15:02 -0500 Subject: rpms/chkrootkit/devel chkrootkit-0.47-chklastlog.patch, NONE, 1.1 chkrootkit.spec, 1.21, 1.22 Message-ID: <200702112115.l1BLF2i1028011@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/chkrootkit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27986 Modified Files: chkrootkit.spec Added Files: chkrootkit-0.47-chklastlog.patch Log Message: * Sun Feb 11 2007 Michael Schwendt - 0.47-6 - Make chklastlog default to /var/log/lastlog and /var/log/wtmp, which can be set with options -l and -f, too, however. chkrootkit-0.47-chklastlog.patch: --- NEW FILE chkrootkit-0.47-chklastlog.patch --- diff -Nur chkrootkit-0.47-orig/chklastlog.c chkrootkit-0.47/chklastlog.c --- chkrootkit-0.47-orig/chklastlog.c 2006-02-11 18:02:48.000000000 +0100 +++ chkrootkit-0.47/chklastlog.c 2007-02-11 22:10:25.000000000 +0100 @@ -62,10 +62,10 @@ #define LASTLOG_FILENAME "/var/log/lastlog" #endif #ifndef WTMP_FILENAME -#define WTMP_FILENAME "/var/adm/wtmp" +#define WTMP_FILENAME "/var/log/wtmp" #endif #ifndef LASTLOG_FILENAME -#define LASTLOG_FILENAME "/var/adm/lastlog" +#define LASTLOG_FILENAME "/var/log/lastlog" #endif #define TRUE 1L Index: chkrootkit.spec =================================================================== RCS file: /cvs/extras/rpms/chkrootkit/devel/chkrootkit.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- chkrootkit.spec 31 Jan 2007 18:33:57 -0000 1.21 +++ chkrootkit.spec 11 Feb 2007 21:14:30 -0000 1.22 @@ -1,6 +1,6 @@ Name: chkrootkit Version: 0.47 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Tool to locally check for signs of a rootkit Group: Applications/System License: BSD-like @@ -17,6 +17,7 @@ Patch3: chkrootkit-0.45-includes.patch Patch4: chkrootkit-0.47-warnings.patch Patch5: chkrootkit-0.47-no-openbsd.patch +Patch6: chkrootkit-0.47-chklastlog.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -45,6 +46,7 @@ %patch3 -p1 -b .includes %patch4 -p1 -b .warnings %patch5 -p1 -b .no-openbsd +%patch6 -p1 -b .chklastlog sed -i -e 's!\s\+ at strip.*!!g' Makefile @@ -113,6 +115,10 @@ %changelog +* Sun Feb 11 2007 Michael Schwendt - 0.47-6 +- Make chklastlog default to /var/log/lastlog and /var/log/wtmp, + which can be set with options -l and -f, too, however. + * Wed Jan 31 2007 Michael Schwendt - 0.47-5 - Upstream wants to disable the OBSD rk v1 check on Linux with next release. From fedora-extras-commits at redhat.com Sun Feb 11 21:51:02 2007 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sun, 11 Feb 2007 16:51:02 -0500 Subject: rpms/chkrootkit/devel chkrootkit-0.47-chklastlog.patch,1.1,1.2 Message-ID: <200702112151.l1BLp2Dd028277@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/chkrootkit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28251 Modified Files: chkrootkit-0.47-chklastlog.patch Log Message: also patch the README chkrootkit-0.47-chklastlog.patch: Index: chkrootkit-0.47-chklastlog.patch =================================================================== RCS file: /cvs/extras/rpms/chkrootkit/devel/chkrootkit-0.47-chklastlog.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- chkrootkit-0.47-chklastlog.patch 11 Feb 2007 21:14:30 -0000 1.1 +++ chkrootkit-0.47-chklastlog.patch 11 Feb 2007 21:50:30 -0000 1.2 @@ -14,3 +14,17 @@ #endif #define TRUE 1L +diff -Nur chkrootkit-0.47-orig/README.chklastlog chkrootkit-0.47/README.chklastlog +--- chkrootkit-0.47-orig/README.chklastlog 2006-02-11 18:02:48.000000000 +0100 ++++ chkrootkit-0.47/README.chklastlog 2007-02-11 22:50:04.000000000 +0100 +@@ -31,8 +31,8 @@ + % cc -o chklastlog chklastlog.c + + +- To run chklastlog you need read permission on the files /var/adm/wtmp +- and /var/adm/lastlogin. Normally these files are world-readable and ++ To run chklastlog you need read permission on the files /var/log/wtmp ++ and /var/log/lastlog. Normally these files are world-readable and + no special privileges are required to run the checker. + + The following is an example of the output of chklastlog. From fedora-extras-commits at redhat.com Sun Feb 11 22:55:07 2007 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Sun, 11 Feb 2007 17:55:07 -0500 Subject: rpms/gnomad2/devel gnomad2-2.8.11.patch, NONE, 1.1 gnomad2.spec, 1.17, 1.18 Message-ID: <200702112255.l1BMt7PB031871@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/gnomad2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31851 Modified Files: gnomad2.spec Added Files: gnomad2-2.8.11.patch Log Message: Problem with g_stat(). gnomad2-2.8.11.patch: --- NEW FILE gnomad2-2.8.11.patch --- --- gnomad2-2.8.11-orig/src/filesystem.c 2007-01-09 22:30:27.000000000 +0100 +++ gnomad2/src/filesystem.c 2007-02-11 23:45:15.000000000 +0100 @@ -261,6 +261,9 @@ /* Directories: no full path, just dirname; size 0 */ filelist = NULL; tmppath = filename_fromutf8(base_path); + if (gnomad_debug != 0) { + g_print("Getting directory listing for: %s\n", base_path); + } dirp = opendir(tmppath); if (!dirp){ if (gnomad_debug != 0) { @@ -277,15 +280,22 @@ int is_dir; int is_file; - strncpy(path_buffer, tmppath, 512); - strcat(path_buffer, G_DIR_SEPARATOR_S); - strcat(path_buffer, dir_entry->d_name); - if (g_stat(path_buffer, &entry_status)) { + strncpy(path_buffer, tmppath, sizeof(path_buffer)); + path_buffer[sizeof(path_buffer)-1] = '\0'; + strncat(path_buffer, G_DIR_SEPARATOR_S, sizeof(path_buffer)-strlen(path_buffer)); + path_buffer[sizeof(path_buffer)-1] = '\0'; + strncat(path_buffer, dir_entry->d_name, sizeof(path_buffer)-strlen(path_buffer)); + path_buffer[sizeof(path_buffer)-1] = '\0'; + if (gnomad_debug != 0) { + g_print("Examining dir path: %s\n", path_buffer); + } + if (stat(path_buffer, &entry_status)) { if (gnomad_debug != 0) { g_print("Failed to read file status for %s.\n", path_buffer); } continue; } + g_print("Examining dir path (2): %s\n", path_buffer); size = (int) entry_status.st_size; is_dir = S_ISDIR(entry_status.st_mode); is_file = S_ISREG(entry_status.st_mode); @@ -324,6 +334,8 @@ g_ascii_strcasecmp(tmp,"wma") #ifdef HAVE_LIBMTP // Additional music codecs supported by libmtp + // TODO: base this on the list of filetypes actually + // supported by a particular device, if one is connected. && g_ascii_strcasecmp(tmp,"ogg") && g_ascii_strcasecmp(tmp,"flac") && @@ -348,6 +360,7 @@ } #ifndef G_OS_WIN32 filename = g_strdup(path_buffer); + g_printf("strdup(%s)=%s\n", path_buffer, filename); #else // On Windows we need to convert into UTF-8 since // this does not use the stdio wrappers properly. Index: gnomad2.spec =================================================================== RCS file: /cvs/extras/rpms/gnomad2/devel/gnomad2.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- gnomad2.spec 29 Jan 2007 20:03:58 -0000 1.17 +++ gnomad2.spec 11 Feb 2007 22:54:35 -0000 1.18 @@ -10,7 +10,7 @@ Name: gnomad2 Version: 2.8.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs License: GPL @@ -18,6 +18,7 @@ Group: Applications/Multimedia Source: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Patch0: gnomad2-2.8.11.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -42,6 +43,7 @@ %prep %setup +%patch0 -p1 %build %configure @@ -80,6 +82,8 @@ %doc AUTHORS NEWS README COPYING ChangeLog %changelog +* Sun Feb 11 2007 Linus Walleij 2.8.11-2 +- RH buildsystem mangles g_stat() some way, patch to use just stat() * Mon Jan 29 2007 Linus Walleij 2.8.11-1 - New upstream version fixing a bug. * Wed Jan 24 2007 Linus Walleij 2.8.10-1 From fedora-extras-commits at redhat.com Sun Feb 11 22:56:53 2007 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Sun, 11 Feb 2007 17:56:53 -0500 Subject: rpms/gnomad2/FC-6 gnomad2-2.8.11.patch, NONE, 1.1 gnomad2.spec, 1.13, 1.14 Message-ID: <200702112256.l1BMurdv031942@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/gnomad2/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31922 Modified Files: gnomad2.spec Added Files: gnomad2-2.8.11.patch Log Message: Problem with g_stat(). gnomad2-2.8.11.patch: --- NEW FILE gnomad2-2.8.11.patch --- --- gnomad2-2.8.11-orig/src/filesystem.c 2007-01-09 22:30:27.000000000 +0100 +++ gnomad2/src/filesystem.c 2007-02-11 23:45:15.000000000 +0100 @@ -261,6 +261,9 @@ /* Directories: no full path, just dirname; size 0 */ filelist = NULL; tmppath = filename_fromutf8(base_path); + if (gnomad_debug != 0) { + g_print("Getting directory listing for: %s\n", base_path); + } dirp = opendir(tmppath); if (!dirp){ if (gnomad_debug != 0) { @@ -277,15 +280,22 @@ int is_dir; int is_file; - strncpy(path_buffer, tmppath, 512); - strcat(path_buffer, G_DIR_SEPARATOR_S); - strcat(path_buffer, dir_entry->d_name); - if (g_stat(path_buffer, &entry_status)) { + strncpy(path_buffer, tmppath, sizeof(path_buffer)); + path_buffer[sizeof(path_buffer)-1] = '\0'; + strncat(path_buffer, G_DIR_SEPARATOR_S, sizeof(path_buffer)-strlen(path_buffer)); + path_buffer[sizeof(path_buffer)-1] = '\0'; + strncat(path_buffer, dir_entry->d_name, sizeof(path_buffer)-strlen(path_buffer)); + path_buffer[sizeof(path_buffer)-1] = '\0'; + if (gnomad_debug != 0) { + g_print("Examining dir path: %s\n", path_buffer); + } + if (stat(path_buffer, &entry_status)) { if (gnomad_debug != 0) { g_print("Failed to read file status for %s.\n", path_buffer); } continue; } + g_print("Examining dir path (2): %s\n", path_buffer); size = (int) entry_status.st_size; is_dir = S_ISDIR(entry_status.st_mode); is_file = S_ISREG(entry_status.st_mode); @@ -324,6 +334,8 @@ g_ascii_strcasecmp(tmp,"wma") #ifdef HAVE_LIBMTP // Additional music codecs supported by libmtp + // TODO: base this on the list of filetypes actually + // supported by a particular device, if one is connected. && g_ascii_strcasecmp(tmp,"ogg") && g_ascii_strcasecmp(tmp,"flac") && @@ -348,6 +360,7 @@ } #ifndef G_OS_WIN32 filename = g_strdup(path_buffer); + g_printf("strdup(%s)=%s\n", path_buffer, filename); #else // On Windows we need to convert into UTF-8 since // this does not use the stdio wrappers properly. Index: gnomad2.spec =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-6/gnomad2.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gnomad2.spec 7 Feb 2007 12:08:54 -0000 1.13 +++ gnomad2.spec 11 Feb 2007 22:56:21 -0000 1.14 @@ -10,7 +10,7 @@ Name: gnomad2 Version: 2.8.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs License: GPL @@ -18,6 +18,7 @@ Group: Applications/Multimedia Source: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Patch0: gnomad2-2.8.11.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -42,6 +43,7 @@ %prep %setup +%patch0 -p1 %build %configure @@ -80,6 +82,8 @@ %doc AUTHORS NEWS README COPYING ChangeLog %changelog +* Sun Feb 11 2007 Linus Walleij 2.8.11-2 +- RH buildsystem mangles g_stat() some way, patch to use just stat() * Mon Jan 29 2007 Linus Walleij 2.8.11-1 - New upstream version fixing a bug. * Wed Jan 24 2007 Linus Walleij 2.8.10-1 From fedora-extras-commits at redhat.com Sun Feb 11 22:58:36 2007 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Sun, 11 Feb 2007 17:58:36 -0500 Subject: rpms/gnomad2/FC-5 gnomad2-2.8.11.patch, NONE, 1.1 gnomad2.spec, 1.12, 1.13 Message-ID: <200702112258.l1BMwaXW032028@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/gnomad2/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31999 Modified Files: gnomad2.spec Added Files: gnomad2-2.8.11.patch Log Message: Problem with g_stat(). gnomad2-2.8.11.patch: --- NEW FILE gnomad2-2.8.11.patch --- --- gnomad2-2.8.11-orig/src/filesystem.c 2007-01-09 22:30:27.000000000 +0100 +++ gnomad2/src/filesystem.c 2007-02-11 23:45:15.000000000 +0100 @@ -261,6 +261,9 @@ /* Directories: no full path, just dirname; size 0 */ filelist = NULL; tmppath = filename_fromutf8(base_path); + if (gnomad_debug != 0) { + g_print("Getting directory listing for: %s\n", base_path); + } dirp = opendir(tmppath); if (!dirp){ if (gnomad_debug != 0) { @@ -277,15 +280,22 @@ int is_dir; int is_file; - strncpy(path_buffer, tmppath, 512); - strcat(path_buffer, G_DIR_SEPARATOR_S); - strcat(path_buffer, dir_entry->d_name); - if (g_stat(path_buffer, &entry_status)) { + strncpy(path_buffer, tmppath, sizeof(path_buffer)); + path_buffer[sizeof(path_buffer)-1] = '\0'; + strncat(path_buffer, G_DIR_SEPARATOR_S, sizeof(path_buffer)-strlen(path_buffer)); + path_buffer[sizeof(path_buffer)-1] = '\0'; + strncat(path_buffer, dir_entry->d_name, sizeof(path_buffer)-strlen(path_buffer)); + path_buffer[sizeof(path_buffer)-1] = '\0'; + if (gnomad_debug != 0) { + g_print("Examining dir path: %s\n", path_buffer); + } + if (stat(path_buffer, &entry_status)) { if (gnomad_debug != 0) { g_print("Failed to read file status for %s.\n", path_buffer); } continue; } + g_print("Examining dir path (2): %s\n", path_buffer); size = (int) entry_status.st_size; is_dir = S_ISDIR(entry_status.st_mode); is_file = S_ISREG(entry_status.st_mode); @@ -324,6 +334,8 @@ g_ascii_strcasecmp(tmp,"wma") #ifdef HAVE_LIBMTP // Additional music codecs supported by libmtp + // TODO: base this on the list of filetypes actually + // supported by a particular device, if one is connected. && g_ascii_strcasecmp(tmp,"ogg") && g_ascii_strcasecmp(tmp,"flac") && @@ -348,6 +360,7 @@ } #ifndef G_OS_WIN32 filename = g_strdup(path_buffer); + g_printf("strdup(%s)=%s\n", path_buffer, filename); #else // On Windows we need to convert into UTF-8 since // this does not use the stdio wrappers properly. Index: gnomad2.spec =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-5/gnomad2.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gnomad2.spec 7 Feb 2007 12:10:49 -0000 1.12 +++ gnomad2.spec 11 Feb 2007 22:58:04 -0000 1.13 @@ -10,7 +10,7 @@ Name: gnomad2 Version: 2.8.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs License: GPL @@ -18,6 +18,7 @@ Group: Applications/Multimedia Source: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Patch0: gnomad2-2.8.11.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -42,6 +43,7 @@ %prep %setup +%patch0 -p1 %build %configure @@ -80,6 +82,8 @@ %doc AUTHORS NEWS README COPYING ChangeLog %changelog +* Sun Feb 11 2007 Linus Walleij 2.8.11-2 +- RH buildsystem mangles g_stat() some way, patch to use just stat() * Mon Jan 29 2007 Linus Walleij 2.8.11-1 - New upstream version fixing a bug. * Wed Jan 24 2007 Linus Walleij 2.8.10-1 From fedora-extras-commits at redhat.com Mon Feb 12 03:45:26 2007 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sun, 11 Feb 2007 22:45:26 -0500 Subject: rpms/gnome-applet-music/devel .cvsignore, 1.5, 1.6 gnome-applet-music.spec, 1.10, 1.11 sources, 1.5, 1.6 Message-ID: <200702120345.l1C3jQOs017773@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/gnome-applet-music/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17748/devel Modified Files: .cvsignore gnome-applet-music.spec sources Log Message: Update to new upstream release (2.1.0) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-music/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 19 Jan 2007 23:34:11 -0000 1.5 +++ .cvsignore 12 Feb 2007 03:44:53 -0000 1.6 @@ -1 +1 @@ -music-applet-2.0.0.tar.gz +music-applet-2.1.0.tar.gz Index: gnome-applet-music.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-music/devel/gnome-applet-music.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gnome-applet-music.spec 26 Jan 2007 06:26:45 -0000 1.10 +++ gnome-applet-music.spec 12 Feb 2007 03:44:53 -0000 1.11 @@ -2,8 +2,8 @@ %define python_module_name musicapplet Name: gnome-applet-music -Version: 2.0.0 -Release: 2%{?dist} +Version: 2.1.0 +Release: 1%{?dist} Summary: A GNOME panel applet to control various music players Group: Applications/Multimedia @@ -111,6 +111,11 @@ %changelog +* Sun Feb 11 2007 Peter Gordon - 2.1.0-1 +- Update to new upstream release (2.1.0); which includes a fix for 64-bit + plugin loading. See the included documentation (ChangeLog) for more + information. + * Thu Jan 25 2007 Peter Gordon - 2.0.0-2 - Change Requires(postun) to Requires(preun). There is no %%postun scriplet... - Update dbus-python dependency (0.80+) Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-music/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 19 Jan 2007 23:34:11 -0000 1.5 +++ sources 12 Feb 2007 03:44:53 -0000 1.6 @@ -1 +1 @@ -b1a6435828cef91fa1fe61b78acdb8b5 music-applet-2.0.0.tar.gz +7f4f37070886c4d75b1c162b362aef4c music-applet-2.1.0.tar.gz From fedora-extras-commits at redhat.com Mon Feb 12 06:09:39 2007 From: fedora-extras-commits at redhat.com (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?= (devrim)) Date: Mon, 12 Feb 2007 01:09:39 -0500 Subject: rpms/postgresql-pgpool/FC-5 .cvsignore, 1.3, 1.4 postgresql-pgpool.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200702120609.l1C69dUt028359@cvs-int.fedora.redhat.com> Author: devrim Update of /cvs/extras/rpms/postgresql-pgpool/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28304/FC-5 Modified Files: .cvsignore postgresql-pgpool.spec sources Log Message: Update to 3.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/postgresql-pgpool/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 12 Dec 2006 11:44:46 -0000 1.3 +++ .cvsignore 12 Feb 2007 06:09:07 -0000 1.4 @@ -1 +1 @@ -pgpool-3.1.2.tar.gz +pgpool-3.2.tar.gz Index: postgresql-pgpool.spec =================================================================== RCS file: /cvs/extras/rpms/postgresql-pgpool/FC-5/postgresql-pgpool.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- postgresql-pgpool.spec 16 Jan 2007 09:54:19 -0000 1.3 +++ postgresql-pgpool.spec 12 Feb 2007 06:09:07 -0000 1.4 @@ -2,12 +2,12 @@ Summary: Pgpool is a connection pooling/replication server for PostgreSQL Name: postgresql-%{short_name} -Version: 3.1.2 +Version: 3.2 Release: 1%{?dist} License: BSD Group: Applications/Databases URL: http://pgpool.projects.PostgreSQL.org -Source0: http://pgfoundry.org/frs/download.php/980/%{short_name}-%{version}.tar.gz +Source0: http://pgfoundry.org/frs/download.php/1254/%{short_name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -33,17 +33,22 @@ install -m 644 %{short_name}.8 %{buildroot}%{_mandir}/man8/ install -d %{buildroot}/%{_docdir}/%{name}-%{version} mv %{buildroot}%{_sysconfdir}/pgpool.conf.sample %{buildroot}/%{_docdir}/%{name}-%{version} +mv %{buildroot}%{_sysconfdir}/pool_hba.conf.sample %{buildroot}/%{_docdir}/%{name}-%{version} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc README README.euc_jp TODO COPYING INSTALL AUTHORS ChangeLog NEWS pgpool.conf.sample +%doc README README.euc_jp TODO COPYING INSTALL AUTHORS ChangeLog NEWS pgpool.conf.sample pool_hba.conf.sample %{_bindir}/pgpool %{_mandir}/man8/* + %changelog +* Mon Feb 12 2007 - Devrim GUNDUZ 3.2-1 +- Update to 3.2 + * Tue Jan 16 2007 - Devrim GUNDUZ 3.1.2-2 - Removed vendor tag, per rh bugzilla #222797 Index: sources =================================================================== RCS file: /cvs/extras/rpms/postgresql-pgpool/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 12 Dec 2006 11:44:46 -0000 1.3 +++ sources 12 Feb 2007 06:09:07 -0000 1.4 @@ -1 +1 @@ -da633311ebe9a10172a14ea9784fed24 pgpool-3.1.2.tar.gz +1a8f7359a73585698890624ba600bdf8 pgpool-3.2.tar.gz From fedora-extras-commits at redhat.com Mon Feb 12 06:09:42 2007 From: fedora-extras-commits at redhat.com (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?= (devrim)) Date: Mon, 12 Feb 2007 01:09:42 -0500 Subject: rpms/postgresql-pgpool/FC-6 .cvsignore, 1.3, 1.4 postgresql-pgpool.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200702120609.l1C69gmg028364@cvs-int.fedora.redhat.com> Author: devrim Update of /cvs/extras/rpms/postgresql-pgpool/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28304/FC-6 Modified Files: .cvsignore postgresql-pgpool.spec sources Log Message: Update to 3.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/postgresql-pgpool/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 12 Dec 2006 11:44:47 -0000 1.3 +++ .cvsignore 12 Feb 2007 06:09:10 -0000 1.4 @@ -1 +1 @@ -pgpool-3.1.2.tar.gz +pgpool-3.2.tar.gz Index: postgresql-pgpool.spec =================================================================== RCS file: /cvs/extras/rpms/postgresql-pgpool/FC-6/postgresql-pgpool.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- postgresql-pgpool.spec 16 Jan 2007 09:54:19 -0000 1.3 +++ postgresql-pgpool.spec 12 Feb 2007 06:09:10 -0000 1.4 @@ -2,12 +2,12 @@ Summary: Pgpool is a connection pooling/replication server for PostgreSQL Name: postgresql-%{short_name} -Version: 3.1.2 -Release: 2%{?dist} +Version: 3.2 +Release: 1%{?dist} License: BSD Group: Applications/Databases URL: http://pgpool.projects.PostgreSQL.org -Source0: http://pgfoundry.org/frs/download.php/980/%{short_name}-%{version}.tar.gz +Source0: http://pgfoundry.org/frs/download.php/1254/%{short_name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -33,17 +33,22 @@ install -m 644 %{short_name}.8 %{buildroot}%{_mandir}/man8/ install -d %{buildroot}/%{_docdir}/%{name}-%{version} mv %{buildroot}%{_sysconfdir}/pgpool.conf.sample %{buildroot}/%{_docdir}/%{name}-%{version} +mv %{buildroot}%{_sysconfdir}/pool_hba.conf.sample %{buildroot}/%{_docdir}/%{name}-%{version} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc README README.euc_jp TODO COPYING INSTALL AUTHORS ChangeLog NEWS pgpool.conf.sample +%doc README README.euc_jp TODO COPYING INSTALL AUTHORS ChangeLog NEWS pgpool.conf.sample pool_hba.conf.sample %{_bindir}/pgpool %{_mandir}/man8/* + %changelog +* Mon Feb 12 2007 - Devrim GUNDUZ 3.2-1 +- Update to 3.2 + * Tue Jan 16 2007 - Devrim GUNDUZ 3.1.2-2 - Removed vendor tag, per rh bugzilla #222797 Index: sources =================================================================== RCS file: /cvs/extras/rpms/postgresql-pgpool/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 12 Dec 2006 11:44:47 -0000 1.3 +++ sources 12 Feb 2007 06:09:10 -0000 1.4 @@ -1 +1 @@ -da633311ebe9a10172a14ea9784fed24 pgpool-3.1.2.tar.gz +1a8f7359a73585698890624ba600bdf8 pgpool-3.2.tar.gz From fedora-extras-commits at redhat.com Mon Feb 12 06:09:44 2007 From: fedora-extras-commits at redhat.com (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?= (devrim)) Date: Mon, 12 Feb 2007 01:09:44 -0500 Subject: rpms/postgresql-pgpool/devel .cvsignore, 1.3, 1.4 postgresql-pgpool.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200702120609.l1C69iN5028369@cvs-int.fedora.redhat.com> Author: devrim Update of /cvs/extras/rpms/postgresql-pgpool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28304/devel Modified Files: .cvsignore postgresql-pgpool.spec sources Log Message: Update to 3.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/postgresql-pgpool/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 12 Dec 2006 11:44:52 -0000 1.3 +++ .cvsignore 12 Feb 2007 06:09:12 -0000 1.4 @@ -1 +1 @@ -pgpool-3.1.2.tar.gz +pgpool-3.2.tar.gz Index: postgresql-pgpool.spec =================================================================== RCS file: /cvs/extras/rpms/postgresql-pgpool/devel/postgresql-pgpool.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- postgresql-pgpool.spec 16 Jan 2007 09:54:25 -0000 1.3 +++ postgresql-pgpool.spec 12 Feb 2007 06:09:12 -0000 1.4 @@ -2,12 +2,12 @@ Summary: Pgpool is a connection pooling/replication server for PostgreSQL Name: postgresql-%{short_name} -Version: 3.1.2 -Release: 2%{?dist} +Version: 3.2 +Release: 1%{?dist} License: BSD Group: Applications/Databases URL: http://pgpool.projects.PostgreSQL.org -Source0: http://pgfoundry.org/frs/download.php/980/%{short_name}-%{version}.tar.gz +Source0: http://pgfoundry.org/frs/download.php/1254/%{short_name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -33,17 +33,22 @@ install -m 644 %{short_name}.8 %{buildroot}%{_mandir}/man8/ install -d %{buildroot}/%{_docdir}/%{name}-%{version} mv %{buildroot}%{_sysconfdir}/pgpool.conf.sample %{buildroot}/%{_docdir}/%{name}-%{version} +mv %{buildroot}%{_sysconfdir}/pool_hba.conf.sample %{buildroot}/%{_docdir}/%{name}-%{version} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc README README.euc_jp TODO COPYING INSTALL AUTHORS ChangeLog NEWS pgpool.conf.sample +%doc README README.euc_jp TODO COPYING INSTALL AUTHORS ChangeLog NEWS pgpool.conf.sample pool_hba.conf.sample %{_bindir}/pgpool %{_mandir}/man8/* + %changelog +* Mon Feb 12 2007 - Devrim GUNDUZ 3.2-1 +- Update to 3.2 + * Tue Jan 16 2007 - Devrim GUNDUZ 3.1.2-2 - Removed vendor tag, per rh bugzilla #222797 Index: sources =================================================================== RCS file: /cvs/extras/rpms/postgresql-pgpool/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 12 Dec 2006 11:44:52 -0000 1.3 +++ sources 12 Feb 2007 06:09:12 -0000 1.4 @@ -1 +1 @@ -da633311ebe9a10172a14ea9784fed24 pgpool-3.1.2.tar.gz +1a8f7359a73585698890624ba600bdf8 pgpool-3.2.tar.gz From fedora-extras-commits at redhat.com Mon Feb 12 08:03:17 2007 From: fedora-extras-commits at redhat.com (Ruben Kerkhof (ruben)) Date: Mon, 12 Feb 2007 03:03:17 -0500 Subject: rpms/incron/devel .cvsignore, 1.3, 1.4 incron.spec, 1.2, 1.3 incrond.init, 1.1, 1.2 sources, 1.3, 1.4 Message-ID: <200702120803.l1C83HwT003194@cvs-int.fedora.redhat.com> Author: ruben Update of /cvs/extras/rpms/incron/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3169 Modified Files: .cvsignore incron.spec incrond.init sources Log Message: Sync with upstream (0.5.4) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/incron/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 4 Feb 2007 15:33:16 -0000 1.3 +++ .cvsignore 12 Feb 2007 08:02:45 -0000 1.4 @@ -1 +1 @@ -incron-0.5.1.tar.bz2 +incron-0.5.4.tar.bz2 Index: incron.spec =================================================================== RCS file: /cvs/extras/rpms/incron/devel/incron.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- incron.spec 4 Feb 2007 15:33:16 -0000 1.2 +++ incron.spec 12 Feb 2007 08:02:45 -0000 1.3 @@ -1,6 +1,6 @@ Summary: Inotify cron system Name: incron -Version: 0.5.1 +Version: 0.5.4 Release: 1%{?dist} Group: System Environment/Base @@ -68,6 +68,7 @@ %config(noreplace) %{_sysconfdir}/%{name}.conf %{_mandir}/man1/incrontab.1.gz %{_mandir}/man5/incrontab.5.gz +%{_mandir}/man5/incron.conf.5.gz %{_mandir}/man8/incrond.8.gz %dir %{_localstatedir}/spool/%{name} %dir %{_sysconfdir}/%{name}.d @@ -76,6 +77,11 @@ %changelog +* Mon Feb 12 2007 0.5.4-1 +- Update to new upstream version +- Upstream fixed permissions on pidfile +- New manpage for incron.conf +- Upstream fixed example conf file * Sun Feb 04 2007 0.5.1-1 - Updated to new upstream version - Upstream fixed the incorrect encoding of the LICENSE-GPL file Index: incrond.init =================================================================== RCS file: /cvs/extras/rpms/incron/devel/incrond.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- incrond.init 28 Jan 2007 20:33:13 -0000 1.1 +++ incrond.init 12 Feb 2007 08:02:45 -0000 1.2 @@ -10,7 +10,7 @@ # instead of time periods. # and can send notifications via mail, dbus or syslog. # processname: incrond -# +# pidfile: /var/run/incrond.pid # source function library . /etc/rc.d/init.d/functions Index: sources =================================================================== RCS file: /cvs/extras/rpms/incron/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 4 Feb 2007 15:33:16 -0000 1.3 +++ sources 12 Feb 2007 08:02:45 -0000 1.4 @@ -1 +1 @@ -e6b797e6598c79b4382ca37c4a00045a incron-0.5.1.tar.bz2 +20a0731a3b5bbed80b56d7efe4b078ef incron-0.5.4.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 12 08:13:42 2007 From: fedora-extras-commits at redhat.com (Ruben Kerkhof (ruben)) Date: Mon, 12 Feb 2007 03:13:42 -0500 Subject: rpms/incron/FC-6 .cvsignore, 1.2, 1.3 incron.spec, 1.1, 1.2 incrond.init, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200702120813.l1C8Dgtk003736@cvs-int.fedora.redhat.com> Author: ruben Update of /cvs/extras/rpms/incron/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3686 Modified Files: .cvsignore incron.spec incrond.init sources Log Message: Sync with upstream (0.5.4) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/incron/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Jan 2007 20:33:13 -0000 1.2 +++ .cvsignore 12 Feb 2007 08:13:10 -0000 1.3 @@ -1 +1 @@ -incron-0.5.0.tar.bz2 +incron-0.5.4.tar.bz2 Index: incron.spec =================================================================== RCS file: /cvs/extras/rpms/incron/FC-6/incron.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- incron.spec 28 Jan 2007 20:33:13 -0000 1.1 +++ incron.spec 12 Feb 2007 08:13:10 -0000 1.2 @@ -1,6 +1,6 @@ Summary: Inotify cron system Name: incron -Version: 0.5.0 +Version: 0.5.4 Release: 1%{?dist} Group: System Environment/Base @@ -22,7 +22,6 @@ %prep %setup -q -%{__sed} -i 's/ //' LICENSE-GPL %build make %{?_smp_mflags} CXXFLAGS="%{optflags}" @@ -69,6 +68,7 @@ %config(noreplace) %{_sysconfdir}/%{name}.conf %{_mandir}/man1/incrontab.1.gz %{_mandir}/man5/incrontab.5.gz +%{_mandir}/man5/incron.conf.5.gz %{_mandir}/man8/incrond.8.gz %dir %{_localstatedir}/spool/%{name} %dir %{_sysconfdir}/%{name}.d @@ -77,6 +77,13 @@ %changelog +* Mon Feb 12 2007 0.5.4-1 +- Update to new upstream version +- Upstream fixed permissions on pidfile +- New manpage for incron.conf +- Upstream fixed example conf file +- Upstream fixed the bug which caused that newly created tables were not loaded in some cases +- Upstream fixed incorrect encoding on LICENSE-GPL file * Sun Jan 27 2007 0.5.0-1 - Updated to new upstream version - Changed the service name in the scriptlets Index: incrond.init =================================================================== RCS file: /cvs/extras/rpms/incron/FC-6/incrond.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- incrond.init 28 Jan 2007 20:33:13 -0000 1.1 +++ incrond.init 12 Feb 2007 08:13:10 -0000 1.2 @@ -10,7 +10,7 @@ # instead of time periods. # and can send notifications via mail, dbus or syslog. # processname: incrond -# +# pidfile: /var/run/incrond.pid # source function library . /etc/rc.d/init.d/functions Index: sources =================================================================== RCS file: /cvs/extras/rpms/incron/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Jan 2007 20:33:13 -0000 1.2 +++ sources 12 Feb 2007 08:13:10 -0000 1.3 @@ -1 +1 @@ -4418140738fb750234c6c782d54300ba incron-0.5.0.tar.bz2 +20a0731a3b5bbed80b56d7efe4b078ef incron-0.5.4.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 12 08:19:17 2007 From: fedora-extras-commits at redhat.com (Ruben Kerkhof (ruben)) Date: Mon, 12 Feb 2007 03:19:17 -0500 Subject: rpms/incron/FC-5 .cvsignore, 1.2, 1.3 incron.spec, 1.1, 1.2 incrond.init, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200702120819.l1C8JHPY004096@cvs-int.fedora.redhat.com> Author: ruben Update of /cvs/extras/rpms/incron/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4049 Modified Files: .cvsignore incron.spec incrond.init sources Log Message: Sync with new upstream version (0.5.4) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/incron/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Jan 2007 20:33:13 -0000 1.2 +++ .cvsignore 12 Feb 2007 08:18:44 -0000 1.3 @@ -1 +1 @@ -incron-0.5.0.tar.bz2 +incron-0.5.4.tar.bz2 Index: incron.spec =================================================================== RCS file: /cvs/extras/rpms/incron/FC-5/incron.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- incron.spec 28 Jan 2007 20:33:13 -0000 1.1 +++ incron.spec 12 Feb 2007 08:18:44 -0000 1.2 @@ -1,6 +1,6 @@ Summary: Inotify cron system Name: incron -Version: 0.5.0 +Version: 0.5.4 Release: 1%{?dist} Group: System Environment/Base @@ -22,7 +22,6 @@ %prep %setup -q -%{__sed} -i 's/ //' LICENSE-GPL %build make %{?_smp_mflags} CXXFLAGS="%{optflags}" @@ -69,6 +68,7 @@ %config(noreplace) %{_sysconfdir}/%{name}.conf %{_mandir}/man1/incrontab.1.gz %{_mandir}/man5/incrontab.5.gz +%{_mandir}/man5/incron.conf.5.gz %{_mandir}/man8/incrond.8.gz %dir %{_localstatedir}/spool/%{name} %dir %{_sysconfdir}/%{name}.d @@ -77,6 +77,13 @@ %changelog +* Mon Feb 12 2007 0.5.4-1 +- Update to new upstream version +- Upstream fixed permissions on pidfile +- New manpage for incron.conf +- Upstream fixed example conf file +- Upstream fixed the bug which caused that newly created tables were not loaded in some cases +- Upstream fixed incorrect encoding on LICENSE-GPL file * Sun Jan 27 2007 0.5.0-1 - Updated to new upstream version - Changed the service name in the scriptlets Index: incrond.init =================================================================== RCS file: /cvs/extras/rpms/incron/FC-5/incrond.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- incrond.init 28 Jan 2007 20:33:13 -0000 1.1 +++ incrond.init 12 Feb 2007 08:18:44 -0000 1.2 @@ -10,7 +10,7 @@ # instead of time periods. # and can send notifications via mail, dbus or syslog. # processname: incrond -# +# pidfile: /var/run/incrond.pid # source function library . /etc/rc.d/init.d/functions Index: sources =================================================================== RCS file: /cvs/extras/rpms/incron/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Jan 2007 20:33:13 -0000 1.2 +++ sources 12 Feb 2007 08:18:44 -0000 1.3 @@ -1 +1 @@ -4418140738fb750234c6c782d54300ba incron-0.5.0.tar.bz2 +20a0731a3b5bbed80b56d7efe4b078ef incron-0.5.4.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 12 09:54:29 2007 From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak)) Date: Mon, 12 Feb 2007 04:54:29 -0500 Subject: fedora-security/audit fc5,1.448,1.449 fc6,1.202,1.203 Message-ID: <200702120954.l1C9sToT008689@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8668 Modified Files: fc5 fc6 Log Message: new ignores Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.448 retrieving revision 1.449 diff -u -r1.448 -r1.449 --- fc5 7 Feb 2007 10:51:59 -0000 1.448 +++ fc5 12 Feb 2007 09:54:27 -0000 1.449 @@ -3,7 +3,9 @@ ** are items that need attention -CVE-2007-0650 ** tetex +CVE-2007-0823 ignore (xterm) feature, not a bug +CVE-2007-0822 ignore (util-linux) NULL dereference +CVE-2007-0650 ignore (tetex) needs user's assistance CVE-2007-0494 version (bind, fixed 9.3.4) #225268 [since FEDORA-2007-164] CVE-2007-0493 version (bind, fixed 9.3.4) #224443 [since FEDORA-2007-164] CVE-2007-0247 backport(squid, fixed 2.6.STABLE7) #222883 [since FEDORA-2007-092] Index: fc6 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc6,v retrieving revision 1.202 retrieving revision 1.203 diff -u -r1.202 -r1.203 --- fc6 7 Feb 2007 10:51:59 -0000 1.202 +++ fc6 12 Feb 2007 09:54:27 -0000 1.203 @@ -3,7 +3,9 @@ ** are items that need attention -CVE-2007-0650 VULNERABLE (tetex) #225491 +CVE-2007-0823 ignore (xterm) feature, not a bug +CVE-2007-0822 ignore (util-linux) NULL dereference +CVE-2007-0650 ignore (tetex) needs user's assistance CVE-2007-0537 VULNERABLE (kdebase) #225420 CVE-2007-0494 version (bind, fixed 9.3.4) #225268 [since FEDORA-2007-147] CVE-2007-0493 version (bind, fixed 9.3.4) #224443 [since FEDORA-2007-147] From fedora-extras-commits at redhat.com Mon Feb 12 10:46:02 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 12 Feb 2007 05:46:02 -0500 Subject: rpms/moin/FC-5 .cvsignore, 1.6, 1.7 moin.spec, 1.7, 1.8 sources, 1.6, 1.7 Message-ID: <200702121046.l1CAk2PK012258@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/moin/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12214/FC-5 Modified Files: .cvsignore moin.spec sources Log Message: Update FC-5 and FC-6 branches to 1.5.7 too (#228139, CVE-2007-0857). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/moin/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 1 Aug 2006 12:27:56 -0000 1.6 +++ .cvsignore 12 Feb 2007 10:45:29 -0000 1.7 @@ -1 +1 @@ -moin-1.5.4.tar.gz +moin-1.5.7.tar.gz Index: moin.spec =================================================================== RCS file: /cvs/extras/rpms/moin/FC-5/moin.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- moin.spec 1 Aug 2006 12:27:56 -0000 1.7 +++ moin.spec 12 Feb 2007 10:45:29 -0000 1.8 @@ -1,7 +1,7 @@ Summary: MoinMoin is a Python clone of WikiWiki Name: moin -Version: 1.5.4 -Release: 2%{?dist} +Version: 1.5.7 +Release: 1%{?dist} License: GPL Group: Applications/Internet URL: http://moinmoin.wikiwikiweb.de/ @@ -10,8 +10,8 @@ Patch0: moin-1.5.2-config.patch Patch1: moin-1.3.5-xml_newline.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRequires: python-devel, dos2unix BuildArch: noarch -BuildRequires: python, dos2unix %description A WikiWikiWeb is a collaborative hypertext environment, with an emphasis on @@ -52,6 +52,22 @@ %changelog +* Fri Feb 9 2007 Matthias Saou 1.5.7-1 +- Update to 1.5.7. + +* Mon Dec 11 2006 Matthias Saou 1.5.6-2 +- Rebuild against python 2.5. +- Change python build requirement to python-devel, as it's needed now. + +* Tue Oct 31 2006 Matthias Saou 1.5.6-1 +- Update to 1.5.6. + +* Mon Sep 18 2006 Matthias Saou 1.5.5-1 +- Update to 1.5.5. + +* Mon Aug 28 2006 Matthias Saou 1.5.4-3 +- FC6 rebuild. + * Tue Aug 1 2006 Matthias Saou 1.5.4-2 - Don't assume we have a sane default umask... (#200833). Index: sources =================================================================== RCS file: /cvs/extras/rpms/moin/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 1 Aug 2006 12:27:56 -0000 1.6 +++ sources 12 Feb 2007 10:45:29 -0000 1.7 @@ -1 +1 @@ -dcb85c72126c2fe39de66ef781a7dd39 moin-1.5.4.tar.gz +b304f1c2054c7f3bf0dc48c141b28b33 moin-1.5.7.tar.gz From fedora-extras-commits at redhat.com Mon Feb 12 10:46:04 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 12 Feb 2007 05:46:04 -0500 Subject: rpms/moin/FC-6 .cvsignore, 1.7, 1.8 moin.spec, 1.10, 1.11 sources, 1.7, 1.8 Message-ID: <200702121046.l1CAk4sW012263@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/moin/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12214/FC-6 Modified Files: .cvsignore moin.spec sources Log Message: Update FC-5 and FC-6 branches to 1.5.7 too (#228139, CVE-2007-0857). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/moin/FC-6/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 18 Sep 2006 10:56:50 -0000 1.7 +++ .cvsignore 12 Feb 2007 10:45:32 -0000 1.8 @@ -1 +1 @@ -moin-1.5.5.tar.gz +moin-1.5.7.tar.gz Index: moin.spec =================================================================== RCS file: /cvs/extras/rpms/moin/FC-6/moin.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- moin.spec 18 Sep 2006 10:56:50 -0000 1.10 +++ moin.spec 12 Feb 2007 10:45:32 -0000 1.11 @@ -1,6 +1,6 @@ Summary: MoinMoin is a Python clone of WikiWiki Name: moin -Version: 1.5.5 +Version: 1.5.7 Release: 1%{?dist} License: GPL Group: Applications/Internet @@ -10,7 +10,7 @@ Patch0: moin-1.5.2-config.patch Patch1: moin-1.3.5-xml_newline.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: python, dos2unix +BuildRequires: python-devel, dos2unix BuildArch: noarch %description @@ -52,6 +52,16 @@ %changelog +* Fri Feb 9 2007 Matthias Saou 1.5.7-1 +- Update to 1.5.7. + +* Mon Dec 11 2006 Matthias Saou 1.5.6-2 +- Rebuild against python 2.5. +- Change python build requirement to python-devel, as it's needed now. + +* Tue Oct 31 2006 Matthias Saou 1.5.6-1 +- Update to 1.5.6. + * Mon Sep 18 2006 Matthias Saou 1.5.5-1 - Update to 1.5.5. Index: sources =================================================================== RCS file: /cvs/extras/rpms/moin/FC-6/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 18 Sep 2006 10:56:50 -0000 1.7 +++ sources 12 Feb 2007 10:45:32 -0000 1.8 @@ -1 +1 @@ -68308ef881057cd5d8f27504302ec7cc moin-1.5.5.tar.gz +b304f1c2054c7f3bf0dc48c141b28b33 moin-1.5.7.tar.gz From fedora-extras-commits at redhat.com Mon Feb 12 11:53:33 2007 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Mon, 12 Feb 2007 06:53:33 -0500 Subject: rpms/python-simpy/devel python-simpy.spec, 1.13, 1.14 sources, 1.5, 1.6 Message-ID: <200702121153.l1CBrX4S016015@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15996 Modified Files: python-simpy.spec sources Log Message: Update to 1.8 Index: python-simpy.spec =================================================================== RCS file: /cvs/extras/rpms/python-simpy/devel/python-simpy.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- python-simpy.spec 22 Jan 2007 09:45:32 -0000 1.13 +++ python-simpy.spec 12 Feb 2007 11:53:00 -0000 1.14 @@ -1,10 +1,9 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %define pkgname SimPy -%define alphatag .rc1 Name: python-simpy Version: 1.8 -Release: 0.1%{alphatag}%{?dist} +Release: 1%{?dist} Summary: Python simulation framework Group: Development/Languages License: LGPL @@ -73,6 +72,9 @@ %changelog +* Mon Feb 12 2007 Sarantis Paskalis - 1.8-1 +- Update to 1.8 + * Mon Jan 22 2007 Sarantis Paskalis - 1.8-0.1.rc1 - Update to 1.8rc. Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-simpy/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 22 Jan 2007 09:45:32 -0000 1.5 +++ sources 12 Feb 2007 11:53:01 -0000 1.6 @@ -1 +1 @@ -e0b08a93c22328b7c3fa9ab79b468ddf SimPy-1.8.tar.gz +7abc6365009375b6f3d814288eeeb283 SimPy-1.8.tar.gz From fedora-extras-commits at redhat.com Mon Feb 12 11:58:22 2007 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 12 Feb 2007 06:58:22 -0500 Subject: rpms/GeoIP/devel .cvsignore, 1.8, 1.9 GeoIP.spec, 1.10, 1.11 sources, 1.8, 1.9 Message-ID: <200702121158.l1CBwM5w016105@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/GeoIP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16082 Modified Files: .cvsignore GeoIP.spec sources Log Message: * Mon Feb 12 2007 Michael Fleming 1.4.2-1 - New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/GeoIP/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 7 Jan 2007 02:07:26 -0000 1.8 +++ .cvsignore 12 Feb 2007 11:57:50 -0000 1.9 @@ -1,5 +1,5 @@ -GeoIP-1.4.1.tar.gz -LICENSE.txt -fetch-geoipdata.pl +GeoIP-1.4.2.tar.gz fetch-geoipdata-city.pl +fetch-geoipdata.pl +LICENSE.txt README.Fedora Index: GeoIP.spec =================================================================== RCS file: /cvs/extras/rpms/GeoIP/devel/GeoIP.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- GeoIP.spec 8 Jan 2007 05:48:05 -0000 1.10 +++ GeoIP.spec 12 Feb 2007 11:57:50 -0000 1.11 @@ -1,6 +1,6 @@ Name: GeoIP -Version: 1.4.1 -Release: 2%{?dist} +Version: 1.4.2 +Release: 1%{?dist} Summary: C library for country/city/organization to IP address or hostname mapping Group: Development/Libraries License: LGPL @@ -79,6 +79,9 @@ %{_libdir}/libGeoIPUpdate.so %changelog +* Mon Feb 12 2007 Michael Fleming 1.4.2-1 +- New upstream release. + * Mon Jan 8 2007 Michael Fleming 1.4.1-2 - License is actually LGPL now. Index: sources =================================================================== RCS file: /cvs/extras/rpms/GeoIP/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 7 Jan 2007 02:07:26 -0000 1.8 +++ sources 12 Feb 2007 11:57:50 -0000 1.9 @@ -1,5 +1,5 @@ -3a8f841b2a113b80ba2ed3b988826d00 GeoIP-1.4.1.tar.gz -8c0bc6e8ebe6ec3bc1580021edb4bba1 LICENSE.txt -c7c0ff588272cc686515d4c66b076cba fetch-geoipdata.pl +d310da791d1d760edad25d33f2166fcd GeoIP-1.4.2.tar.gz 48a9f71cc61aae720a473309d39db98b fetch-geoipdata-city.pl +c7c0ff588272cc686515d4c66b076cba fetch-geoipdata.pl +8c0bc6e8ebe6ec3bc1580021edb4bba1 LICENSE.txt 38e97c6ac82ac7b44f6d1f40c30580a5 README.Fedora From fedora-extras-commits at redhat.com Mon Feb 12 12:24:55 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 12 Feb 2007 07:24:55 -0500 Subject: rpms/djvulibre/FC-6 .cvsignore, 1.8, 1.9 djvulibre.spec, 1.18, 1.19 sources, 1.8, 1.9 Message-ID: <200702121224.l1CCOtap019654@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/djvulibre/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19571/FC-6 Modified Files: .cvsignore djvulibre.spec sources Log Message: Update FC-5 and FC-6 to 3.5.18, like devel (should fix #228193). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/djvulibre/FC-6/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 2 Jul 2006 18:26:24 -0000 1.8 +++ .cvsignore 12 Feb 2007 12:24:23 -0000 1.9 @@ -1 +1 @@ -djvulibre-3.5.17.tar.gz +djvulibre-3.5.18.tar.gz Index: djvulibre.spec =================================================================== RCS file: /cvs/extras/rpms/djvulibre/FC-6/djvulibre.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- djvulibre.spec 29 Aug 2006 17:26:12 -0000 1.18 +++ djvulibre.spec 12 Feb 2007 12:24:23 -0000 1.19 @@ -1,78 +1,63 @@ -Summary: DjVu viewers, encoders and utilities +Summary: DjVu viewers, encoders, utilities and web browser plugin Name: djvulibre -Version: 3.5.17 -Release: 2%{?dist} +Version: 3.5.18 +Release: 1%{?dist} License: GPL Group: Applications/Publishing -URL: http://djvulibre.djvuzone.org/ +URL: http://djvu.sourceforge.net/ Source: http://dl.sf.net/djvu/djvulibre-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Requires(post): xdg-utils, /sbin/ldconfig +Requires(preun): xdg-utils BuildRequires: qt-devel, libjpeg-devel, libtiff-devel -# These packages provide directories checked at configure time : -BuildRequires: redhat-menus, hicolor-icon-theme -# /usr/share/application-registry & /usr/share/mime-info : -BuildRequires: gnome-mime-data -# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora -%if %{!?fedora:6}%{?fedora} >= 5 -BuildRequires: libXt-devel -%else -BuildRequires: xorg-x11-devel -%endif -# Use mozilla up to FC5, and seamonkey for FC6+ and non-Fedora -%if %{!?fedora:6}%{?fedora} >= 6 -BuildRequires: seamonkey -%else -BuildRequires: mozilla -%endif -# Provide these here, they're so small, it's not worth splitting them out +BuildRequires: xdg-utils +# Virtual provides... might be worth splitting out for multilib, but then we'd +# probably need a separate -libs package to have 64bit tools and 32bit plugin Provides: mozilla-djvulibre = %{version}-%{release} -Provides: djvulibre-devel = %{version}-%{release} %description DjVu is a web-centric format and software platform for distributing documents -and images. DjVu content downloads faster, displays and renders faster, looks -nicer on a screen, and consume less client resources than competing formats. -DjVu was originally developed at AT&T Labs-Research by Leon Bottou, Yann -LeCun, Patrick Haffner, and many others. In March 2000, AT&T sold DjVu to -LizardTech Inc. who now distributes Windows/Mac plug-ins, and commercial -encoders (mostly on Windows) - -In an effort to promote DjVu as a Web standard, the LizardTech management was -enlightened enough to release the reference implementation of DjVu under the -GNU GPL in October 2000. DjVuLibre (which means free DjVu), is an enhanced -version of that code maintained by the original inventors of DjVu. It is -compatible with version 3.5 of the LizardTech DjVu software suite. +and images. DjVu can advantageously replace PDF, PS, TIFF, JPEG, and GIF for +distributing scanned documents, digital documents, or high-resolution pictures. +DjVu content downloads faster, displays and renders faster, looks nicer on a +screen, and consume less client resources than competing formats. DjVu images +display instantly and can be smoothly zoomed and panned with no lengthy +re-rendering. + +DjVuLibre is a free (GPL'ed) implementation of DjVu, including viewers, browser +plugins, decoders, simple encoders, and utilities. + + +%package devel +Summary: Development files for djvulibre +Group: Development/Libraries +Requires: %{name} = %{version}-%{release}, pkgconfig + +%description devel +Development files for djvulibre. %prep %setup -# In 3.5.15cvs, hardcoded "/usr/include/qt3" needs replacing -. /etc/profile.d/qt.sh -%{__perl} -pi -e "s|/usr/include/qt3|${QTINC}|g" gui/djview/Makefile.dep %build %configure -# In 3.5.14 %{?_smp_mflags} broke the build +# In 3.5.14 %{?_smp_mflags} broke the build - still in 3.5.18 %{__make} OPTS="%{optflags}" %install %{__rm} -rf %{buildroot} -%makeinstall +%{__make} install DESTDIR=%{buildroot} # Move plugin from the netscape directory to the main mozilla one %{__mkdir_p} %{buildroot}%{_libdir}/mozilla/plugins/ %{__mv} %{buildroot}%{_libdir}/netscape/plugins/nsdejavu.so \ %{buildroot}%{_libdir}/mozilla/plugins/nsdejavu.so -# Fix for the libs to get stripped correctly (still required in 3.5.15) +# Fix for the libs to get stripped correctly (still required in 3.5.18) find %{buildroot}%{_libdir} -name '*.so*' | xargs %{__chmod} +x -# Move menu entry pixmap to new location -%{__mkdir_p} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/ -%{__mv} %{buildroot}%{_datadir}/pixmaps/djvu.png \ - %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/djvu.png - %clean %{__rm} -rf %{buildroot} @@ -80,13 +65,21 @@ %post /sbin/ldconfig -gtk-update-icon-cache -q -f %{_datadir}/icons/hicolor || : -update-desktop-database /usr/share/applications || : +# Menu entry (icons and desktop file) +%{_datadir}/djvu/djview3/desktop/register-djview-menu install || : +# MIME types (icons and desktop file) +%{_datadir}/djvu/osi/desktop/register-djvu-mime install || : + +%preun +# Removal, not update +if [ $1 -eq 0 ]; then + # Menu entry (icons and desktop file) + %{_datadir}/djvu/djview3/desktop/register-djview-menu uninstall || : + # MIME types (icons and desktop file) + %{_datadir}/djvu/osi/desktop/register-djvu-mime uninstall || : +fi -%postun -/sbin/ldconfig -gtk-update-icon-cache -q -f %{_datadir}/icons/hicolor || : -update-desktop-database /usr/share/applications || : +%postun -p /sbin/ldconfig %files @@ -95,17 +88,14 @@ %{_bindir}/* %{_libdir}/*.so.* %{_libdir}/mozilla/plugins/nsdejavu.so -%{_datadir}/application-registry/djvu.applications -%{_datadir}/applications/djview.desktop -%{_datadir}/icons/hicolor/??x??/apps/djvu.png -%{_datadir}/icons/hicolor/??x??/mimetypes/djvu.png %{_datadir}/djvu/ -%{_datadir}/mime-info/djvu.* %{_mandir}/man1/* +#lang(de) %{_mandir}/de/man1/* +#lang(fr) %{_mandir}/fr/man1/* %lang(ja) %{_mandir}/ja/man1/* -#files devel -#defattr(-, root, root, 0755) +%files devel +%defattr(-, root, root, 0755) %{_includedir}/libdjvu/ %{_libdir}/pkgconfig/ddjvuapi.pc %exclude %{_libdir}/*.la @@ -113,6 +103,14 @@ %changelog +* Mon Feb 5 2007 Matthias Saou 3.5.18-1 +- Update to 3.5.18. +- Remove no longer needed /usr/include/qt3 replacing. +- Replace desktop build requirements and scriplets with new xdg utils way. +- Include new de and fr man page translations... not! Directories are empty. +- Split -devel sub-package, as the new djview4 should build require it. +- No longer build require a web browser, the plugin always gets built now. + * Mon Aug 28 2006 Matthias Saou 3.5.17-2 - FC6 rebuild. - Use mozilla up to FC5, and seamonkey for FC6+ and non-Fedora. Index: sources =================================================================== RCS file: /cvs/extras/rpms/djvulibre/FC-6/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 2 Jul 2006 18:26:24 -0000 1.8 +++ sources 12 Feb 2007 12:24:23 -0000 1.9 @@ -1 +1 @@ -18e71eec1f7d59ef4710b405ea64650e djvulibre-3.5.17.tar.gz +73fd6d4f92832b85a91529b7bb3b7710 djvulibre-3.5.18.tar.gz From fedora-extras-commits at redhat.com Mon Feb 12 12:24:52 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 12 Feb 2007 07:24:52 -0500 Subject: rpms/djvulibre/FC-5 .cvsignore, 1.8, 1.9 djvulibre.spec, 1.16, 1.17 sources, 1.8, 1.9 Message-ID: <200702121224.l1CCOqxx019649@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/djvulibre/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19571/FC-5 Modified Files: .cvsignore djvulibre.spec sources Log Message: Update FC-5 and FC-6 to 3.5.18, like devel (should fix #228193). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/djvulibre/FC-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 3 Jul 2006 08:29:00 -0000 1.8 +++ .cvsignore 12 Feb 2007 12:24:20 -0000 1.9 @@ -1 +1 @@ -djvulibre-3.5.17.tar.gz +djvulibre-3.5.18.tar.gz Index: djvulibre.spec =================================================================== RCS file: /cvs/extras/rpms/djvulibre/FC-5/djvulibre.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- djvulibre.spec 3 Jul 2006 08:28:25 -0000 1.16 +++ djvulibre.spec 12 Feb 2007 12:24:20 -0000 1.17 @@ -1,69 +1,63 @@ -Summary: DjVu viewers, encoders and utilities +Summary: DjVu viewers, encoders, utilities and web browser plugin Name: djvulibre -Version: 3.5.17 +Version: 3.5.18 Release: 1%{?dist} License: GPL Group: Applications/Publishing -URL: http://djvulibre.djvuzone.org/ +URL: http://djvu.sourceforge.net/ Source: http://dl.sf.net/djvu/djvulibre-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Requires(post): xdg-utils, /sbin/ldconfig +Requires(preun): xdg-utils BuildRequires: qt-devel, libjpeg-devel, libtiff-devel -BuildRequires: mozilla, redhat-menus, hicolor-icon-theme -# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora -%if %{!?fedora:5}%{?fedora} >= 5 -BuildRequires: libXt-devel -%else -BuildRequires: xorg-x11-devel -%endif -# Provide these here, they're so small, it's not worth splitting them out +BuildRequires: xdg-utils +# Virtual provides... might be worth splitting out for multilib, but then we'd +# probably need a separate -libs package to have 64bit tools and 32bit plugin Provides: mozilla-djvulibre = %{version}-%{release} -Provides: djvulibre-devel = %{version}-%{release} %description DjVu is a web-centric format and software platform for distributing documents -and images. DjVu content downloads faster, displays and renders faster, looks -nicer on a screen, and consume less client resources than competing formats. -DjVu was originally developed at AT&T Labs-Research by Leon Bottou, Yann -LeCun, Patrick Haffner, and many others. In March 2000, AT&T sold DjVu to -LizardTech Inc. who now distributes Windows/Mac plug-ins, and commercial -encoders (mostly on Windows) - -In an effort to promote DjVu as a Web standard, the LizardTech management was -enlightened enough to release the reference implementation of DjVu under the -GNU GPL in October 2000. DjVuLibre (which means free DjVu), is an enhanced -version of that code maintained by the original inventors of DjVu. It is -compatible with version 3.5 of the LizardTech DjVu software suite. +and images. DjVu can advantageously replace PDF, PS, TIFF, JPEG, and GIF for +distributing scanned documents, digital documents, or high-resolution pictures. +DjVu content downloads faster, displays and renders faster, looks nicer on a +screen, and consume less client resources than competing formats. DjVu images +display instantly and can be smoothly zoomed and panned with no lengthy +re-rendering. + +DjVuLibre is a free (GPL'ed) implementation of DjVu, including viewers, browser +plugins, decoders, simple encoders, and utilities. + + +%package devel +Summary: Development files for djvulibre +Group: Development/Libraries +Requires: %{name} = %{version}-%{release}, pkgconfig + +%description devel +Development files for djvulibre. %prep %setup -# In 3.5.15cvs, hardcoded "/usr/include/qt3" needs replacing -. /etc/profile.d/qt.sh -%{__perl} -pi -e "s|/usr/include/qt3|${QTINC}|g" gui/djview/Makefile.dep %build %configure -# In 3.5.14 %{?_smp_mflags} broke the build +# In 3.5.14 %{?_smp_mflags} broke the build - still in 3.5.18 %{__make} OPTS="%{optflags}" %install %{__rm} -rf %{buildroot} -%makeinstall +%{__make} install DESTDIR=%{buildroot} # Move plugin from the netscape directory to the main mozilla one %{__mkdir_p} %{buildroot}%{_libdir}/mozilla/plugins/ %{__mv} %{buildroot}%{_libdir}/netscape/plugins/nsdejavu.so \ %{buildroot}%{_libdir}/mozilla/plugins/nsdejavu.so -# Fix for the libs to get stripped correctly (still required in 3.5.15) +# Fix for the libs to get stripped correctly (still required in 3.5.18) find %{buildroot}%{_libdir} -name '*.so*' | xargs %{__chmod} +x -# Move menu entry pixmap to new location -%{__mkdir_p} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/ -%{__mv} %{buildroot}%{_datadir}/pixmaps/djvu.png \ - %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/djvu.png - %clean %{__rm} -rf %{buildroot} @@ -71,13 +65,21 @@ %post /sbin/ldconfig -gtk-update-icon-cache -q -f %{_datadir}/icons/hicolor || : -update-desktop-database /usr/share/applications || : +# Menu entry (icons and desktop file) +%{_datadir}/djvu/djview3/desktop/register-djview-menu install || : +# MIME types (icons and desktop file) +%{_datadir}/djvu/osi/desktop/register-djvu-mime install || : + +%preun +# Removal, not update +if [ $1 -eq 0 ]; then + # Menu entry (icons and desktop file) + %{_datadir}/djvu/djview3/desktop/register-djview-menu uninstall || : + # MIME types (icons and desktop file) + %{_datadir}/djvu/osi/desktop/register-djvu-mime uninstall || : +fi -%postun -/sbin/ldconfig -gtk-update-icon-cache -q -f %{_datadir}/icons/hicolor || : -update-desktop-database /usr/share/applications || : +%postun -p /sbin/ldconfig %files @@ -86,17 +88,14 @@ %{_bindir}/* %{_libdir}/*.so.* %{_libdir}/mozilla/plugins/nsdejavu.so -%{_datadir}/application-registry/djvu.applications -%{_datadir}/applications/djview.desktop -%{_datadir}/icons/hicolor/??x??/apps/djvu.png -%{_datadir}/icons/hicolor/??x??/mimetypes/djvu.png %{_datadir}/djvu/ -%{_datadir}/mime-info/djvu.* %{_mandir}/man1/* +#lang(de) %{_mandir}/de/man1/* +#lang(fr) %{_mandir}/fr/man1/* %lang(ja) %{_mandir}/ja/man1/* -#files devel -#defattr(-, root, root, 0755) +%files devel +%defattr(-, root, root, 0755) %{_includedir}/libdjvu/ %{_libdir}/pkgconfig/ddjvuapi.pc %exclude %{_libdir}/*.la @@ -104,6 +103,19 @@ %changelog +* Mon Feb 5 2007 Matthias Saou 3.5.18-1 +- Update to 3.5.18. +- Remove no longer needed /usr/include/qt3 replacing. +- Replace desktop build requirements and scriplets with new xdg utils way. +- Include new de and fr man page translations... not! Directories are empty. +- Split -devel sub-package, as the new djview4 should build require it. +- No longer build require a web browser, the plugin always gets built now. + +* Mon Aug 28 2006 Matthias Saou 3.5.17-2 +- FC6 rebuild. +- Use mozilla up to FC5, and seamonkey for FC6+ and non-Fedora. +- Build require gnome-mime-data to get build time detected dirs in place. + * Sun Jul 2 2006 Matthias Saou 3.5.17-1 - Update to 3.5.17. Index: sources =================================================================== RCS file: /cvs/extras/rpms/djvulibre/FC-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 3 Jul 2006 08:29:00 -0000 1.8 +++ sources 12 Feb 2007 12:24:20 -0000 1.9 @@ -1 +1 @@ -18e71eec1f7d59ef4710b405ea64650e djvulibre-3.5.17.tar.gz +73fd6d4f92832b85a91529b7bb3b7710 djvulibre-3.5.18.tar.gz From fedora-extras-commits at redhat.com Mon Feb 12 12:39:36 2007 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Mon, 12 Feb 2007 07:39:36 -0500 Subject: rpms/piklab/devel .cvsignore, 1.5, 1.6 piklab.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <200702121239.l1CCdaPp019825@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/piklab/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19761 Modified Files: .cvsignore piklab.spec sources Log Message: New upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/piklab/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 14 Nov 2006 15:51:34 -0000 1.5 +++ .cvsignore 12 Feb 2007 12:39:03 -0000 1.6 @@ -1 +1 @@ -piklab-0.12.2.tar.bz2 +piklab-0.13.3.tar.bz2 Index: piklab.spec =================================================================== RCS file: /cvs/extras/rpms/piklab/devel/piklab.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- piklab.spec 15 Nov 2006 01:24:44 -0000 1.8 +++ piklab.spec 12 Feb 2007 12:39:03 -0000 1.9 @@ -1,8 +1,8 @@ %define unstable 1 Name: piklab -Version: 0.12.2 -Release: 3%{?dist} +Version: 0.13.3 +Release: 1%{?dist} Summary: Development environment for applications based on PIC & dsPIC microcontrollers Summary(fr): IDE pour applications ?? base de microcontr??leurs PIC et de dsPIC @@ -120,6 +120,9 @@ %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms %changelog +* Mon Feb 12 2007 Alain Portal 0.13.3-1 + - New upstream version + * Wed Nov 15 2006 Alain Portal 0.12.2-3 - Fix EVR. Index: sources =================================================================== RCS file: /cvs/extras/rpms/piklab/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 14 Nov 2006 15:51:34 -0000 1.6 +++ sources 12 Feb 2007 12:39:03 -0000 1.7 @@ -1 +1 @@ -106496e489f7f65ea73cb8ee241b7f1e piklab-0.12.2.tar.bz2 +8710c92457752c0ab466577a2397f7bc piklab-0.13.3.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 12 12:42:06 2007 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Mon, 12 Feb 2007 07:42:06 -0500 Subject: rpms/piklab/FC-6 .cvsignore, 1.5, 1.6 piklab.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <200702121242.l1CCg6D0019945@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/piklab/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19924 Modified Files: .cvsignore piklab.spec sources Log Message: New upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/piklab/FC-6/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 14 Nov 2006 15:53:38 -0000 1.5 +++ .cvsignore 12 Feb 2007 12:41:34 -0000 1.6 @@ -1 +1 @@ -piklab-0.12.2.tar.bz2 +piklab-0.13.3.tar.bz2 Index: piklab.spec =================================================================== RCS file: /cvs/extras/rpms/piklab/FC-6/piklab.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- piklab.spec 15 Nov 2006 01:22:53 -0000 1.8 +++ piklab.spec 12 Feb 2007 12:41:34 -0000 1.9 @@ -1,8 +1,8 @@ %define unstable 1 Name: piklab -Version: 0.12.2 -Release: 3%{?dist} +Version: 0.13.3 +Release: 1%{?dist} Summary: Development environment for applications based on PIC & dsPIC microcontrollers Summary(fr): IDE pour applications ?? base de microcontr??leurs PIC et de dsPIC @@ -120,6 +120,9 @@ %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms %changelog +* Mon Feb 12 2007 Alain Portal 0.13.3-1 + - New upstream version + * Wed Nov 15 2006 Alain Portal 0.12.2-3 - Fix EVR. Index: sources =================================================================== RCS file: /cvs/extras/rpms/piklab/FC-6/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 14 Nov 2006 15:53:38 -0000 1.6 +++ sources 12 Feb 2007 12:41:34 -0000 1.7 @@ -1 +1 @@ -106496e489f7f65ea73cb8ee241b7f1e piklab-0.12.2.tar.bz2 +8710c92457752c0ab466577a2397f7bc piklab-0.13.3.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 12 12:43:18 2007 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Mon, 12 Feb 2007 07:43:18 -0500 Subject: rpms/piklab/FC-5 .cvsignore, 1.5, 1.6 piklab.spec, 1.11, 1.12 sources, 1.6, 1.7 Message-ID: <200702121243.l1CChIxf020018@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/piklab/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19997 Modified Files: .cvsignore piklab.spec sources Log Message: New upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/piklab/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 14 Nov 2006 15:54:53 -0000 1.5 +++ .cvsignore 12 Feb 2007 12:42:46 -0000 1.6 @@ -1 +1 @@ -piklab-0.12.2.tar.bz2 +piklab-0.13.3.tar.bz2 Index: piklab.spec =================================================================== RCS file: /cvs/extras/rpms/piklab/FC-5/piklab.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- piklab.spec 15 Nov 2006 01:21:05 -0000 1.11 +++ piklab.spec 12 Feb 2007 12:42:46 -0000 1.12 @@ -1,8 +1,8 @@ %define unstable 1 Name: piklab -Version: 0.12.2 -Release: 3%{?dist} +Version: 0.13.3 +Release: 1%{?dist} Summary: Development environment for applications based on PIC & dsPIC microcontrollers Summary(fr): IDE pour applications ?? base de microcontr??leurs PIC et de dsPIC @@ -120,6 +120,9 @@ %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms %changelog +* Mon Feb 12 2007 Alain Portal 0.13.3-1 + - New upstream version + * Wed Nov 15 2006 Alain Portal 0.12.2-3 - Fix EVR. Index: sources =================================================================== RCS file: /cvs/extras/rpms/piklab/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 14 Nov 2006 15:54:53 -0000 1.6 +++ sources 12 Feb 2007 12:42:46 -0000 1.7 @@ -1 +1 @@ -106496e489f7f65ea73cb8ee241b7f1e piklab-0.12.2.tar.bz2 +8710c92457752c0ab466577a2397f7bc piklab-0.13.3.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 12 14:53:45 2007 From: fedora-extras-commits at redhat.com (David Lutterkort (lutter)) Date: Mon, 12 Feb 2007 09:53:45 -0500 Subject: rpms/puppet/devel no-lockdir.patch,NONE,1.1 puppet.spec,1.11,1.12 Message-ID: <200702121453.l1CErjvO027612@cvs-int.fedora.redhat.com> Author: lutter Update of /cvs/extras/rpms/puppet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27583 Modified Files: puppet.spec Added Files: no-lockdir.patch Log Message: Fix lockdir problem in puppetd.conf no-lockdir.patch: --- NEW FILE no-lockdir.patch --- --- puppet-0.22.1/conf/redhat/puppetd.conf.orig 2006-09-27 10:30:35.000000000 -0700 +++ puppet-0.22.1/conf/redhat/puppetd.conf 2007-02-11 13:27:04.000000000 -0800 @@ -11,10 +11,6 @@ # The default value is '$vardir/run'. rundir = /var/run/puppet - # Where lock files are kept. - # The default value is '$vardir/locks'. - lockdir = /var/lock - # Where SSL certificates are kept. # The default value is '$confdir/ssl'. ssldir = $vardir/ssl Index: puppet.spec =================================================================== RCS file: /cvs/extras/rpms/puppet/devel/puppet.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- puppet.spec 3 Feb 2007 19:35:12 -0000 1.11 +++ puppet.spec 12 Feb 2007 14:53:12 -0000 1.12 @@ -8,12 +8,13 @@ Summary: A network tool for managing many disparate systems Name: puppet Version: 0.22.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Base URL: http://reductivelabs.com/projects/puppet/ Source: http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz +Patch0: no-lockdir.patch Requires: ruby >= 1.8.1 %if %has_ruby_abi @@ -43,6 +44,7 @@ %prep %setup -q +%patch0 -p1 %build for f in bin/* ; do @@ -134,6 +136,9 @@ %{__rm} -rf %{buildroot} %changelog +* Mon Feb 12 2007 David Lutterkort - 0.22.1-2 +- Fix bogus config parameter in puppetd.conf + * Sat Feb 3 2007 David Lutterkort - 0.22.1-1 - New version From fedora-extras-commits at redhat.com Mon Feb 12 15:03:24 2007 From: fedora-extras-commits at redhat.com (David Lutterkort (lutter)) Date: Mon, 12 Feb 2007 10:03:24 -0500 Subject: rpms/puppet/FC-6 no-lockdir.patch,NONE,1.1 puppet.spec,1.11,1.12 Message-ID: <200702121503.l1CF3OZ5031100@cvs-int.fedora.redhat.com> Author: lutter Update of /cvs/extras/rpms/puppet/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31073 Modified Files: puppet.spec Added Files: no-lockdir.patch Log Message: Fix lockdir problem in puppetd.conf no-lockdir.patch: --- NEW FILE no-lockdir.patch --- --- puppet-0.22.1/conf/redhat/puppetd.conf.orig 2006-09-27 10:30:35.000000000 -0700 +++ puppet-0.22.1/conf/redhat/puppetd.conf 2007-02-11 13:27:04.000000000 -0800 @@ -11,10 +11,6 @@ # The default value is '$vardir/run'. rundir = /var/run/puppet - # Where lock files are kept. - # The default value is '$vardir/locks'. - lockdir = /var/lock - # Where SSL certificates are kept. # The default value is '$confdir/ssl'. ssldir = $vardir/ssl Index: puppet.spec =================================================================== RCS file: /cvs/extras/rpms/puppet/FC-6/puppet.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- puppet.spec 3 Feb 2007 19:43:07 -0000 1.11 +++ puppet.spec 12 Feb 2007 15:02:52 -0000 1.12 @@ -8,12 +8,13 @@ Summary: A network tool for managing many disparate systems Name: puppet Version: 0.22.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Base URL: http://reductivelabs.com/projects/puppet/ Source: http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz +Patch0: no-lockdir.patch Requires: ruby >= 1.8.1 %if %has_ruby_abi @@ -43,6 +44,7 @@ %prep %setup -q +%patch0 -p1 %build for f in bin/* ; do @@ -134,6 +136,9 @@ %{__rm} -rf %{buildroot} %changelog +* Mon Feb 12 2007 David Lutterkort - 0.22.1-2 +- Fix bogus config parameter in puppetd.conf + * Sat Feb 3 2007 David Lutterkort - 0.22.1-1 - New version From fedora-extras-commits at redhat.com Mon Feb 12 15:05:52 2007 From: fedora-extras-commits at redhat.com (David Lutterkort (lutter)) Date: Mon, 12 Feb 2007 10:05:52 -0500 Subject: rpms/puppet/FC-5 no-lockdir.patch,NONE,1.1 puppet.spec,1.11,1.12 Message-ID: <200702121505.l1CF5qkH031201@cvs-int.fedora.redhat.com> Author: lutter Update of /cvs/extras/rpms/puppet/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31181 Modified Files: puppet.spec Added Files: no-lockdir.patch Log Message: Fix lockdir problem in puppetd.conf no-lockdir.patch: --- NEW FILE no-lockdir.patch --- --- puppet-0.22.1/conf/redhat/puppetd.conf.orig 2006-09-27 10:30:35.000000000 -0700 +++ puppet-0.22.1/conf/redhat/puppetd.conf 2007-02-11 13:27:04.000000000 -0800 @@ -11,10 +11,6 @@ # The default value is '$vardir/run'. rundir = /var/run/puppet - # Where lock files are kept. - # The default value is '$vardir/locks'. - lockdir = /var/lock - # Where SSL certificates are kept. # The default value is '$confdir/ssl'. ssldir = $vardir/ssl Index: puppet.spec =================================================================== RCS file: /cvs/extras/rpms/puppet/FC-5/puppet.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- puppet.spec 3 Feb 2007 19:44:14 -0000 1.11 +++ puppet.spec 12 Feb 2007 15:05:20 -0000 1.12 @@ -8,12 +8,13 @@ Summary: A network tool for managing many disparate systems Name: puppet Version: 0.22.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Base URL: http://reductivelabs.com/projects/puppet/ Source: http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz +Patch0: no-lockdir.patch Requires: ruby >= 1.8.1 %if %has_ruby_abi @@ -43,6 +44,7 @@ %prep %setup -q +%patch0 -p1 %build for f in bin/* ; do @@ -134,6 +136,9 @@ %{__rm} -rf %{buildroot} %changelog +* Mon Feb 12 2007 David Lutterkort - 0.22.1-2 +- Fix bogus config parameter in puppetd.conf + * Sat Feb 3 2007 David Lutterkort - 0.22.1-1 - New version From fedora-extras-commits at redhat.com Mon Feb 12 16:23:59 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Mon, 12 Feb 2007 11:23:59 -0500 Subject: rpms/jd/devel .cvsignore, 1.67, 1.68 jd.spec, 1.78, 1.79 sources, 1.67, 1.68 Message-ID: <200702121623.l1CGNxMO002791@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2770 Modified Files: .cvsignore jd.spec sources Log Message: * Mon Feb 12 2007 Mamoru Tasaka - 1.8.5-2.cvs070212 - cvs 070212 (23:00 JST) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- .cvsignore 11 Feb 2007 16:21:22 -0000 1.67 +++ .cvsignore 12 Feb 2007 16:23:26 -0000 1.68 @@ -1 +1 @@ -jd-1.8.5-cvs070211.1.tgz +jd-1.8.5-cvs070212.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- jd.spec 11 Feb 2007 16:21:22 -0000 1.78 +++ jd.spec 12 Feb 2007 16:23:26 -0000 1.79 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 1.8.5 -%define strtag cvs070211.1 +%define strtag cvs070212 %define repoid 23816 @@ -106,8 +106,8 @@ %{icondir}/%{name}.png %changelog -* Sun Feb 11 2007 Mamoru Tasaka - 1.8.5-2.cvs070211.1 -- cvs 070211 (24:40 JST) +* Mon Feb 12 2007 Mamoru Tasaka - 1.8.5-2.cvs070212 +- cvs 070212 (23:00 JST) * Fri Feb 2 2007 Mamoru Tasaka - 1.8.5-1 - 1.8.5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- sources 11 Feb 2007 16:21:22 -0000 1.67 +++ sources 12 Feb 2007 16:23:26 -0000 1.68 @@ -1 +1 @@ -0caa674cac5357831c40da1ba7f9220b jd-1.8.5-cvs070211.1.tgz +ec063d0d4c65d4fc004d180d2ae0a88a jd-1.8.5-cvs070212.tgz From fedora-extras-commits at redhat.com Mon Feb 12 16:37:19 2007 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 12 Feb 2007 11:37:19 -0500 Subject: rpms/akode/devel akode-pulseaudio.patch, NONE, 1.1 akode.spec, 1.8, 1.9 Message-ID: <200702121637.l1CGbJ3L002974@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/akode/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2950 Modified Files: akode.spec Added Files: akode-pulseaudio.patch Log Message: * Mon Feb 12 2007 Rex Dieter 2.0.1-5 - enable pulseaudio support - Requires: akode-pulseaudio (fc7+) akode-pulseaudio.patch: --- NEW FILE akode-pulseaudio.patch --- diff -urN akode-2.0.1.orig/Makefile.in akode-2.0.1/Makefile.in --- akode-2.0.1.orig/Makefile.in 2006-07-23 00:17:11.000000000 +0200 +++ akode-2.0.1/Makefile.in 2006-09-06 14:38:04.000000000 +0200 @@ -169,9 +169,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -POLYP_CFLAGS = @POLYP_CFLAGS@ -POLYP_LDFLAGS = @POLYP_LDFLAGS@ -POLYP_LIBADD = @POLYP_LIBADD@ +PULSE_CFLAGS = @PULSE_CFLAGS@ +PULSE_LDFLAGS = @PULSE_LDFLAGS@ +PULSE_LIBADD = @PULSE_LIBADD@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff -urN akode-2.0.1.orig/akode/Makefile.in akode-2.0.1/akode/Makefile.in --- akode-2.0.1.orig/akode/Makefile.in 2006-07-23 00:17:11.000000000 +0200 +++ akode-2.0.1/akode/Makefile.in 2006-09-06 14:38:04.000000000 +0200 @@ -158,9 +158,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -POLYP_CFLAGS = @POLYP_CFLAGS@ -POLYP_LDFLAGS = @POLYP_LDFLAGS@ -POLYP_LIBADD = @POLYP_LIBADD@ +PULSE_CFLAGS = @PULSE_CFLAGS@ +PULSE_LDFLAGS = @PULSE_LDFLAGS@ +PULSE_LIBADD = @PULSE_LIBADD@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff -urN akode-2.0.1.orig/akode/akodeplay/Makefile.in akode-2.0.1/akode/akodeplay/Makefile.in --- akode-2.0.1.orig/akode/akodeplay/Makefile.in 2006-07-23 00:17:11.000000000 +0200 +++ akode-2.0.1/akode/akodeplay/Makefile.in 2006-09-06 14:38:04.000000000 +0200 @@ -170,9 +170,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -POLYP_CFLAGS = @POLYP_CFLAGS@ -POLYP_LDFLAGS = @POLYP_LDFLAGS@ -POLYP_LIBADD = @POLYP_LIBADD@ +PULSE_CFLAGS = @PULSE_CFLAGS@ +PULSE_LDFLAGS = @PULSE_LDFLAGS@ +PULSE_LIBADD = @PULSE_LIBADD@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff -urN akode-2.0.1.orig/akode/configure.in.in akode-2.0.1/akode/configure.in.in --- akode-2.0.1.orig/akode/configure.in.in 2005-10-27 17:12:36.000000000 +0200 +++ akode-2.0.1/akode/configure.in.in 2006-09-06 14:45:46.000000000 +0200 @@ -295,24 +295,24 @@ AC_SUBST(JACK_LDFLAGS) fi -AC_ARG_WITH(polypaudio,AC_HELP_STRING([--with-polypaudio],[Enable Polypaudio server support @<:@default=check@:>@]),[polypaudio_test="$withval"],[polypaudio_test="yes"]) +AC_ARG_WITH(pulseaudio,AC_HELP_STRING([--with-pulseaudio],[Enable PulseAudio server support @<:@default=check@:>@]),[pulseaudio_test="$withval"],[pulseaudio_test="yes"]) -if test "x$polypaudio_test" = "xyes" ; then -AC_MSG_CHECKING(for Polypaudio 0.7 or later) -if $PKG_CONFIG --atleast-version 0.7 polyplib-simple >/dev/null 2>&1 ; then - POLYP_CFLAGS="`$PKG_CONFIG --cflags polyplib-simple`" - POLYP_LIBADD="`$PKG_CONFIG --libs-only-l polyplib-simple`" - POLYP_LDFLAGS="`$PKG_CONFIG --libs-only-L polyplib-simple`" - have_polyp=yes +if test "x$pulseaudio_test" = "xyes" ; then +AC_MSG_CHECKING(for PulseAudio 0.9.2 or later) +if $PKG_CONFIG --atleast-version 0.9.2 libpulse-simple >/dev/null 2>&1 ; then + PULSE_CFLAGS="`$PKG_CONFIG --cflags libpulse-simple`" + PULSE_LIBADD="`$PKG_CONFIG --libs-only-l libpulse-simple`" + PULSE_LDFLAGS="`$PKG_CONFIG --libs-only-L libpulse-simple`" + have_pulse=yes AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_LIBPOLYP, 1, - [Define if you have polyplib (required if you want Polypaudio server support)]) + AC_DEFINE(HAVE_LIBPULSE, 1, + [Define if you have libpulse (required if you want PulseAudio server support)]) else AC_MSG_RESULT(not installed) fi -AC_SUBST(POLYP_CFLAGS) -AC_SUBST(POLYP_LIBADD) -AC_SUBST(POLYP_LDFLAGS) +AC_SUBST(PULSE_CFLAGS) +AC_SUBST(PULSE_LIBADD) +AC_SUBST(PULSE_LDFLAGS) fi AC_ARG_WITH(ffmpeg,AC_HELP_STRING([--with-ffmpeg],[Enable experimental FFMPEG decoder support @<:@default=no@:>@]),[ffmpeg_test="$withval"],[ffmpeg_test="no"]) @@ -507,7 +507,7 @@ AM_CONDITIONAL(include_oss_sink, test x$have_oss = xyes) AM_CONDITIONAL(include_sun_sink, test x$have_sun = xyes) AM_CONDITIONAL(include_jack_sink, test x$have_jack = xyes) -AM_CONDITIONAL(include_polyp_sink, test x$have_polyp = xyes) +AM_CONDITIONAL(include_polyp_sink, test x$have_pulse = xyes) AM_CONDITIONAL(include_ffmpeg_decoder, test x$have_ffmpeg = xyes) AC_MSG_CHECKING(for compilable aKode) diff -urN akode-2.0.1.orig/akode/lib/Makefile.in akode-2.0.1/akode/lib/Makefile.in --- akode-2.0.1.orig/akode/lib/Makefile.in 2006-07-23 00:17:11.000000000 +0200 +++ akode-2.0.1/akode/lib/Makefile.in 2006-09-06 14:38:04.000000000 +0200 @@ -194,9 +194,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -POLYP_CFLAGS = @POLYP_CFLAGS@ -POLYP_LDFLAGS = @POLYP_LDFLAGS@ -POLYP_LIBADD = @POLYP_LIBADD@ +PULSE_CFLAGS = @PULSE_CFLAGS@ +PULSE_LDFLAGS = @PULSE_LDFLAGS@ +PULSE_LIBADD = @PULSE_LIBADD@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff -urN akode-2.0.1.orig/akode/plugins/Makefile.in akode-2.0.1/akode/plugins/Makefile.in --- akode-2.0.1.orig/akode/plugins/Makefile.in 2006-07-23 00:17:11.000000000 +0200 +++ akode-2.0.1/akode/plugins/Makefile.in 2006-09-06 14:38:04.000000000 +0200 @@ -154,9 +154,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -POLYP_CFLAGS = @POLYP_CFLAGS@ -POLYP_LDFLAGS = @POLYP_LDFLAGS@ -POLYP_LIBADD = @POLYP_LIBADD@ +PULSE_CFLAGS = @PULSE_CFLAGS@ +PULSE_LDFLAGS = @PULSE_LDFLAGS@ +PULSE_LIBADD = @PULSE_LIBADD@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -251,11 +251,11 @@ @include_oss_sink_TRUE at AKODE_OSS_SINK = oss_sink @include_sun_sink_TRUE at AKODE_SUN_SINK = sun_sink @include_jack_sink_TRUE at AKODE_JACK_SINK = jack_sink - at include_polyp_sink_TRUE@AKODE_POLYP_SINK = polyp_sink + at include_polyp_sink_TRUE@AKODE_PULSE_SINK = polyp_sink SUBDIRS = $(AKODE_MPC_DECODER) $(AKODE_XIPH_DECODER) \ $(AKODE_MPEG_DECODER) $(AKODE_FFMPEG_DECODER) \ $(AKODE_ALSA_SINK) $(AKODE_OSS_SINK) $(AKODE_SUN_SINK) \ - $(AKODE_JACK_SINK) $(AKODE_POLYP_SINK) \ + $(AKODE_JACK_SINK) $(AKODE_PULSE_SINK) \ $(AKODE_SRC_RESAMPLER) #>- all: all-recursive diff -urN akode-2.0.1.orig/akode/plugins/alsa_sink/Makefile.in akode-2.0.1/akode/plugins/alsa_sink/Makefile.in --- akode-2.0.1.orig/akode/plugins/alsa_sink/Makefile.in 2006-07-23 00:17:11.000000000 +0200 +++ akode-2.0.1/akode/plugins/alsa_sink/Makefile.in 2006-09-06 14:38:04.000000000 +0200 @@ -177,9 +177,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -POLYP_CFLAGS = @POLYP_CFLAGS@ -POLYP_LDFLAGS = @POLYP_LDFLAGS@ -POLYP_LIBADD = @POLYP_LIBADD@ +PULSE_CFLAGS = @PULSE_CFLAGS@ +PULSE_LDFLAGS = @PULSE_LDFLAGS@ +PULSE_LIBADD = @PULSE_LIBADD@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff -urN akode-2.0.1.orig/akode/plugins/ffmpeg_decoder/Makefile.in akode-2.0.1/akode/plugins/ffmpeg_decoder/Makefile.in --- akode-2.0.1.orig/akode/plugins/ffmpeg_decoder/Makefile.in 2006-07-23 00:17:11.000000000 +0200 +++ akode-2.0.1/akode/plugins/ffmpeg_decoder/Makefile.in 2006-09-06 14:38:04.000000000 +0200 @@ -178,9 +178,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -POLYP_CFLAGS = @POLYP_CFLAGS@ -POLYP_LDFLAGS = @POLYP_LDFLAGS@ -POLYP_LIBADD = @POLYP_LIBADD@ +PULSE_CFLAGS = @PULSE_CFLAGS@ +PULSE_LDFLAGS = @PULSE_LDFLAGS@ +PULSE_LIBADD = @PULSE_LIBADD@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff -urN akode-2.0.1.orig/akode/plugins/jack_sink/Makefile.in akode-2.0.1/akode/plugins/jack_sink/Makefile.in --- akode-2.0.1.orig/akode/plugins/jack_sink/Makefile.in 2006-07-23 00:17:11.000000000 +0200 +++ akode-2.0.1/akode/plugins/jack_sink/Makefile.in 2006-09-06 14:38:04.000000000 +0200 @@ -177,9 +177,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -POLYP_CFLAGS = @POLYP_CFLAGS@ -POLYP_LDFLAGS = @POLYP_LDFLAGS@ -POLYP_LIBADD = @POLYP_LIBADD@ +PULSE_CFLAGS = @PULSE_CFLAGS@ +PULSE_LDFLAGS = @PULSE_LDFLAGS@ +PULSE_LIBADD = @PULSE_LIBADD@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff -urN akode-2.0.1.orig/akode/plugins/mpc_decoder/Makefile.in akode-2.0.1/akode/plugins/mpc_decoder/Makefile.in --- akode-2.0.1.orig/akode/plugins/mpc_decoder/Makefile.in 2006-07-23 00:17:11.000000000 +0200 +++ akode-2.0.1/akode/plugins/mpc_decoder/Makefile.in 2006-09-06 14:38:04.000000000 +0200 @@ -191,9 +191,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -POLYP_CFLAGS = @POLYP_CFLAGS@ -POLYP_LDFLAGS = @POLYP_LDFLAGS@ -POLYP_LIBADD = @POLYP_LIBADD@ +PULSE_CFLAGS = @PULSE_CFLAGS@ +PULSE_LDFLAGS = @PULSE_LDFLAGS@ +PULSE_LIBADD = @PULSE_LIBADD@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff -urN akode-2.0.1.orig/akode/plugins/mpc_decoder/mppdec/Makefile.in akode-2.0.1/akode/plugins/mpc_decoder/mppdec/Makefile.in --- akode-2.0.1.orig/akode/plugins/mpc_decoder/mppdec/Makefile.in 2006-07-23 00:17:11.000000000 +0200 +++ akode-2.0.1/akode/plugins/mpc_decoder/mppdec/Makefile.in 2006-09-06 14:38:04.000000000 +0200 @@ -169,9 +169,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -POLYP_CFLAGS = @POLYP_CFLAGS@ -POLYP_LDFLAGS = @POLYP_LDFLAGS@ -POLYP_LIBADD = @POLYP_LIBADD@ +PULSE_CFLAGS = @PULSE_CFLAGS@ +PULSE_LDFLAGS = @PULSE_LDFLAGS@ +PULSE_LIBADD = @PULSE_LIBADD@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff -urN akode-2.0.1.orig/akode/plugins/mpeg_decoder/Makefile.in akode-2.0.1/akode/plugins/mpeg_decoder/Makefile.in --- akode-2.0.1.orig/akode/plugins/mpeg_decoder/Makefile.in 2006-07-23 00:17:11.000000000 +0200 +++ akode-2.0.1/akode/plugins/mpeg_decoder/Makefile.in 2006-09-06 14:38:04.000000000 +0200 @@ -178,9 +178,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -POLYP_CFLAGS = @POLYP_CFLAGS@ -POLYP_LDFLAGS = @POLYP_LDFLAGS@ -POLYP_LIBADD = @POLYP_LIBADD@ +PULSE_CFLAGS = @PULSE_CFLAGS@ +PULSE_LDFLAGS = @PULSE_LDFLAGS@ +PULSE_LIBADD = @PULSE_LIBADD@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff -urN akode-2.0.1.orig/akode/plugins/oss_sink/Makefile.in akode-2.0.1/akode/plugins/oss_sink/Makefile.in --- akode-2.0.1.orig/akode/plugins/oss_sink/Makefile.in 2006-07-23 00:17:11.000000000 +0200 +++ akode-2.0.1/akode/plugins/oss_sink/Makefile.in 2006-09-06 14:38:04.000000000 +0200 @@ -177,9 +177,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -POLYP_CFLAGS = @POLYP_CFLAGS@ -POLYP_LDFLAGS = @POLYP_LDFLAGS@ -POLYP_LIBADD = @POLYP_LIBADD@ +PULSE_CFLAGS = @PULSE_CFLAGS@ +PULSE_LDFLAGS = @PULSE_LDFLAGS@ +PULSE_LIBADD = @PULSE_LIBADD@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff -urN akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.am akode-2.0.1/akode/plugins/polyp_sink/Makefile.am --- akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.am 2005-07-15 13:20:03.000000000 +0200 +++ akode-2.0.1/akode/plugins/polyp_sink/Makefile.am 2006-09-06 14:38:04.000000000 +0200 @@ -1,7 +1,7 @@ -INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(POLYP_CFLAGS) $(all_includes) +INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(PULSE_CFLAGS) $(all_includes) lib_LTLIBRARIES = libakode_polyp_sink.la libakode_polyp_sink_la_SOURCES = polyp_sink.cpp -libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(POLYP_LDFLAGS) -libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(POLYP_LIBADD) +libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(PULSE_LDFLAGS) +libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(PULSE_LIBADD) diff -urN akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.in akode-2.0.1/akode/plugins/polyp_sink/Makefile.in --- akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.in 2006-07-23 00:17:11.000000000 +0200 +++ akode-2.0.1/akode/plugins/polyp_sink/Makefile.in 2006-09-06 14:38:04.000000000 +0200 @@ -177,9 +177,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -POLYP_CFLAGS = @POLYP_CFLAGS@ -POLYP_LDFLAGS = @POLYP_LDFLAGS@ -POLYP_LIBADD = @POLYP_LIBADD@ +PULSE_CFLAGS = @PULSE_CFLAGS@ +PULSE_LDFLAGS = @PULSE_LDFLAGS@ +PULSE_LIBADD = @PULSE_LIBADD@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -265,13 +265,13 @@ target_vendor = @target_vendor@ unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ -INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(POLYP_CFLAGS) $(all_includes) +INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(PULSE_CFLAGS) $(all_includes) lib_LTLIBRARIES = libakode_polyp_sink.la libakode_polyp_sink_la_SOURCES = polyp_sink.cpp -#>- libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(POLYP_LDFLAGS) +#>- libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(PULSE_LDFLAGS) #>+ 1 -libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED) $(POLYP_LDFLAGS) -libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(POLYP_LIBADD) +libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED) $(PULSE_LDFLAGS) +libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(PULSE_LIBADD) #>- all: all-am #>+ 1 all: docs-am all-am diff -urN akode-2.0.1.orig/akode/plugins/polyp_sink/polyp_sink.cpp akode-2.0.1/akode/plugins/polyp_sink/polyp_sink.cpp --- akode-2.0.1.orig/akode/plugins/polyp_sink/polyp_sink.cpp 2005-10-20 22:54:12.000000000 +0200 +++ akode-2.0.1/akode/plugins/polyp_sink/polyp_sink.cpp 2006-09-06 15:14:52.000000000 +0200 @@ -25,7 +25,7 @@ #elif defined(HAVE_INTTYPES_H) #include #endif -#include +#include #include "audioframe.h" #include "audiobuffer.h" @@ -59,7 +59,7 @@ bool PolypSink::open() { int error = 0; - m_data->server = pa_simple_new(0, "akode-client", PA_STREAM_PLAYBACK, 0, "", &m_data->sample_spec, 0, 255, &error ); + m_data->server = pa_simple_new(0, "akode-client", PA_STREAM_PLAYBACK, 0, "", &m_data->sample_spec, 0, 0, &error ); if (!m_data->server || error != 0) { m_data->error = true; close(); diff -urN akode-2.0.1.orig/akode/plugins/src_resampler/Makefile.in akode-2.0.1/akode/plugins/src_resampler/Makefile.in --- akode-2.0.1.orig/akode/plugins/src_resampler/Makefile.in 2006-07-23 00:17:11.000000000 +0200 +++ akode-2.0.1/akode/plugins/src_resampler/Makefile.in 2006-09-06 14:38:04.000000000 +0200 @@ -178,9 +178,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -POLYP_CFLAGS = @POLYP_CFLAGS@ -POLYP_LDFLAGS = @POLYP_LDFLAGS@ -POLYP_LIBADD = @POLYP_LIBADD@ +PULSE_CFLAGS = @PULSE_CFLAGS@ +PULSE_LDFLAGS = @PULSE_LDFLAGS@ +PULSE_LIBADD = @PULSE_LIBADD@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff -urN akode-2.0.1.orig/akode/plugins/sun_sink/Makefile.in akode-2.0.1/akode/plugins/sun_sink/Makefile.in --- akode-2.0.1.orig/akode/plugins/sun_sink/Makefile.in 2006-07-23 00:17:11.000000000 +0200 +++ akode-2.0.1/akode/plugins/sun_sink/Makefile.in 2006-09-06 14:38:04.000000000 +0200 @@ -175,9 +175,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -POLYP_CFLAGS = @POLYP_CFLAGS@ -POLYP_LDFLAGS = @POLYP_LDFLAGS@ -POLYP_LIBADD = @POLYP_LIBADD@ +PULSE_CFLAGS = @PULSE_CFLAGS@ +PULSE_LDFLAGS = @PULSE_LDFLAGS@ +PULSE_LIBADD = @PULSE_LIBADD@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff -urN akode-2.0.1.orig/akode/plugins/xiph_decoder/Makefile.in akode-2.0.1/akode/plugins/xiph_decoder/Makefile.in --- akode-2.0.1.orig/akode/plugins/xiph_decoder/Makefile.in 2006-07-23 00:17:11.000000000 +0200 +++ akode-2.0.1/akode/plugins/xiph_decoder/Makefile.in 2006-09-06 14:38:04.000000000 +0200 @@ -185,9 +185,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -POLYP_CFLAGS = @POLYP_CFLAGS@ -POLYP_LDFLAGS = @POLYP_LDFLAGS@ -POLYP_LIBADD = @POLYP_LIBADD@ +PULSE_CFLAGS = @PULSE_CFLAGS@ +PULSE_LDFLAGS = @PULSE_LDFLAGS@ +PULSE_LIBADD = @PULSE_LIBADD@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff -urN akode-2.0.1.orig/config.h.in akode-2.0.1/config.h.in --- akode-2.0.1.orig/config.h.in 2006-07-23 00:17:04.000000000 +0200 +++ akode-2.0.1/config.h.in 2006-09-06 14:44:55.000000000 +0200 @@ -43,9 +43,9 @@ /* Define if you have libOggFLAC (required for loading OggFLAC files) */ #undef HAVE_LIBOGGFLAC -/* Define if you have polyplib (required if you want Polypaudio server +/* Define if you have libpulse (required if you want PulseAudio server support) */ -#undef HAVE_LIBPOLYP +#undef HAVE_LIBPULSE /* defined if you have libsamplerate library and header */ #undef HAVE_LIBSAMPLERATE diff -urN akode-2.0.1.orig/configure.in akode-2.0.1/configure.in --- akode-2.0.1.orig/configure.in 2006-07-23 00:16:52.000000000 +0200 +++ akode-2.0.1/configure.in 2006-09-06 14:45:21.000000000 +0200 @@ -400,24 +400,24 @@ AC_SUBST(JACK_LDFLAGS) fi -AC_ARG_WITH(polypaudio,AC_HELP_STRING([--with-polypaudio],[Enable Polypaudio server support @<:@default=check@:>@]),[polypaudio_test="$withval"],[polypaudio_test="yes"]) +AC_ARG_WITH(pulseaudio,AC_HELP_STRING([--with-pulseaudio],[Enable PulseAudio server support @<:@default=check@:>@]),[pulseaudio_test="$withval"],[pulseaudio_test="yes"]) -if test "x$polypaudio_test" = "xyes" ; then -AC_MSG_CHECKING(for Polypaudio 0.7 or later) -if $PKG_CONFIG --atleast-version 0.7 polyplib-simple >/dev/null 2>&1 ; then - POLYP_CFLAGS="`$PKG_CONFIG --cflags polyplib-simple`" - POLYP_LIBADD="`$PKG_CONFIG --libs-only-l polyplib-simple`" - POLYP_LDFLAGS="`$PKG_CONFIG --libs-only-L polyplib-simple`" - have_polyp=yes +if test "x$pulseaudio_test" = "xyes" ; then +AC_MSG_CHECKING(for PulseAudio 0.9.2 or later) +if $PKG_CONFIG --atleast-version 0.9.2 libpulse-simple >/dev/null 2>&1 ; then + PULSE_CFLAGS="`$PKG_CONFIG --cflags libpulse-simple`" + PULSE_LIBADD="`$PKG_CONFIG --libs-only-l libpulse-simple`" + PULSE_LDFLAGS="`$PKG_CONFIG --libs-only-L libpulse-simple`" + have_pulse=yes AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_LIBPOLYP, 1, - [Define if you have polyplib (required if you want Polypaudio server support)]) + AC_DEFINE(HAVE_LIBPULSE, 1, + [Define if you have libpulse (required if you want PulseAudio server support)]) else AC_MSG_RESULT(not installed) fi -AC_SUBST(POLYP_CFLAGS) -AC_SUBST(POLYP_LIBADD) -AC_SUBST(POLYP_LDFLAGS) +AC_SUBST(PULSE_CFLAGS) +AC_SUBST(PULSE_LIBADD) +AC_SUBST(PULSE_LDFLAGS) fi AC_ARG_WITH(ffmpeg,AC_HELP_STRING([--with-ffmpeg],[Enable experimental FFMPEG decoder support @<:@default=no@:>@]),[ffmpeg_test="$withval"],[ffmpeg_test="no"]) @@ -612,7 +612,7 @@ AM_CONDITIONAL(include_oss_sink, test x$have_oss = xyes) AM_CONDITIONAL(include_sun_sink, test x$have_sun = xyes) AM_CONDITIONAL(include_jack_sink, test x$have_jack = xyes) -AM_CONDITIONAL(include_polyp_sink, test x$have_polyp = xyes) +AM_CONDITIONAL(include_polyp_sink, test x$have_pulse = xyes) AM_CONDITIONAL(include_ffmpeg_decoder, test x$have_ffmpeg = xyes) AC_MSG_CHECKING(for compilable aKode) Index: akode.spec =================================================================== RCS file: /cvs/extras/rpms/akode/devel/akode.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- akode.spec 18 Dec 2006 03:17:08 -0000 1.8 +++ akode.spec 12 Feb 2007 16:36:47 -0000 1.9 @@ -2,7 +2,7 @@ Summary: Audio-decoding framework Name: akode Version: 2.0.1 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPL Group: System Environment/Libraries #URL: http://carewolf.com/akode/ @@ -10,14 +10,22 @@ Source0: http://www.kde-apps.org/content/files/30375-akode-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch1: akode-pulseaudio.patch + #Conflicts: kdemultimedia < 6:3.5 %if 0%{?fedora} > 4 %define _with_jack --with-jack -# FIXME -#define _with_pulseaudio --with-pulseaudio +%define _with_pulseaudio --with-pulseaudio +%endif + +%if 0%{?fedora} > 6 +%define _with_pulseaudio --with-pulseaudio +# pulseaudio is/will-be the F7 default, +Requires: %{name}-pulseaudio %endif + BuildRequires: automake BuildRequires: alsa-lib-devel BuildRequires: flac-devel @@ -76,6 +84,8 @@ %prep %setup -q -n %{name}-%{version}%{?beta} +%patch1 -p1 -b .pulseaudio + [ ! -f configure ] && make -f Makefile.cvs @@ -88,6 +98,7 @@ --with-flac \ %{?_with_jack} %{!?_with_jack:--without-jack} \ --with-libsamplerate \ + %{?_with_pulseaudio} %{!?_with_pulseaudio:--without-pulseaudio} \ --with-speex \ --with-vorbis \ --without-ffmpeg \ @@ -145,8 +156,19 @@ %defattr(-,root,root,-) %{_libdir}/libakode_src_resampler.so +%if "%{?_with_pulseaudio:1}" == "1" +%files pulseaudio +%defattr(-,root,root,-) +%{_libdir}/libakode_polyp_sink.so +%endif + + %changelog +* Mon Feb 12 2007 Rex Dieter 2.0.1-5 +- enable pulseaudio support +- Requires: akode-pulseaudio (fc7+) + * Thu Dec 14 2006 Rex Dieter 2.0.1-4 - enable jack support (subpkg) - package (GPL'd) libsamplerate-based resampler separately, From fedora-extras-commits at redhat.com Mon Feb 12 16:51:26 2007 From: fedora-extras-commits at redhat.com (ZC Miao (hellwolf)) Date: Mon, 12 Feb 2007 11:51:26 -0500 Subject: rpms/fuse-convmvfs - New directory Message-ID: <200702121651.l1CGpQRk003138@cvs-int.fedora.redhat.com> Author: hellwolf Update of /cvs/extras/rpms/fuse-convmvfs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3133/fuse-convmvfs Log Message: Directory /cvs/extras/rpms/fuse-convmvfs added to the repository From fedora-extras-commits at redhat.com Mon Feb 12 16:51:34 2007 From: fedora-extras-commits at redhat.com (ZC Miao (hellwolf)) Date: Mon, 12 Feb 2007 11:51:34 -0500 Subject: rpms/fuse-convmvfs/devel - New directory Message-ID: <200702121651.l1CGpYoT003152@cvs-int.fedora.redhat.com> Author: hellwolf Update of /cvs/extras/rpms/fuse-convmvfs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3133/fuse-convmvfs/devel Log Message: Directory /cvs/extras/rpms/fuse-convmvfs/devel added to the repository From fedora-extras-commits at redhat.com Mon Feb 12 16:58:44 2007 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 12 Feb 2007 11:58:44 -0500 Subject: rpms/apcupsd/devel .cvsignore, 1.7, 1.8 apcupsd.spec, 1.13, 1.14 sources, 1.7, 1.8 apcupsd-net-snmp.patch, 1.1, NONE Message-ID: <200702121658.l1CGwioY003287@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/apcupsd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3256 Modified Files: .cvsignore apcupsd.spec sources Removed Files: apcupsd-net-snmp.patch Log Message: Update to 3.14.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/apcupsd/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 30 Nov 2006 17:26:26 -0000 1.7 +++ .cvsignore 12 Feb 2007 16:58:12 -0000 1.8 @@ -1 +1 @@ -apcupsd-3.13.9.tar.gz +apcupsd-3.14.0.tar.gz Index: apcupsd.spec =================================================================== RCS file: /cvs/extras/rpms/apcupsd/devel/apcupsd.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- apcupsd.spec 5 Jan 2007 18:31:20 -0000 1.13 +++ apcupsd.spec 12 Feb 2007 16:58:12 -0000 1.14 @@ -1,6 +1,6 @@ Name: apcupsd -Version: 3.13.9 -Release: 2%{?dist} +Version: 3.14.0 +Release: 0%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -10,10 +10,9 @@ Source1: apcupsd.logrotate Source2: apcupsd-httpd.conf Patch0: apcupsd-3.10.18-init.patch -Patch1: apcupsd-net-snmp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0, dos2unix +BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0 BuildRequires: net-snmp-devel, gettext-devel, ncurses-devel, tcp_wrappers-devel BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils Requires: /bin/mail @@ -54,8 +53,6 @@ %prep %setup -q %patch -p1 -b .init -%patch1 -p1 -b .net-snmp -dos2unix examples/*status examples/*.c # Don't strip binaries sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' src{,/cgi}/Makefile.in @@ -172,6 +169,9 @@ %changelog +* Mon Feb 12 2007 - Orion Poplawski - 3.14.0-1 +- Update to 3.14.0 + * Fri Jan 5 2007 - Orion Poplawski - 3.13.9-2 - Mark everything in /etc/apcupsd noreplace - Change BR to tcp_wrappers-devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/apcupsd/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 30 Nov 2006 17:26:26 -0000 1.7 +++ sources 12 Feb 2007 16:58:12 -0000 1.8 @@ -1 +1 @@ -a58f1a1c4387da5b2fa3666a246c8165 apcupsd-3.13.9.tar.gz +334fe3413c08f14acec0226e71e98e0a apcupsd-3.14.0.tar.gz --- apcupsd-net-snmp.patch DELETED --- From fedora-extras-commits at redhat.com Mon Feb 12 17:09:21 2007 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 12 Feb 2007 12:09:21 -0500 Subject: fedora-security/audit fe5,1.155,1.156 fe6,1.69,1.70 Message-ID: <200702121709.l1CH9Lg7006784@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6764 Modified Files: fe5 fe6 Log Message: moin updated to 1.5.7 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.155 retrieving revision 1.156 diff -u -r1.155 -r1.156 --- fe5 10 Feb 2007 09:01:09 -0000 1.155 +++ fe5 12 Feb 2007 17:09:18 -0000 1.156 @@ -2,7 +2,7 @@ ** are items that need attention -CVE-2007-0857 VULNERABLE (moin, fixed 1.5.7) #228139 +CVE-2007-0857 version (moin, fixed 1.5.7) #228139 CVE-2007-0657 ignore (nexuiz, 2.2.2 only (not shipped), fixed 2.2.3) CVE-2007-0619 version (chmlib, fixed 0.3.9) #225919 CVE-2007-0541 version (wordpress, fixed 2.1-0) #225469 Index: fe6 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe6,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- fe6 10 Feb 2007 09:01:09 -0000 1.69 +++ fe6 12 Feb 2007 17:09:18 -0000 1.70 @@ -2,7 +2,7 @@ ** are items that need attention -CVE-2007-0857 VULNERABLE (moin, fixed 1.5.7) #228139 +CVE-2007-0857 version (moin, fixed 1.5.7) #228139 CVE-2007-0657 ignore (nexuiz, 2.2.2 only (not shipped), fixed 2.2.3) CVE-2007-0619 version (chmlib, fixed 0.3.9) #225919 CVE-2007-0541 version (wordpress, fixed 2.1-0) #225469 From fedora-extras-commits at redhat.com Mon Feb 12 17:13:27 2007 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 12 Feb 2007 12:13:27 -0500 Subject: rpms/apcupsd/devel apcupsd.spec,1.14,1.15 Message-ID: <200702121713.l1CHDRak006863@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/apcupsd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6841 Modified Files: apcupsd.spec Log Message: Remove old master/slave stuff Index: apcupsd.spec =================================================================== RCS file: /cvs/extras/rpms/apcupsd/devel/apcupsd.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- apcupsd.spec 12 Feb 2007 16:58:12 -0000 1.14 +++ apcupsd.spec 12 Feb 2007 17:12:55 -0000 1.15 @@ -130,8 +130,6 @@ %config(noreplace) %{_sysconfdir}/apcupsd/commok %config(noreplace) %{_sysconfdir}/apcupsd/offbattery %config(noreplace) %{_sysconfdir}/apcupsd/onbattery -%config(noreplace) %{_sysconfdir}/apcupsd/masterconnect -%config(noreplace) %{_sysconfdir}/apcupsd/mastertimeout %config(noreplace) %{_sysconfdir}/logrotate.d/apcupsd %attr(0755,root,root) %{_sbindir}/* %{_mandir}/*/* From fedora-extras-commits at redhat.com Mon Feb 12 17:27:21 2007 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Mon, 12 Feb 2007 12:27:21 -0500 Subject: rpms/perl-Proc-Daemon - New directory Message-ID: <200702121727.l1CHRLwi007068@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/perl-Proc-Daemon In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7063/perl-Proc-Daemon Log Message: Directory /cvs/extras/rpms/perl-Proc-Daemon added to the repository From fedora-extras-commits at redhat.com Mon Feb 12 17:27:29 2007 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Mon, 12 Feb 2007 12:27:29 -0500 Subject: rpms/perl-Proc-Daemon/devel - New directory Message-ID: <200702121727.l1CHRTO1007083@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/perl-Proc-Daemon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7063/perl-Proc-Daemon/devel Log Message: Directory /cvs/extras/rpms/perl-Proc-Daemon/devel added to the repository From fedora-extras-commits at redhat.com Mon Feb 12 17:27:30 2007 From: fedora-extras-commits at redhat.com (Julian Sikorski (belegdol)) Date: Mon, 12 Feb 2007 12:27:30 -0500 Subject: rpms/chemical-mime-data/devel chemical-mime-data.spec,1.4,1.5 Message-ID: <200702121727.l1CHRU16007090@cvs-int.fedora.redhat.com> Author: belegdol Update of /cvs/extras/rpms/chemical-mime-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7032 Modified Files: chemical-mime-data.spec Log Message: * Mon Feb 12 2007 Julian Sikorski - 0.1.94-2 - Whoops. Added intltool and gettext to BuildRequires Index: chemical-mime-data.spec =================================================================== RCS file: /cvs/extras/rpms/chemical-mime-data/devel/chemical-mime-data.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- chemical-mime-data.spec 11 Feb 2007 13:44:38 -0000 1.4 +++ chemical-mime-data.spec 12 Feb 2007 17:26:58 -0000 1.5 @@ -1,6 +1,6 @@ Name: chemical-mime-data Version: 0.1.94 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Support for chemical/* MIME types Group: System Environment/Libraries @@ -16,6 +16,8 @@ BuildRequires: librsvg2 BuildRequires: shared-mime-info BuildRequires: pkgconfig +BuildRequires: intltool +BuildRequires: gettext Requires: pkgconfig Requires: shared-mime-info Requires: hicolor-icon-theme @@ -71,6 +73,9 @@ %changelog +* Mon Feb 12 2007 Julian Sikorski - 0.1.94-2 +- Whoops. Added intltool and gettext to BuildRequires + * Sun Feb 11 2007 Julian Sikorski - 0.1.94-1 - Updated to 0.1.94 From fedora-extras-commits at redhat.com Mon Feb 12 17:39:04 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 12:39:04 -0500 Subject: rpms/libmp4v2 - New directory Message-ID: <200702121739.l1CHd410007633@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/libmp4v2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7628/libmp4v2 Log Message: Directory /cvs/extras/rpms/libmp4v2 added to the repository From fedora-extras-commits at redhat.com Mon Feb 12 17:39:11 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 12:39:11 -0500 Subject: rpms/libmp4v2/devel - New directory Message-ID: <200702121739.l1CHdB1k007647@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/libmp4v2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7628/libmp4v2/devel Log Message: Directory /cvs/extras/rpms/libmp4v2/devel added to the repository From fedora-extras-commits at redhat.com Mon Feb 12 17:39:24 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 12:39:24 -0500 Subject: rpms/libmp4v2 Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702121739.l1CHdORS007712@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/libmp4v2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7703 Added Files: Makefile import.log pkg.acl Log Message: Setup of module libmp4v2 --- NEW FILE Makefile --- # Top level Makefile for module libmp4v2 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Mon Feb 12 17:39:31 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 12:39:31 -0500 Subject: rpms/libmp4v2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702121739.l1CHdVC4007729@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/libmp4v2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7703/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libmp4v2 --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Feb 12 17:43:47 2007 From: fedora-extras-commits at redhat.com (Daniel Malmgren (danielm)) Date: Mon, 12 Feb 2007 12:43:47 -0500 Subject: rpms/initng-ifiles/devel initng-ifiles.spec, 1.4, 1.5 libpath.patch, 1.1, NONE Message-ID: <200702121743.l1CHhlKY007988@cvs-int.fedora.redhat.com> Author: danielm Update of /cvs/extras/rpms/initng-ifiles/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7944 Modified Files: initng-ifiles.spec Removed Files: libpath.patch Log Message: initng-ifiles 0.0.8 Index: initng-ifiles.spec =================================================================== RCS file: /cvs/extras/rpms/initng-ifiles/devel/initng-ifiles.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- initng-ifiles.spec 5 Feb 2007 09:02:28 -0000 1.4 +++ initng-ifiles.spec 12 Feb 2007 17:43:15 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Scripts for initng Name: initng-ifiles -Version: 0.0.7 -Release: 2%{?dist} +Version: 0.0.8 +Release: 1%{?dist} License: GPL URL: http://www.initng.org Group: System Environment/Base @@ -10,7 +10,6 @@ BuildRequires: cmake initng-devel Requires: filesystem Provides: initng(ifiles) -patch0: libpath.patch %description Initng is a full replacement of the old and in many ways deprecated sysvinit @@ -18,7 +17,6 @@ %prep %setup -q -%patch0 -p0 -b .libpath %build export CFLAGS="$RPM_OPT_FLAGS" @@ -57,6 +55,10 @@ %{_mandir}/*/* %changelog +* Mon Feb 12 2007 Daniel Malmgren 0.0.8-1 +- New upstreams version +- Removed the lib patch, now in upstreams + * Mon Feb 05 2007 Daniel Malmgren 0.0.7-2 - Fixed issue with hardcoded /lib path, using patch from upstreams svn --- libpath.patch DELETED --- From fedora-extras-commits at redhat.com Mon Feb 12 17:45:09 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 12:45:09 -0500 Subject: rpms/spampd - New directory Message-ID: <200702121745.l1CHj9SO008084@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/spampd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8079/spampd Log Message: Directory /cvs/extras/rpms/spampd added to the repository From fedora-extras-commits at redhat.com Mon Feb 12 17:45:16 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 12:45:16 -0500 Subject: rpms/spampd/devel - New directory Message-ID: <200702121745.l1CHjGAQ008103@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/spampd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8079/spampd/devel Log Message: Directory /cvs/extras/rpms/spampd/devel added to the repository From fedora-extras-commits at redhat.com Mon Feb 12 17:45:32 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 12:45:32 -0500 Subject: rpms/spampd Makefile,NONE,1.1 import.log,NONE,1.1 pkg.acl,NONE,1.1 Message-ID: <200702121745.l1CHjWYZ008148@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/spampd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8139 Added Files: Makefile import.log pkg.acl Log Message: Setup of module spampd --- NEW FILE Makefile --- # Top level Makefile for module spampd all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Mon Feb 12 17:45:39 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 12:45:39 -0500 Subject: rpms/spampd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702121745.l1CHjdLM008172@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/spampd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8139/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module spampd --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Feb 12 17:47:11 2007 From: fedora-extras-commits at redhat.com (Daniel Malmgren (danielm)) Date: Mon, 12 Feb 2007 12:47:11 -0500 Subject: rpms/initng-ifiles/devel .cvsignore,1.3,1.4 sources,1.3,1.4 Message-ID: <200702121747.l1CHlB8h008413@cvs-int.fedora.redhat.com> Author: danielm Update of /cvs/extras/rpms/initng-ifiles/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8239 Modified Files: .cvsignore sources Log Message: Uploaded the new initng-ifiles source Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/initng-ifiles/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 4 Feb 2007 19:00:21 -0000 1.3 +++ .cvsignore 12 Feb 2007 17:46:39 -0000 1.4 @@ -1 +1 @@ -initng-ifiles-0.0.7.tar.bz2 +initng-ifiles-0.0.8.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/initng-ifiles/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 4 Feb 2007 19:00:21 -0000 1.3 +++ sources 12 Feb 2007 17:46:39 -0000 1.4 @@ -1 +1 @@ -0155a1aef442e8a05a9c45b941413648 initng-ifiles-0.0.7.tar.bz2 +b1cacae7cb1f4a97a1a80077f03858cf initng-ifiles-0.0.8.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 12 17:52:15 2007 From: fedora-extras-commits at redhat.com (Daniel Malmgren (danielm)) Date: Mon, 12 Feb 2007 12:52:15 -0500 Subject: rpms/initng-ifiles/FC-6 .cvsignore, 1.2, 1.3 initng-ifiles.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200702121752.l1CHqFeN008696@cvs-int.fedora.redhat.com> Author: danielm Update of /cvs/extras/rpms/initng-ifiles/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8633/FC-6 Modified Files: .cvsignore initng-ifiles.spec sources Log Message: initng-ifiles 0.0.8 for FC-5 and FC-6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/initng-ifiles/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Sep 2006 09:20:40 -0000 1.2 +++ .cvsignore 12 Feb 2007 17:51:42 -0000 1.3 @@ -1 +1 @@ -initng-ifiles-0.0.6.tar.bz2 +initng-ifiles-0.0.8.tar.bz2 Index: initng-ifiles.spec =================================================================== RCS file: /cvs/extras/rpms/initng-ifiles/FC-6/initng-ifiles.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- initng-ifiles.spec 30 Sep 2006 05:27:48 -0000 1.2 +++ initng-ifiles.spec 12 Feb 2007 17:51:42 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Scripts for initng Name: initng-ifiles -Version: 0.0.6 -Release: 2%{?dist} +Version: 0.0.8 +Release: 1%{?dist} License: GPL URL: http://www.initng.org Group: System Environment/Base @@ -19,6 +19,7 @@ %setup -q %build +export CFLAGS="$RPM_OPT_FLAGS" cmake . -DLIB_INSTALL_DIR:STRING=/%{_lib} make %{?_smp_mflags} @@ -28,11 +29,13 @@ rm -rf %{buildroot}/%{_sysconfdir}/hotplug/net.agent rm -rf %{buildroot}/%{_sysconfdir}/pcmcia/network rm -rf %{buildroot}%{_datadir}/vim/ +rm -rf %{buildroot}/%{_lib}/libgenrunlevel.gentoo +rm -rf %{buildroot}/%{_lib}/libgenrunlevel.debian mkdir _doc mv %{buildroot}%{_datadir}/doc/%{name}/* _doc/ %post -/sbin/gen_system_runlevel -all >/dev/null 2>&1 || : +/sbin/genrunlevel -all >/dev/null 2>&1 || : exit 0 %clean @@ -44,13 +47,28 @@ %defattr(-,root,root) %doc _doc/* %config(noreplace) %{_sysconfdir}/initng -/sbin/gen_system_runlevel +/sbin/genrunlevel /sbin/install_service /sbin/ng-update +/%{_lib}/libgenrunlevel* /%{_lib}/initng %{_mandir}/*/* %changelog +* Mon Feb 12 2007 Daniel Malmgren 0.0.8-1 +- New upstreams version +- Removed the lib patch, now in upstreams + +* Mon Feb 05 2007 Daniel Malmgren 0.0.7-2 +- Fixed issue with hardcoded /lib path, using patch from upstreams svn + +* Sun Feb 04 2007 Daniel Malmgren 0.0.7-1 +- New upstreams version +- Upstreams has migrated from the old cludgy gen_system_runlevel to + a new genrunlevel. Adopting. The script is hardcoded to search for + it's files in /lib, I guess this needs fixing upstreams... +- Fix the flags used for building + * Sat Sep 30 2006 Daniel Malmgren 0.0.6-2 - Bump version for rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/initng-ifiles/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Sep 2006 09:20:40 -0000 1.2 +++ sources 12 Feb 2007 17:51:42 -0000 1.3 @@ -1 +1 @@ -3e41d3fef0fbd40605844eadda1abd75 initng-ifiles-0.0.6.tar.bz2 +b1cacae7cb1f4a97a1a80077f03858cf initng-ifiles-0.0.8.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 12 17:52:12 2007 From: fedora-extras-commits at redhat.com (Daniel Malmgren (danielm)) Date: Mon, 12 Feb 2007 12:52:12 -0500 Subject: rpms/initng-ifiles/FC-5 .cvsignore, 1.2, 1.3 initng-ifiles.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200702121752.l1CHqCl5008691@cvs-int.fedora.redhat.com> Author: danielm Update of /cvs/extras/rpms/initng-ifiles/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8633/FC-5 Modified Files: .cvsignore initng-ifiles.spec sources Log Message: initng-ifiles 0.0.8 for FC-5 and FC-6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/initng-ifiles/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Sep 2006 09:20:40 -0000 1.2 +++ .cvsignore 12 Feb 2007 17:51:40 -0000 1.3 @@ -1 +1 @@ -initng-ifiles-0.0.6.tar.bz2 +initng-ifiles-0.0.8.tar.bz2 Index: initng-ifiles.spec =================================================================== RCS file: /cvs/extras/rpms/initng-ifiles/FC-5/initng-ifiles.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- initng-ifiles.spec 30 Sep 2006 05:27:47 -0000 1.2 +++ initng-ifiles.spec 12 Feb 2007 17:51:40 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Scripts for initng Name: initng-ifiles -Version: 0.0.6 -Release: 2%{?dist} +Version: 0.0.8 +Release: 1%{?dist} License: GPL URL: http://www.initng.org Group: System Environment/Base @@ -19,6 +19,7 @@ %setup -q %build +export CFLAGS="$RPM_OPT_FLAGS" cmake . -DLIB_INSTALL_DIR:STRING=/%{_lib} make %{?_smp_mflags} @@ -28,11 +29,13 @@ rm -rf %{buildroot}/%{_sysconfdir}/hotplug/net.agent rm -rf %{buildroot}/%{_sysconfdir}/pcmcia/network rm -rf %{buildroot}%{_datadir}/vim/ +rm -rf %{buildroot}/%{_lib}/libgenrunlevel.gentoo +rm -rf %{buildroot}/%{_lib}/libgenrunlevel.debian mkdir _doc mv %{buildroot}%{_datadir}/doc/%{name}/* _doc/ %post -/sbin/gen_system_runlevel -all >/dev/null 2>&1 || : +/sbin/genrunlevel -all >/dev/null 2>&1 || : exit 0 %clean @@ -44,13 +47,28 @@ %defattr(-,root,root) %doc _doc/* %config(noreplace) %{_sysconfdir}/initng -/sbin/gen_system_runlevel +/sbin/genrunlevel /sbin/install_service /sbin/ng-update +/%{_lib}/libgenrunlevel* /%{_lib}/initng %{_mandir}/*/* %changelog +* Mon Feb 12 2007 Daniel Malmgren 0.0.8-1 +- New upstreams version +- Removed the lib patch, now in upstreams + +* Mon Feb 05 2007 Daniel Malmgren 0.0.7-2 +- Fixed issue with hardcoded /lib path, using patch from upstreams svn + +* Sun Feb 04 2007 Daniel Malmgren 0.0.7-1 +- New upstreams version +- Upstreams has migrated from the old cludgy gen_system_runlevel to + a new genrunlevel. Adopting. The script is hardcoded to search for + it's files in /lib, I guess this needs fixing upstreams... +- Fix the flags used for building + * Sat Sep 30 2006 Daniel Malmgren 0.0.6-2 - Bump version for rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/initng-ifiles/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Sep 2006 09:20:40 -0000 1.2 +++ sources 12 Feb 2007 17:51:40 -0000 1.3 @@ -1 +1 @@ -3e41d3fef0fbd40605844eadda1abd75 initng-ifiles-0.0.6.tar.bz2 +b1cacae7cb1f4a97a1a80077f03858cf initng-ifiles-0.0.8.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 12 17:55:30 2007 From: fedora-extras-commits at redhat.com (Daniel Malmgren (danielm)) Date: Mon, 12 Feb 2007 12:55:30 -0500 Subject: rpms/initng/FC-5 .cvsignore, 1.2, 1.3 initng.spec, 1.10, 1.11 sources, 1.3, 1.4 Message-ID: <200702121755.l1CHtUuR008843@cvs-int.fedora.redhat.com> Author: danielm Update of /cvs/extras/rpms/initng/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8805/FC-5 Modified Files: .cvsignore initng.spec sources Log Message: initng 0.6.9 for FC-5 and FC-6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/initng/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 4 Dec 2005 11:30:18 -0000 1.2 +++ .cvsignore 12 Feb 2007 17:54:57 -0000 1.3 @@ -1 +1 @@ -initng-0.4.7.tar.gz +initng-0.6.9.tar.bz2 Index: initng.spec =================================================================== RCS file: /cvs/extras/rpms/initng/FC-5/initng.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- initng.spec 30 Sep 2006 05:01:12 -0000 1.10 +++ initng.spec 12 Feb 2007 17:54:57 -0000 1.11 @@ -1,7 +1,7 @@ Summary: Programs which control basic system processes Name: initng -Version: 0.6.8 -Release: 9%{?dist} +Version: 0.6.9 +Release: 3%{?dist} License: GPL URL: http://www.initng.org Group: System Environment/Base @@ -13,7 +13,6 @@ Requires(post): procps Requires(triggerin): grep coreutils Requires: %{name}-lib = %{version}-%{release} -Patch0: check-selinux.patch %description Initng is a full replacement of the old and in many ways deprecated sysvinit @@ -38,9 +37,9 @@ %prep %setup -q -%patch0 -p0 -b .check_selinux %build +export CFLAGS="$RPM_OPT_FLAGS" cmake . -DBUILD_SELINUX:BOOL=ON -DCOUNT_ME:BOOL=OFF -DLIB_INSTALL_DIR:STRING=/%{_lib} make %{?_smp_mflags} VERBOSE=1 @@ -66,7 +65,7 @@ defaultkpath=`grubby --default-kernel` if test -n $defaultkpath && test -f "/boot/vmlinuz-"`uname -r` then - defaultkpath="/boot/vmlinuz-"`uname -r` + defaultkpath="/boot/vmlinuz-"`uname -r` fi defaultinitrd=`grubby --info=$defaultkpath | grep initrd` grubby --add-kernel=$defaultkpath --copy-default --args="init=/sbin/initng" --title="initng boot" --$defaultinitrd @@ -114,6 +113,16 @@ /%{_lib}/libngcclient.so %changelog +* Sun Feb 04 2007 Daniel Malmgren 0.6.9-3 +- Use correct opt flags as suggested in BZ #225100 + +* Sun Feb 04 2007 Daniel Malmgren 0.6.9-2 +- Forgot to upload the source... + +* Sun Feb 04 2007 Daniel Malmgren 0.6.9-1 +- New upstreams version +- Removed selinux patch that's now upstreams + * Sat Sep 30 2006 Daniel Malmgren 0.6.8-9 - Seems like this bumping is getting out of hands, right? Index: sources =================================================================== RCS file: /cvs/extras/rpms/initng/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Sep 2006 04:53:17 -0000 1.3 +++ sources 12 Feb 2007 17:54:57 -0000 1.4 @@ -1 +1 @@ -14a5e9a1083f2bfa560f5c5c6151d09f initng-0.6.8.tar.bz2 +dfaa7a90e86ae7af6f7daa443e5cb7c7 initng-0.6.9.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 12 17:55:32 2007 From: fedora-extras-commits at redhat.com (Daniel Malmgren (danielm)) Date: Mon, 12 Feb 2007 12:55:32 -0500 Subject: rpms/initng/FC-6 .cvsignore, 1.3, 1.4 initng.spec, 1.9, 1.10 sources, 1.3, 1.4 Message-ID: <200702121755.l1CHtWI6008848@cvs-int.fedora.redhat.com> Author: danielm Update of /cvs/extras/rpms/initng/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8805/FC-6 Modified Files: .cvsignore initng.spec sources Log Message: initng 0.6.9 for FC-5 and FC-6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/initng/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Sep 2006 18:21:04 -0000 1.3 +++ .cvsignore 12 Feb 2007 17:55:00 -0000 1.4 @@ -1 +1 @@ -initng-0.6.8.tar.bz2 +initng-0.6.9.tar.bz2 Index: initng.spec =================================================================== RCS file: /cvs/extras/rpms/initng/FC-6/initng.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- initng.spec 30 Sep 2006 05:01:13 -0000 1.9 +++ initng.spec 12 Feb 2007 17:55:00 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Programs which control basic system processes Name: initng -Version: 0.6.8 -Release: 9%{?dist} +Version: 0.6.9 +Release: 3%{?dist} License: GPL URL: http://www.initng.org Group: System Environment/Base @@ -13,7 +13,6 @@ Requires(post): procps Requires(triggerin): grep coreutils Requires: %{name}-lib = %{version}-%{release} -Patch0: check-selinux.patch %description Initng is a full replacement of the old and in many ways deprecated sysvinit @@ -38,9 +37,9 @@ %prep %setup -q -%patch0 -p0 -b .check_selinux %build +export CFLAGS="$RPM_OPT_FLAGS" cmake . -DBUILD_SELINUX:BOOL=ON -DCOUNT_ME:BOOL=OFF -DLIB_INSTALL_DIR:STRING=/%{_lib} make %{?_smp_mflags} VERBOSE=1 @@ -66,7 +65,7 @@ defaultkpath=`grubby --default-kernel` if test -n $defaultkpath && test -f "/boot/vmlinuz-"`uname -r` then - defaultkpath="/boot/vmlinuz-"`uname -r` + defaultkpath="/boot/vmlinuz-"`uname -r` fi defaultinitrd=`grubby --info=$defaultkpath | grep initrd` grubby --add-kernel=$defaultkpath --copy-default --args="init=/sbin/initng" --title="initng boot" --$defaultinitrd @@ -114,6 +113,16 @@ /%{_lib}/libngcclient.so %changelog +* Sun Feb 04 2007 Daniel Malmgren 0.6.9-3 +- Use correct opt flags as suggested in BZ #225100 + +* Sun Feb 04 2007 Daniel Malmgren 0.6.9-2 +- Forgot to upload the source... + +* Sun Feb 04 2007 Daniel Malmgren 0.6.9-1 +- New upstreams version +- Removed selinux patch that's now upstreams + * Sat Sep 30 2006 Daniel Malmgren 0.6.8-9 - Seems like this bumping is getting out of hands, right? Index: sources =================================================================== RCS file: /cvs/extras/rpms/initng/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Sep 2006 18:21:04 -0000 1.3 +++ sources 12 Feb 2007 17:55:00 -0000 1.4 @@ -1 +1 @@ -14a5e9a1083f2bfa560f5c5c6151d09f initng-0.6.8.tar.bz2 +dfaa7a90e86ae7af6f7daa443e5cb7c7 initng-0.6.9.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 12 17:57:25 2007 From: fedora-extras-commits at redhat.com (Daniel Malmgren (danielm)) Date: Mon, 12 Feb 2007 12:57:25 -0500 Subject: rpms/initng/FC-5 check-selinux.patch,1.1,NONE Message-ID: <200702121757.l1CHvPmg008922@cvs-int.fedora.redhat.com> Author: danielm Update of /cvs/extras/rpms/initng/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8913/FC-5 Removed Files: check-selinux.patch Log Message: Removed old unneeded patches --- check-selinux.patch DELETED --- From fedora-extras-commits at redhat.com Mon Feb 12 17:57:32 2007 From: fedora-extras-commits at redhat.com (Daniel Malmgren (danielm)) Date: Mon, 12 Feb 2007 12:57:32 -0500 Subject: rpms/initng/FC-6 check-selinux.patch,1.1,NONE Message-ID: <200702121757.l1CHvWj0008936@cvs-int.fedora.redhat.com> Author: danielm Update of /cvs/extras/rpms/initng/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8913/FC-6 Removed Files: check-selinux.patch Log Message: Removed old unneeded patches --- check-selinux.patch DELETED --- From fedora-extras-commits at redhat.com Mon Feb 12 18:01:21 2007 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Mon, 12 Feb 2007 13:01:21 -0500 Subject: rpms/mail-notification/FC-6 .cvsignore, 1.7, 1.8 mail-notification.spec, 1.31, 1.32 sources, 1.7, 1.8 Message-ID: <200702121801.l1CI1LtQ012369@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/mail-notification/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9013 Modified Files: .cvsignore mail-notification.spec sources Log Message: 4.0-1 -- Update to 4.0 final by syncing with devel Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mail-notification/FC-6/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 14 Jun 2006 16:34:41 -0000 1.7 +++ .cvsignore 12 Feb 2007 18:00:49 -0000 1.8 @@ -1 +1 @@ -mail-notification-3.0.tar.gz +mail-notification-4.0.tar.gz Index: mail-notification.spec =================================================================== RCS file: /cvs/extras/rpms/mail-notification/FC-6/mail-notification.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- mail-notification.spec 9 Nov 2006 10:52:05 -0000 1.31 +++ mail-notification.spec 12 Feb 2007 18:00:49 -0000 1.32 @@ -1,13 +1,12 @@ Name: mail-notification -Version: 3.0 -Release: 10%{?dist} +Version: 4.0 +Release: 1%{?dist} Summary: Status icon that informs you if you have new mail Group: Applications/Internet License: GPL URL: http://www.nongnu.org/mailnotify/ -Source0: http://savannah.nongnu.org/download/mailnotify/mail-notification-3.0.tar.gz -Source1: mail-notification-README.FEDORA +Source0: http://download.savannah.gnu.org/releases/mailnotify/mail-notification-4.0.tar.gz Patch0: mail-notification-fedora-plugin-hint.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -26,8 +25,9 @@ BuildRequires: gob2 BuildRequires: evolution-devel BuildRequires: evolution-data-server-devel >= 1.5 +BuildRequires: libnotify-devel - +Requires: hicolor-icon-theme Requires(post): GConf2 Requires(post): scrollkeeper Requires(preun): GConf2 @@ -53,9 +53,8 @@ Evolution support for Mail Notification. %prep -%setup -q -n %{name}-%{version} +%setup -q %patch0 -p1 -b .patch0 -cp %{SOURCE1} ./README.FEDORA %build %configure --disable-schemas-install --enable-evolution @@ -95,6 +94,9 @@ /usr/bin/gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null ||: /usr/bin/scrollkeeper-update -q ||: +touch --no-create %{_datadir}/icons/hicolor || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + %preun # For GConf apps: uninstall app's system default schemas @@ -105,11 +107,12 @@ %postun /usr/bin/scrollkeeper-update -q ||: - +touch --no-create %{_datadir}/icons/hicolor || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING NEWS README TODO README.FEDORA +%doc AUTHORS COPYING NEWS README TODO %{_sysconfdir}/gconf/schemas/mail-notification.schemas %{_bindir}/* %{_libdir}/bonobo/servers/GNOME_MailNotification.server @@ -119,8 +122,7 @@ %{_datadir}/gnome/help/mail-notification/ %dir %{_datadir}/omf/mail-notification/ %{_datadir}/omf/mail-notification/mail-notification-C.omf -%{_datadir}/pixmaps/mail-notification.png - +%{_datadir}/icons/hicolor/*/apps/mail-notification.* %files evolution-plugin %defattr(-,root,root,-) @@ -129,14 +131,33 @@ %changelog +* Wed Jan 17 2007 Thorsten Leemhuis 4.0-1 +- Update to 4.0 final + +* Wed Dec 20 2006 Thorsten Leemhuis 4.0-0.3.rc2 +- Rebuild + +* Thu Dec 07 2006 Thorsten Leemhuis 4.0-0.2.rc2 +- Update to 4.0rc2 + +* Tue Nov 28 2006 Thorsten Leemhuis 4.0-0.1.rc1 +- Update to 4.0rc1 +- remove some unneeded workarounds and patches +- require hicolor-icon-theme + +* Tue Nov 21 2006 Thorsten Leemhuis 3.0-11 +- add mail-notification-mail-reader-launch.patch (#215119, credits go to + John Conroy) + * Thu Nov 09 2006 Thorsten Leemhuis 3.0-10 - Update patch * Sat Nov 04 2006 Thorsten Leemhuis 3.0-9 - add a patch that informs the user to install the evolution-plugin if he want to use mn with evo -- skipping "3.0-8" to be on the same level as devel that get's the - same addition in 3.0-9, but had another, devel specific update in between + +* Sun Oct 29 2006 Thorsten Leemhuis 3.0-8 +- add workaround that hacks configure to allow building with evo 2.10 * Sat Sep 02 2006 Thorsten Leemhuis 3.0-7 - don't run mail-notification with unset-obsolete-configuration at all Index: sources =================================================================== RCS file: /cvs/extras/rpms/mail-notification/FC-6/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 14 Jun 2006 16:34:41 -0000 1.7 +++ sources 12 Feb 2007 18:00:49 -0000 1.8 @@ -1 +1 @@ -d19fb5c96a0f54d1b1541fbddf73488e mail-notification-3.0.tar.gz +0e10b221de4389fa9275fb7bf52dc010 mail-notification-4.0.tar.gz From fedora-extras-commits at redhat.com Mon Feb 12 18:26:54 2007 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Mon, 12 Feb 2007 13:26:54 -0500 Subject: rpms/php-pear-Log/devel .cvsignore,1.3,1.4 sources,1.3,1.4 Message-ID: <200702121826.l1CIQs6Y012629@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-Log/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12610 Modified Files: .cvsignore sources Log Message: update to 1.9.10 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-pear-Log/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Oct 2006 08:06:59 -0000 1.3 +++ .cvsignore 12 Feb 2007 18:26:22 -0000 1.4 @@ -1 +1 @@ -Log-1.9.9.tgz +Log-1.9.10.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pear-Log/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Oct 2006 08:06:59 -0000 1.3 +++ sources 12 Feb 2007 18:26:22 -0000 1.4 @@ -1 +1 @@ -23f28e7fa803ddff7d68fec2850922d1 Log-1.9.9.tgz +ea725a7cc7868d0d81abe6f7bc7f2a95 Log-1.9.10.tgz From fedora-extras-commits at redhat.com Mon Feb 12 18:28:10 2007 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Mon, 12 Feb 2007 13:28:10 -0500 Subject: rpms/php-pear-Log/devel php-pear-Log.spec,1.2,1.3 Message-ID: <200702121828.l1CISA98012684@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-Log/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12665 Modified Files: php-pear-Log.spec Log Message: 1.9.10 spec file Index: php-pear-Log.spec =================================================================== RCS file: /cvs/extras/rpms/php-pear-Log/devel/php-pear-Log.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- php-pear-Log.spec 28 Oct 2006 08:06:59 -0000 1.2 +++ php-pear-Log.spec 12 Feb 2007 18:27:38 -0000 1.3 @@ -4,7 +4,7 @@ Summary: Abstracted logging facility for PHP Summary(fr): Abstraction des outils d'enregistrement de traces pour PHP Name: php-pear-Log -Version: 1.9.9 +Version: 1.9.10 Release: 1%{?dist} License: PHP License Group: Development/Libraries @@ -43,8 +43,8 @@ %prep %setup -c -q -%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG -mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml +%{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG +mv package.xml %{pear_name}-%{version}/%{pear_name}.xml %{__install} -m 644 -c %{SOURCE1} LICENSE @@ -93,6 +93,10 @@ %{pear_xmldir}/%{pear_name}.xml %changelog +* Mon Feb 12 2007 Remi Collet 1.9.10-1 +- update to 1.9.10 +- All tests succeed with php-5.2.x : http://pear.php.net/bugs/bug.php?id=9023 + * Sat Oct 28 2006 Remi Collet 1.9.9-1 - update to 1.9.9 From fedora-extras-commits at redhat.com Mon Feb 12 18:30:58 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 13:30:58 -0500 Subject: rpms/fuse-convmvfs Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702121830.l1CIUwv3012843@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/fuse-convmvfs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12834 Added Files: Makefile import.log pkg.acl Log Message: Setup of module fuse-convmvfs --- NEW FILE Makefile --- # Top level Makefile for module fuse-convmvfs all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Mon Feb 12 18:31:06 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 13:31:06 -0500 Subject: rpms/fuse-convmvfs/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702121831.l1CIV6Sn012860@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/fuse-convmvfs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12834/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module fuse-convmvfs --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Feb 12 18:37:06 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 13:37:06 -0500 Subject: rpms/rudeconfig/devel - New directory Message-ID: <200702121837.l1CIb6SA013025@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/rudeconfig/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13004/rudeconfig/devel Log Message: Directory /cvs/extras/rpms/rudeconfig/devel added to the repository From fedora-extras-commits at redhat.com Mon Feb 12 18:36:58 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 13:36:58 -0500 Subject: rpms/rudeconfig - New directory Message-ID: <200702121836.l1CIawZH013009@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/rudeconfig In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13004/rudeconfig Log Message: Directory /cvs/extras/rpms/rudeconfig added to the repository From fedora-extras-commits at redhat.com Mon Feb 12 18:37:19 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 13:37:19 -0500 Subject: rpms/rudeconfig Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702121837.l1CIbJ4K013058@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/rudeconfig In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13049 Added Files: Makefile import.log pkg.acl Log Message: Setup of module rudeconfig --- NEW FILE Makefile --- # Top level Makefile for module rudeconfig all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Mon Feb 12 18:37:27 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 13:37:27 -0500 Subject: rpms/rudeconfig/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702121837.l1CIbRdf013075@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/rudeconfig/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13049/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module rudeconfig --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Feb 12 18:39:30 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 13:39:30 -0500 Subject: rpms/gpixpod - New directory Message-ID: <200702121839.l1CIdU4w013193@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/gpixpod In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13188/gpixpod Log Message: Directory /cvs/extras/rpms/gpixpod added to the repository From fedora-extras-commits at redhat.com Mon Feb 12 18:39:35 2007 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Mon, 12 Feb 2007 13:39:35 -0500 Subject: rpms/php-pear-PHP-CompatInfo/devel .cvsignore, 1.3, 1.4 php-pear-PHP-CompatInfo.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200702121839.l1CIdZd8013208@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-PHP-CompatInfo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13157 Modified Files: .cvsignore php-pear-PHP-CompatInfo.spec sources Log Message: upgrade to 1.4.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-pear-PHP-CompatInfo/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Oct 2006 15:23:35 -0000 1.3 +++ .cvsignore 12 Feb 2007 18:39:03 -0000 1.4 @@ -1 +1 @@ -PHP_CompatInfo-1.4.0.tgz +PHP_CompatInfo-1.4.1.tgz Index: php-pear-PHP-CompatInfo.spec =================================================================== RCS file: /cvs/extras/rpms/php-pear-PHP-CompatInfo/devel/php-pear-PHP-CompatInfo.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- php-pear-PHP-CompatInfo.spec 2 Oct 2006 15:25:49 -0000 1.3 +++ php-pear-PHP-CompatInfo.spec 12 Feb 2007 18:39:03 -0000 1.4 @@ -2,8 +2,8 @@ %define pear_name PHP_CompatInfo Name: php-pear-PHP-CompatInfo -Version: 1.4.0 -Release: 1%{?dist}.1 +Version: 1.4.1 +Release: 1%{?dist} Summary: Find out version and extensions required for a piece of code to run Summary(fr): Trouver version et extensions n??cessaires ?? l'ex??cution d'un code @@ -17,7 +17,7 @@ BuildArch: noarch BuildRequires: dos2unix php-pear >= 1:1.4.9-1.2 -Requires: php-pear(PEAR) >= 1.4.3 php-pear(Console_Getargs) >= 1.3.1 php-pear(Console_Table) >= 1.0.5 +Requires: php-pear(PEAR) >= 1.4.3 php-pear(Console_Getargs) >= 1.3.3 php-pear(Console_Table) >= 1.0.5 Requires(post): %{__pear} Requires(postun): %{__pear} Provides: php-pear(%{pear_name}) = %{version} @@ -93,6 +93,10 @@ %{_bindir}/pcicmd %changelog +* Mon Feb 12 2007 Remi Collet 1.4.1-1 +- upgrade to 1.4.1 +- upgrade Requires Console_Getargs to 1.3.3 + * Thu Sep 28 2006 Remi Collet 1.4.0-1 - upgrade to 1.4.0 - Change Requires from Console_Getopt to Console_Getargs Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pear-PHP-CompatInfo/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Oct 2006 15:23:35 -0000 1.3 +++ sources 12 Feb 2007 18:39:03 -0000 1.4 @@ -1 +1 @@ -0e7da112542fa124f7b523cb09c7624a PHP_CompatInfo-1.4.0.tgz +eff50211512322d7197c65e25816b287 PHP_CompatInfo-1.4.1.tgz From fedora-extras-commits at redhat.com Mon Feb 12 18:39:37 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 13:39:37 -0500 Subject: rpms/gpixpod/devel - New directory Message-ID: <200702121839.l1CIdbFX013212@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/gpixpod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13188/gpixpod/devel Log Message: Directory /cvs/extras/rpms/gpixpod/devel added to the repository From fedora-extras-commits at redhat.com Mon Feb 12 18:39:53 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 13:39:53 -0500 Subject: rpms/gpixpod Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702121839.l1CIdrAc013245@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/gpixpod In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13236 Added Files: Makefile import.log pkg.acl Log Message: Setup of module gpixpod --- NEW FILE Makefile --- # Top level Makefile for module gpixpod all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Mon Feb 12 18:40:00 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 13:40:00 -0500 Subject: rpms/gpixpod/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702121840.l1CIe0qW013271@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/gpixpod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13236/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gpixpod --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Feb 12 18:44:33 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 13:44:33 -0500 Subject: rpms/bcfg2 Makefile,NONE,1.1 import.log,NONE,1.1 pkg.acl,NONE,1.1 Message-ID: <200702121844.l1CIiX4n013457@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/bcfg2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13449 Added Files: Makefile import.log pkg.acl Log Message: Setup of module bcfg2 --- NEW FILE Makefile --- # Top level Makefile for module bcfg2 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Mon Feb 12 18:48:42 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 13:48:42 -0500 Subject: rpms/gemdropx - New directory Message-ID: <200702121848.l1CImgOM013612@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/gemdropx In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13607/gemdropx Log Message: Directory /cvs/extras/rpms/gemdropx added to the repository From fedora-extras-commits at redhat.com Mon Feb 12 18:48:49 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 13:48:49 -0500 Subject: rpms/gemdropx/devel - New directory Message-ID: <200702121848.l1CImnab013630@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/gemdropx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13607/gemdropx/devel Log Message: Directory /cvs/extras/rpms/gemdropx/devel added to the repository From fedora-extras-commits at redhat.com Mon Feb 12 18:49:02 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 13:49:02 -0500 Subject: rpms/gemdropx Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702121849.l1CIn2fZ013667@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/gemdropx In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13656 Added Files: Makefile import.log pkg.acl Log Message: Setup of module gemdropx --- NEW FILE Makefile --- # Top level Makefile for module gemdropx all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Mon Feb 12 18:49:09 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 13:49:09 -0500 Subject: rpms/gemdropx/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702121849.l1CIn96Z013685@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/gemdropx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13656/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gemdropx --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Feb 12 18:51:28 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 13:51:28 -0500 Subject: rpms/perl-File-Next Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702121851.l1CIpSpg013835@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/perl-File-Next In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13826 Added Files: Makefile import.log pkg.acl Log Message: Setup of module perl-File-Next --- NEW FILE Makefile --- # Top level Makefile for module perl-File-Next all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Mon Feb 12 18:51:31 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 13:51:31 -0500 Subject: rpms/perl-File-Next/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702121851.l1CIpVU6013852@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/perl-File-Next/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13826/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-File-Next --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Feb 12 18:53:26 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 13:53:26 -0500 Subject: rpms/perl-App-CLI - New directory Message-ID: <200702121853.l1CIrQrX013919@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/perl-App-CLI In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13914/perl-App-CLI Log Message: Directory /cvs/extras/rpms/perl-App-CLI added to the repository From fedora-extras-commits at redhat.com Mon Feb 12 18:53:33 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 13:53:33 -0500 Subject: rpms/perl-App-CLI/devel - New directory Message-ID: <200702121853.l1CIrXkW013933@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/perl-App-CLI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13914/perl-App-CLI/devel Log Message: Directory /cvs/extras/rpms/perl-App-CLI/devel added to the repository From fedora-extras-commits at redhat.com Mon Feb 12 18:53:47 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 13:53:47 -0500 Subject: rpms/perl-App-CLI Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702121853.l1CIrlAs013966@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/perl-App-CLI In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13957 Added Files: Makefile import.log pkg.acl Log Message: Setup of module perl-App-CLI --- NEW FILE Makefile --- # Top level Makefile for module perl-App-CLI all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Mon Feb 12 18:53:55 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 13:53:55 -0500 Subject: rpms/perl-App-CLI/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702121853.l1CIrtXN013983@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/perl-App-CLI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13957/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-App-CLI --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Feb 12 18:56:02 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 13:56:02 -0500 Subject: rpms/perl-Path-Class - New directory Message-ID: <200702121856.l1CIu27Q014049@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/perl-Path-Class In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14044/perl-Path-Class Log Message: Directory /cvs/extras/rpms/perl-Path-Class added to the repository From fedora-extras-commits at redhat.com Mon Feb 12 18:56:09 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 13:56:09 -0500 Subject: rpms/perl-Path-Class/devel - New directory Message-ID: <200702121856.l1CIu9k9014063@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/perl-Path-Class/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14044/perl-Path-Class/devel Log Message: Directory /cvs/extras/rpms/perl-Path-Class/devel added to the repository From fedora-extras-commits at redhat.com Mon Feb 12 18:56:22 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 13:56:22 -0500 Subject: rpms/perl-Path-Class Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702121856.l1CIuM46014101@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/perl-Path-Class In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14087 Added Files: Makefile import.log pkg.acl Log Message: Setup of module perl-Path-Class --- NEW FILE Makefile --- # Top level Makefile for module perl-Path-Class all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Mon Feb 12 18:56:30 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 13:56:30 -0500 Subject: rpms/perl-Path-Class/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702121856.l1CIuUMP014118@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/perl-Path-Class/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14087/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Path-Class --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Feb 12 18:57:40 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 13:57:40 -0500 Subject: rpms/perl-Module-Depends - New directory Message-ID: <200702121857.l1CIve0l014207@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/perl-Module-Depends In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14202/perl-Module-Depends Log Message: Directory /cvs/extras/rpms/perl-Module-Depends added to the repository From fedora-extras-commits at redhat.com Mon Feb 12 18:57:47 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 13:57:47 -0500 Subject: rpms/perl-Module-Depends/devel - New directory Message-ID: <200702121857.l1CIvl4p014224@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/perl-Module-Depends/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14202/perl-Module-Depends/devel Log Message: Directory /cvs/extras/rpms/perl-Module-Depends/devel added to the repository From fedora-extras-commits at redhat.com Mon Feb 12 18:58:03 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 13:58:03 -0500 Subject: rpms/perl-Module-Depends Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702121858.l1CIw3Tv014272@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/perl-Module-Depends In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14262 Added Files: Makefile import.log pkg.acl Log Message: Setup of module perl-Module-Depends --- NEW FILE Makefile --- # Top level Makefile for module perl-Module-Depends all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Mon Feb 12 18:58:10 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 13:58:10 -0500 Subject: rpms/perl-Module-Depends/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702121858.l1CIwA4v014295@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/perl-Module-Depends/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14262/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Module-Depends --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Feb 12 19:01:32 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 14:01:32 -0500 Subject: rpms/gimmie - New directory Message-ID: <200702121901.l1CJ1WK5017700@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/gimmie In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17695/gimmie Log Message: Directory /cvs/extras/rpms/gimmie added to the repository From fedora-extras-commits at redhat.com Mon Feb 12 19:01:40 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 14:01:40 -0500 Subject: rpms/gimmie/devel - New directory Message-ID: <200702121901.l1CJ1ew9017719@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/gimmie/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17695/gimmie/devel Log Message: Directory /cvs/extras/rpms/gimmie/devel added to the repository From fedora-extras-commits at redhat.com Mon Feb 12 19:01:53 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 14:01:53 -0500 Subject: rpms/gimmie Makefile,NONE,1.1 import.log,NONE,1.1 pkg.acl,NONE,1.1 Message-ID: <200702121901.l1CJ1rDl017759@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/gimmie In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17750 Added Files: Makefile import.log pkg.acl Log Message: Setup of module gimmie --- NEW FILE Makefile --- # Top level Makefile for module gimmie all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Mon Feb 12 19:02:01 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 14:02:01 -0500 Subject: rpms/gimmie/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702121902.l1CJ21xV017780@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/gimmie/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17750/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gimmie --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Feb 12 19:04:11 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 14:04:11 -0500 Subject: rpms/perl-Proc-Daemon Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702121904.l1CJ4BDX018022@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/perl-Proc-Daemon In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18013 Added Files: Makefile import.log pkg.acl Log Message: Setup of module perl-Proc-Daemon --- NEW FILE Makefile --- # Top level Makefile for module perl-Proc-Daemon all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Mon Feb 12 19:04:19 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 14:04:19 -0500 Subject: rpms/perl-Proc-Daemon/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702121904.l1CJ4JQe018054@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/perl-Proc-Daemon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18013/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Proc-Daemon --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Feb 12 19:06:40 2007 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Mon, 12 Feb 2007 14:06:40 -0500 Subject: rpms/php-pear-Log/FC-6 .cvsignore, 1.3, 1.4 php-pear-Log.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200702121906.l1CJ6ePL018245@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-Log/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18224 Modified Files: .cvsignore php-pear-Log.spec sources Log Message: update to 1.9.10 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-pear-Log/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Oct 2006 08:18:53 -0000 1.3 +++ .cvsignore 12 Feb 2007 19:06:07 -0000 1.4 @@ -1 +1 @@ -Log-1.9.9.tgz +Log-1.9.10.tgz Index: php-pear-Log.spec =================================================================== RCS file: /cvs/extras/rpms/php-pear-Log/FC-6/php-pear-Log.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- php-pear-Log.spec 28 Oct 2006 08:18:53 -0000 1.2 +++ php-pear-Log.spec 12 Feb 2007 19:06:07 -0000 1.3 @@ -4,7 +4,7 @@ Summary: Abstracted logging facility for PHP Summary(fr): Abstraction des outils d'enregistrement de traces pour PHP Name: php-pear-Log -Version: 1.9.9 +Version: 1.9.10 Release: 1%{?dist} License: PHP License Group: Development/Libraries @@ -43,8 +43,8 @@ %prep %setup -c -q -%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG -mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml +%{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG +mv package.xml %{pear_name}-%{version}/%{pear_name}.xml %{__install} -m 644 -c %{SOURCE1} LICENSE @@ -93,6 +93,10 @@ %{pear_xmldir}/%{pear_name}.xml %changelog +* Mon Feb 12 2007 Remi Collet 1.9.10-1 +- update to 1.9.10 +- All tests succeed with php-5.2.x : http://pear.php.net/bugs/bug.php?id=9023 + * Sat Oct 28 2006 Remi Collet 1.9.9-1 - update to 1.9.9 Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pear-Log/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Oct 2006 08:18:53 -0000 1.3 +++ sources 12 Feb 2007 19:06:07 -0000 1.4 @@ -1 +1 @@ -23f28e7fa803ddff7d68fec2850922d1 Log-1.9.9.tgz +ea725a7cc7868d0d81abe6f7bc7f2a95 Log-1.9.10.tgz From fedora-extras-commits at redhat.com Mon Feb 12 19:08:46 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 14:08:46 -0500 Subject: rpms/postgrey/devel - New directory Message-ID: <200702121908.l1CJ8kNO018393@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/postgrey/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18374/postgrey/devel Log Message: Directory /cvs/extras/rpms/postgrey/devel added to the repository From fedora-extras-commits at redhat.com Mon Feb 12 19:08:44 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 14:08:44 -0500 Subject: rpms/postgrey - New directory Message-ID: <200702121908.l1CJ8irL018379@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/postgrey In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18374/postgrey Log Message: Directory /cvs/extras/rpms/postgrey added to the repository From fedora-extras-commits at redhat.com Mon Feb 12 19:08:59 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 14:08:59 -0500 Subject: rpms/postgrey Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702121908.l1CJ8xnD018430@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/postgrey In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18419 Added Files: Makefile import.log pkg.acl Log Message: Setup of module postgrey --- NEW FILE Makefile --- # Top level Makefile for module postgrey all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Mon Feb 12 19:09:06 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 14:09:06 -0500 Subject: rpms/postgrey/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702121909.l1CJ96Eg018457@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/postgrey/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18419/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module postgrey --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Feb 12 19:10:06 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 12 Feb 2007 14:10:06 -0500 Subject: rpms/libmp4v2 pkg.acl,1.1,NONE Message-ID: <200702121910.l1CJA6Gb018721@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/libmp4v2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18698 Removed Files: pkg.acl Log Message: Initial import of libmp4v2. --- pkg.acl DELETED --- From fedora-extras-commits at redhat.com Mon Feb 12 19:10:37 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 12 Feb 2007 14:10:37 -0500 Subject: rpms/spampd pkg.acl,1.1,NONE Message-ID: <200702121910.l1CJAbpA018818@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/spampd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18799 Removed Files: pkg.acl Log Message: Initial import of spampd. --- pkg.acl DELETED --- From fedora-extras-commits at redhat.com Mon Feb 12 19:10:43 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 12 Feb 2007 14:10:43 -0500 Subject: rpms/libmp4v2/FC-5 libmp4v2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702121910.l1CJAhjw018832@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/libmp4v2/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18698/FC-5 Modified Files: .cvsignore sources Added Files: libmp4v2.spec Log Message: Initial import of libmp4v2. --- NEW FILE libmp4v2.spec --- Summary: Library for working with files using the mp4 container format Name: libmp4v2 Version: 1.5.0.1 Release: 3%{?dist} License: MPL Group: System Environment/Libraries URL: http://resare.com/libmp4v2/ Source0: http://resare.com/libmp4v2/dist/libmp4v2-%{version}.tar.bz2 # Only here to be in the source package, "just in case, and FYI" Source1: http://resare.com/libmp4v2/mklibmp4v2/mklibmp4v2-r51.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %description The libmp4v2 library provides an abstraction layer for working with files using the mp4 container format. This library is developed by mpeg4ip project and is an exact copy of the library distributed in the mpeg4ip package. %package devel Summary: Development files for the mp4v2 library Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel Development files and documentation needed to develop and compile programs using the libmp4v2 library. %prep %setup -q %build %configure \ --disable-static \ --disable-dependency-tracking %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} %{__make} install DESTDIR=%{buildroot} %{__rm} -rf %{buildroot}%{_mandir}/manm/ %clean %{__rm} -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,0755) %doc COPYING %{_bindir}/* %{_libdir}/*.so.* %files devel %defattr(-,root,root,0755) %doc README TODO INTERNALS API_CHANGES %{_includedir}/*.h %exclude %{_libdir}/*.la %{_libdir}/*.so %{_mandir}/man?/* %changelog * Fri Dec 15 2006 Matthias Saou 1.5.0.1-3 - Spec file cleanup (habits, mostly) preparing to submit for Extras inclusion. * Fri Oct 06 2006 Thorsten Leemhuis 1.5.0.1-2 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 * Tue Jul 18 2006 Noa Resare 1.5.0.1-1 - new upstream release * Sat May 13 2006 Noa Resare 1.4.1-3 - disabled static lib - use DESTDIR - disable-dependency-tracking for faster builds - removed a manpage template file apt.mpt.gz * Mon May 08 2006 Noa Resare 1.4.1-2 - specfile cleanups * Fri May 05 2006 Noa Resare 1.4.1-1.lvn5 - initial release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libmp4v2/FC-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Feb 2007 17:39:29 -0000 1.1 +++ .cvsignore 12 Feb 2007 19:10:11 -0000 1.2 @@ -0,0 +1,2 @@ +libmp4v2-1.5.0.1.tar.bz2 +mklibmp4v2-r51.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libmp4v2/FC-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Feb 2007 17:39:29 -0000 1.1 +++ sources 12 Feb 2007 19:10:11 -0000 1.2 @@ -0,0 +1,2 @@ +90eb2b0940ebe02ef81b7a60530beaee libmp4v2-1.5.0.1.tar.bz2 +4b4abb862b079a7e296c891d96faebc9 mklibmp4v2-r51.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 12 19:10:46 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 12 Feb 2007 14:10:46 -0500 Subject: rpms/libmp4v2/FC-6 libmp4v2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702121910.l1CJAkQA018854@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/libmp4v2/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18698/FC-6 Modified Files: .cvsignore sources Added Files: libmp4v2.spec Log Message: Initial import of libmp4v2. --- NEW FILE libmp4v2.spec --- Summary: Library for working with files using the mp4 container format Name: libmp4v2 Version: 1.5.0.1 Release: 3%{?dist} License: MPL Group: System Environment/Libraries URL: http://resare.com/libmp4v2/ Source0: http://resare.com/libmp4v2/dist/libmp4v2-%{version}.tar.bz2 # Only here to be in the source package, "just in case, and FYI" Source1: http://resare.com/libmp4v2/mklibmp4v2/mklibmp4v2-r51.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %description The libmp4v2 library provides an abstraction layer for working with files using the mp4 container format. This library is developed by mpeg4ip project and is an exact copy of the library distributed in the mpeg4ip package. %package devel Summary: Development files for the mp4v2 library Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel Development files and documentation needed to develop and compile programs using the libmp4v2 library. %prep %setup -q %build %configure \ --disable-static \ --disable-dependency-tracking %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} %{__make} install DESTDIR=%{buildroot} %{__rm} -rf %{buildroot}%{_mandir}/manm/ %clean %{__rm} -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,0755) %doc COPYING %{_bindir}/* %{_libdir}/*.so.* %files devel %defattr(-,root,root,0755) %doc README TODO INTERNALS API_CHANGES %{_includedir}/*.h %exclude %{_libdir}/*.la %{_libdir}/*.so %{_mandir}/man?/* %changelog * Fri Dec 15 2006 Matthias Saou 1.5.0.1-3 - Spec file cleanup (habits, mostly) preparing to submit for Extras inclusion. * Fri Oct 06 2006 Thorsten Leemhuis 1.5.0.1-2 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 * Tue Jul 18 2006 Noa Resare 1.5.0.1-1 - new upstream release * Sat May 13 2006 Noa Resare 1.4.1-3 - disabled static lib - use DESTDIR - disable-dependency-tracking for faster builds - removed a manpage template file apt.mpt.gz * Mon May 08 2006 Noa Resare 1.4.1-2 - specfile cleanups * Fri May 05 2006 Noa Resare 1.4.1-1.lvn5 - initial release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libmp4v2/FC-6/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Feb 2007 17:39:29 -0000 1.1 +++ .cvsignore 12 Feb 2007 19:10:14 -0000 1.2 @@ -0,0 +1,2 @@ +libmp4v2-1.5.0.1.tar.bz2 +mklibmp4v2-r51.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libmp4v2/FC-6/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Feb 2007 17:39:29 -0000 1.1 +++ sources 12 Feb 2007 19:10:14 -0000 1.2 @@ -0,0 +1,2 @@ +90eb2b0940ebe02ef81b7a60530beaee libmp4v2-1.5.0.1.tar.bz2 +4b4abb862b079a7e296c891d96faebc9 mklibmp4v2-r51.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 12 19:10:49 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 12 Feb 2007 14:10:49 -0500 Subject: rpms/libmp4v2/devel libmp4v2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702121910.l1CJAnml018876@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/libmp4v2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18698/devel Modified Files: .cvsignore sources Added Files: libmp4v2.spec Log Message: Initial import of libmp4v2. --- NEW FILE libmp4v2.spec --- Summary: Library for working with files using the mp4 container format Name: libmp4v2 Version: 1.5.0.1 Release: 3%{?dist} License: MPL Group: System Environment/Libraries URL: http://resare.com/libmp4v2/ Source0: http://resare.com/libmp4v2/dist/libmp4v2-%{version}.tar.bz2 # Only here to be in the source package, "just in case, and FYI" Source1: http://resare.com/libmp4v2/mklibmp4v2/mklibmp4v2-r51.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %description The libmp4v2 library provides an abstraction layer for working with files using the mp4 container format. This library is developed by mpeg4ip project and is an exact copy of the library distributed in the mpeg4ip package. %package devel Summary: Development files for the mp4v2 library Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel Development files and documentation needed to develop and compile programs using the libmp4v2 library. %prep %setup -q %build %configure \ --disable-static \ --disable-dependency-tracking %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} %{__make} install DESTDIR=%{buildroot} %{__rm} -rf %{buildroot}%{_mandir}/manm/ %clean %{__rm} -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,0755) %doc COPYING %{_bindir}/* %{_libdir}/*.so.* %files devel %defattr(-,root,root,0755) %doc README TODO INTERNALS API_CHANGES %{_includedir}/*.h %exclude %{_libdir}/*.la %{_libdir}/*.so %{_mandir}/man?/* %changelog * Fri Dec 15 2006 Matthias Saou 1.5.0.1-3 - Spec file cleanup (habits, mostly) preparing to submit for Extras inclusion. * Fri Oct 06 2006 Thorsten Leemhuis 1.5.0.1-2 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 * Tue Jul 18 2006 Noa Resare 1.5.0.1-1 - new upstream release * Sat May 13 2006 Noa Resare 1.4.1-3 - disabled static lib - use DESTDIR - disable-dependency-tracking for faster builds - removed a manpage template file apt.mpt.gz * Mon May 08 2006 Noa Resare 1.4.1-2 - specfile cleanups * Fri May 05 2006 Noa Resare 1.4.1-1.lvn5 - initial release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libmp4v2/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Feb 2007 17:39:29 -0000 1.1 +++ .cvsignore 12 Feb 2007 19:10:16 -0000 1.2 @@ -0,0 +1,2 @@ +libmp4v2-1.5.0.1.tar.bz2 +mklibmp4v2-r51.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libmp4v2/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Feb 2007 17:39:29 -0000 1.1 +++ sources 12 Feb 2007 19:10:16 -0000 1.2 @@ -0,0 +1,2 @@ +90eb2b0940ebe02ef81b7a60530beaee libmp4v2-1.5.0.1.tar.bz2 +4b4abb862b079a7e296c891d96faebc9 mklibmp4v2-r51.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 12 19:11:20 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 12 Feb 2007 14:11:20 -0500 Subject: rpms/spampd/devel spampd.init, NONE, 1.1 spampd.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702121911.l1CJBKYj018917@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/spampd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18799/devel Modified Files: .cvsignore sources Added Files: spampd.init spampd.spec Log Message: Initial import of spampd. --- NEW FILE spampd.init --- #!/bin/sh # # This script starts and stops the spampd daemon # # chkconfig: - 79 31 # # description: spampd uses SpamAssassin to check email messages for SPAM. # Source function library. . /etc/rc.d/init.d/functions # Source networking configuration. . /etc/sysconfig/network # Check that networking is up. [ "${NETWORKING}" = "no" ] && exit 0 prog="spampd" OPTIONS="--user=spampd --group=spampd --tagall --local-only" # Source an auxiliary options file if we have one, and pick up OPTIONS, if [ -r /etc/sysconfig/$prog ]; then . /etc/sysconfig/$prog fi RETVAL=0 start() { echo -n $"Starting $prog: " daemon $prog $OPTIONS RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog } stop() { echo -n $"Stopping $prog: " killproc $prog RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog } restart() { stop start } # See how we were called. case "$1" in start) start ;; stop) stop ;; restart) restart ;; condrestart) [ -f /var/lock/subsys/$prog ] && restart ;; status) status $prog ;; *) echo $"Usage: $0 {start|stop|restart|condrestart|status}" exit 1 esac exit $RETVAL --- NEW FILE spampd.spec --- Summary: Transparent SMTP/LMTP proxy filter using spamassassin Name: spampd Version: 2.30 Release: 3%{?dist} License: GPL Group: System Environment/Daemons URL: http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm Source0: http://www.worlddesign.com/Content/rd/mta/spampd/spampd-%{version}.tar.gz Source1: spampd.init BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires(post): /sbin/chkconfig Requires(preun): /sbin/service, /sbin/chkconfig Requires(postun): /sbin/service BuildArch: noarch %description Spampd is a program used within an e-mail delivery system to scan messages for possible Unsolicited Commercial E-mail (UCE, aka spam) content. It uses SpamAssassin (SA) to do the actual message scanning. Spampd acts as a transparent SMTP/LMTP proxy between two mail servers, and during the transaction it passes the mail through SA. If SA decides the mail could be spam, then spampd will ask SA to add some headers and a report to the message indicating it's spam and why. %prep %setup -q %{__rm} -f spampd.html %{__chmod} -x changelog.txt %build %{__make} spampd.8 %{__make} spampd.html %install %{__rm} -rf %{buildroot} # Main program %{__install} -D -p -m 0755 spampd \ %{buildroot}%{_sbindir}/spampd # Man page %{__install} -D -p -m 0644 spampd.8 \ %{buildroot}%{_mandir}/man8/spampd.8 # Init script %{__install} -D -p -m 0755 %{SOURCE1} \ %{buildroot}%{_sysconfdir}/rc.d/init.d/spampd # Home directory %{__mkdir_p} %{buildroot}/var/spool/spampd %clean %{__rm} -rf %{buildroot} %pre /usr/sbin/useradd -r -M -s /sbin/nologin -d /var/spool/spampd \ spampd &>/dev/null || : %post /sbin/chkconfig --add spampd %preun if [ $1 -eq 0 ]; then /sbin/service spampd stop &>/dev/null || : /sbin/chkconfig --del spampd fi %postun if [ $1 -ge 1 ]; then /sbin/service spampd condrestart &>/dev/null || : fi %files %defattr(-, root, root, 0755) %doc changelog.txt spampd.html %{_sysconfdir}/rc.d/init.d/spampd %{_sbindir}/spampd %{_mandir}/man8/spampd.8* %attr(0750, spampd, spampd) /var/spool/spampd/ %changelog * Mon Jan 29 2007 Matthias Saou 2.30-3 - Fix %%pre typo (/dev/nulll). - Silence %%setup. - Add scriplet chkconfig and service requirements. * Tue Nov 7 2006 Matthias Saou 2.30-2 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/spampd/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Feb 2007 17:45:37 -0000 1.1 +++ .cvsignore 12 Feb 2007 19:10:47 -0000 1.2 @@ -0,0 +1 @@ +spampd-2.30.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/spampd/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Feb 2007 17:45:37 -0000 1.1 +++ sources 12 Feb 2007 19:10:47 -0000 1.2 @@ -0,0 +1 @@ +742c6f2cb75db54e59d044a8ee40445f spampd-2.30.tar.gz From fedora-extras-commits at redhat.com Mon Feb 12 19:11:15 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 12 Feb 2007 14:11:15 -0500 Subject: rpms/spampd/FC-5 spampd.init, NONE, 1.1 spampd.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702121911.l1CJBFG6018909@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/spampd/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18799/FC-5 Modified Files: .cvsignore sources Added Files: spampd.init spampd.spec Log Message: Initial import of spampd. --- NEW FILE spampd.init --- #!/bin/sh # # This script starts and stops the spampd daemon # # chkconfig: - 79 31 # # description: spampd uses SpamAssassin to check email messages for SPAM. # Source function library. . /etc/rc.d/init.d/functions # Source networking configuration. . /etc/sysconfig/network # Check that networking is up. [ "${NETWORKING}" = "no" ] && exit 0 prog="spampd" OPTIONS="--user=spampd --group=spampd --tagall --local-only" # Source an auxiliary options file if we have one, and pick up OPTIONS, if [ -r /etc/sysconfig/$prog ]; then . /etc/sysconfig/$prog fi RETVAL=0 start() { echo -n $"Starting $prog: " daemon $prog $OPTIONS RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog } stop() { echo -n $"Stopping $prog: " killproc $prog RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog } restart() { stop start } # See how we were called. case "$1" in start) start ;; stop) stop ;; restart) restart ;; condrestart) [ -f /var/lock/subsys/$prog ] && restart ;; status) status $prog ;; *) echo $"Usage: $0 {start|stop|restart|condrestart|status}" exit 1 esac exit $RETVAL --- NEW FILE spampd.spec --- Summary: Transparent SMTP/LMTP proxy filter using spamassassin Name: spampd Version: 2.30 Release: 3%{?dist} License: GPL Group: System Environment/Daemons URL: http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm Source0: http://www.worlddesign.com/Content/rd/mta/spampd/spampd-%{version}.tar.gz Source1: spampd.init BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires(post): /sbin/chkconfig Requires(preun): /sbin/service, /sbin/chkconfig Requires(postun): /sbin/service BuildArch: noarch %description Spampd is a program used within an e-mail delivery system to scan messages for possible Unsolicited Commercial E-mail (UCE, aka spam) content. It uses SpamAssassin (SA) to do the actual message scanning. Spampd acts as a transparent SMTP/LMTP proxy between two mail servers, and during the transaction it passes the mail through SA. If SA decides the mail could be spam, then spampd will ask SA to add some headers and a report to the message indicating it's spam and why. %prep %setup -q %{__rm} -f spampd.html %{__chmod} -x changelog.txt %build %{__make} spampd.8 %{__make} spampd.html %install %{__rm} -rf %{buildroot} # Main program %{__install} -D -p -m 0755 spampd \ %{buildroot}%{_sbindir}/spampd # Man page %{__install} -D -p -m 0644 spampd.8 \ %{buildroot}%{_mandir}/man8/spampd.8 # Init script %{__install} -D -p -m 0755 %{SOURCE1} \ %{buildroot}%{_sysconfdir}/rc.d/init.d/spampd # Home directory %{__mkdir_p} %{buildroot}/var/spool/spampd %clean %{__rm} -rf %{buildroot} %pre /usr/sbin/useradd -r -M -s /sbin/nologin -d /var/spool/spampd \ spampd &>/dev/null || : %post /sbin/chkconfig --add spampd %preun if [ $1 -eq 0 ]; then /sbin/service spampd stop &>/dev/null || : /sbin/chkconfig --del spampd fi %postun if [ $1 -ge 1 ]; then /sbin/service spampd condrestart &>/dev/null || : fi %files %defattr(-, root, root, 0755) %doc changelog.txt spampd.html %{_sysconfdir}/rc.d/init.d/spampd %{_sbindir}/spampd %{_mandir}/man8/spampd.8* %attr(0750, spampd, spampd) /var/spool/spampd/ %changelog * Mon Jan 29 2007 Matthias Saou 2.30-3 - Fix %%pre typo (/dev/nulll). - Silence %%setup. - Add scriplet chkconfig and service requirements. * Tue Nov 7 2006 Matthias Saou 2.30-2 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/spampd/FC-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Feb 2007 17:45:37 -0000 1.1 +++ .cvsignore 12 Feb 2007 19:10:42 -0000 1.2 @@ -0,0 +1 @@ +spampd-2.30.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/spampd/FC-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Feb 2007 17:45:37 -0000 1.1 +++ sources 12 Feb 2007 19:10:42 -0000 1.2 @@ -0,0 +1 @@ +742c6f2cb75db54e59d044a8ee40445f spampd-2.30.tar.gz From fedora-extras-commits at redhat.com Mon Feb 12 19:11:17 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 12 Feb 2007 14:11:17 -0500 Subject: rpms/spampd/FC-6 spampd.init, NONE, 1.1 spampd.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702121911.l1CJBHT7018913@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/spampd/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18799/FC-6 Modified Files: .cvsignore sources Added Files: spampd.init spampd.spec Log Message: Initial import of spampd. --- NEW FILE spampd.init --- #!/bin/sh # # This script starts and stops the spampd daemon # # chkconfig: - 79 31 # # description: spampd uses SpamAssassin to check email messages for SPAM. # Source function library. . /etc/rc.d/init.d/functions # Source networking configuration. . /etc/sysconfig/network # Check that networking is up. [ "${NETWORKING}" = "no" ] && exit 0 prog="spampd" OPTIONS="--user=spampd --group=spampd --tagall --local-only" # Source an auxiliary options file if we have one, and pick up OPTIONS, if [ -r /etc/sysconfig/$prog ]; then . /etc/sysconfig/$prog fi RETVAL=0 start() { echo -n $"Starting $prog: " daemon $prog $OPTIONS RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog } stop() { echo -n $"Stopping $prog: " killproc $prog RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog } restart() { stop start } # See how we were called. case "$1" in start) start ;; stop) stop ;; restart) restart ;; condrestart) [ -f /var/lock/subsys/$prog ] && restart ;; status) status $prog ;; *) echo $"Usage: $0 {start|stop|restart|condrestart|status}" exit 1 esac exit $RETVAL --- NEW FILE spampd.spec --- Summary: Transparent SMTP/LMTP proxy filter using spamassassin Name: spampd Version: 2.30 Release: 3%{?dist} License: GPL Group: System Environment/Daemons URL: http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm Source0: http://www.worlddesign.com/Content/rd/mta/spampd/spampd-%{version}.tar.gz Source1: spampd.init BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires(post): /sbin/chkconfig Requires(preun): /sbin/service, /sbin/chkconfig Requires(postun): /sbin/service BuildArch: noarch %description Spampd is a program used within an e-mail delivery system to scan messages for possible Unsolicited Commercial E-mail (UCE, aka spam) content. It uses SpamAssassin (SA) to do the actual message scanning. Spampd acts as a transparent SMTP/LMTP proxy between two mail servers, and during the transaction it passes the mail through SA. If SA decides the mail could be spam, then spampd will ask SA to add some headers and a report to the message indicating it's spam and why. %prep %setup -q %{__rm} -f spampd.html %{__chmod} -x changelog.txt %build %{__make} spampd.8 %{__make} spampd.html %install %{__rm} -rf %{buildroot} # Main program %{__install} -D -p -m 0755 spampd \ %{buildroot}%{_sbindir}/spampd # Man page %{__install} -D -p -m 0644 spampd.8 \ %{buildroot}%{_mandir}/man8/spampd.8 # Init script %{__install} -D -p -m 0755 %{SOURCE1} \ %{buildroot}%{_sysconfdir}/rc.d/init.d/spampd # Home directory %{__mkdir_p} %{buildroot}/var/spool/spampd %clean %{__rm} -rf %{buildroot} %pre /usr/sbin/useradd -r -M -s /sbin/nologin -d /var/spool/spampd \ spampd &>/dev/null || : %post /sbin/chkconfig --add spampd %preun if [ $1 -eq 0 ]; then /sbin/service spampd stop &>/dev/null || : /sbin/chkconfig --del spampd fi %postun if [ $1 -ge 1 ]; then /sbin/service spampd condrestart &>/dev/null || : fi %files %defattr(-, root, root, 0755) %doc changelog.txt spampd.html %{_sysconfdir}/rc.d/init.d/spampd %{_sbindir}/spampd %{_mandir}/man8/spampd.8* %attr(0750, spampd, spampd) /var/spool/spampd/ %changelog * Mon Jan 29 2007 Matthias Saou 2.30-3 - Fix %%pre typo (/dev/nulll). - Silence %%setup. - Add scriplet chkconfig and service requirements. * Tue Nov 7 2006 Matthias Saou 2.30-2 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/spampd/FC-6/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Feb 2007 17:45:37 -0000 1.1 +++ .cvsignore 12 Feb 2007 19:10:45 -0000 1.2 @@ -0,0 +1 @@ +spampd-2.30.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/spampd/FC-6/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Feb 2007 17:45:37 -0000 1.1 +++ sources 12 Feb 2007 19:10:45 -0000 1.2 @@ -0,0 +1 @@ +742c6f2cb75db54e59d044a8ee40445f spampd-2.30.tar.gz From fedora-extras-commits at redhat.com Mon Feb 12 19:12:10 2007 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Mon, 12 Feb 2007 14:12:10 -0500 Subject: rpms/php-pear-Log/FC-5 .cvsignore, 1.3, 1.4 php-pear-Log.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200702121912.l1CJCAAY019025@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-Log/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18954 Modified Files: .cvsignore php-pear-Log.spec sources Log Message: update to new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-pear-Log/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Oct 2006 08:20:43 -0000 1.3 +++ .cvsignore 12 Feb 2007 19:11:38 -0000 1.4 @@ -1 +1 @@ -Log-1.9.9.tgz +Log-1.9.10.tgz Index: php-pear-Log.spec =================================================================== RCS file: /cvs/extras/rpms/php-pear-Log/FC-5/php-pear-Log.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- php-pear-Log.spec 28 Oct 2006 08:20:43 -0000 1.3 +++ php-pear-Log.spec 12 Feb 2007 19:11:38 -0000 1.4 @@ -4,7 +4,7 @@ Summary: Abstracted logging facility for PHP Summary(fr): Abstraction des outils d'enregistrement de traces pour PHP Name: php-pear-Log -Version: 1.9.9 +Version: 1.9.10 Release: 1%{?dist} License: PHP License Group: Development/Libraries @@ -43,8 +43,8 @@ %prep %setup -c -q -%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG -mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml +%{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG +mv package.xml %{pear_name}-%{version}/%{pear_name}.xml %{__install} -m 644 -c %{SOURCE1} LICENSE @@ -93,6 +93,10 @@ %{pear_xmldir}/%{pear_name}.xml %changelog +* Mon Feb 12 2007 Remi Collet 1.9.10-1 +- update to 1.9.10 +- All tests succeed with php-5.2.x : http://pear.php.net/bugs/bug.php?id=9023 + * Sat Oct 28 2006 Remi Collet 1.9.9-1 - update to 1.9.9 Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pear-Log/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Oct 2006 08:20:43 -0000 1.3 +++ sources 12 Feb 2007 19:11:38 -0000 1.4 @@ -1 +1 @@ -23f28e7fa803ddff7d68fec2850922d1 Log-1.9.9.tgz +ea725a7cc7868d0d81abe6f7bc7f2a95 Log-1.9.10.tgz From fedora-extras-commits at redhat.com Mon Feb 12 19:12:57 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 12 Feb 2007 14:12:57 -0500 Subject: rpms/bcfg2 pkg.acl,1.1,NONE Message-ID: <200702121912.l1CJCvSk019138@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/bcfg2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19131 Removed Files: pkg.acl Log Message: oops, bad run of import script --- pkg.acl DELETED --- From fedora-extras-commits at redhat.com Mon Feb 12 19:16:31 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 12 Feb 2007 14:16:31 -0500 Subject: rpms/postgrey pkg.acl,1.1,NONE Message-ID: <200702121916.l1CJGVY9019296@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/postgrey In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19281 Removed Files: pkg.acl Log Message: Initial import of postgrey. --- pkg.acl DELETED --- From fedora-extras-commits at redhat.com Mon Feb 12 19:17:04 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 12 Feb 2007 14:17:04 -0500 Subject: rpms/postgrey/FC-5 README-rpm, NONE, 1.1 postgrey-1.27-group.patch, NONE, 1.1 postgrey.init, NONE, 1.1 postgrey.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702121917.l1CJH4Ne019381@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/postgrey/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19281/FC-5 Modified Files: .cvsignore sources Added Files: README-rpm postgrey-1.27-group.patch postgrey.init postgrey.spec Log Message: Initial import of postgrey. --- NEW FILE README-rpm --- Edit your configuration files: /etc/postfix/main.cf: smtpd_recipient_restrictions = ... check_policy_service unix:postgrey/socket, ... Or if you like to use inet sockets (modify the IP if needed): /etc/sysconfig/postgrey: OPTIONS="--inet=127.0.0.1:10023" /etc/postfix/main.cf: smtpd_recipient_restrictions = ... check_policy_service inet:127.0.0.1:10023, ... postgrey-1.27-group.patch: --- NEW FILE postgrey-1.27-group.patch --- diff -Naupr postgrey-1.27.orig/postgrey postgrey-1.27/postgrey --- postgrey-1.27.orig/postgrey 2006-07-17 14:53:30.000000000 +0200 +++ postgrey-1.27/postgrey 2006-11-06 13:34:04.000000000 +0100 @@ -441,7 +441,7 @@ sub main() port => [ $opt{inet} ? $opt{inet} : $opt{unix}."|unix" ], proto => $opt{inet} ? 'tcp' : 'unix', user => $opt{user} || 'postgrey', - group => $opt{group} || 'nogroup', + group => $opt{group} || 'postgrey', dbdir => $opt{dbdir} || '/var/spool/postfix/postgrey', setsid => $opt{daemonize} ? 1 : undef, pid_file => $opt{daemonize} ? $opt{pidfile} : undef, @@ -623,7 +623,7 @@ B [I...] -d, --daemonize run in the background --pidfile=PATH put daemon pid into this file --user=USER run as USER (default: postgrey) - --group=GROUP run as group GROUP (default: nogroup) + --group=GROUP run as group GROUP (default: postgrey) --dbdir=PATH put db files in PATH (default: /var/spool/postfix/postgrey) --delay=N greylist for N seconds (default: 300) --max-age=N delete entries older than N days since the last time --- NEW FILE postgrey.init --- #!/bin/sh # # chkconfig: - 79 31 # description: Postfix Greylisting Policy Server # # processname: postgrey # # Source function library. . /etc/rc.d/init.d/functions # Source networking configuration. . /etc/sysconfig/network # Check that networking is up. [ ${NETWORKING} = "no" ] && exit 0 prog=postgrey postgrey=/usr/sbin/$prog DBPATH=/var/spool/postfix/postgrey SOCKET=$DBPATH/socket OPTIONS="--unix=$SOCKET" # Source an auxiliary options file if we have one, and pick up OPTIONS, if [ -r /etc/sysconfig/$prog ]; then . /etc/sysconfig/$prog fi [ -x $postgrey -a -d $DBPATH ] || exit 0 RETVAL=0 start() { echo -n $"Starting $prog: " daemon $postgrey -d $OPTIONS RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog } stop() { echo -n $"Stopping $prog: " killproc $postgrey RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog } restart() { stop start } reload() { echo -n $"Reloading $prog: " killproc $postgrey -HUP RETVAL=$? echo } # See how we were called. case "$1" in start) start ;; stop) stop ;; restart) restart ;; reload) reload ;; condrestart) [ -f /var/lock/subsys/$prog ] && restart ;; status) status $postgrey ;; *) echo $"Usage: $0 {start|stop|restart|condrestart|reload|status}" exit 1 esac exit $RETVAL --- NEW FILE postgrey.spec --- %define confdir %{_sysconfdir}/postfix Summary: Postfix Greylisting Policy Server Name: postgrey Version: 1.27 Release: 4%{?dist} License: GPL Group: System Environment/Daemons Source0: http://isg.ee.ethz.ch/tools/postgrey/pub/postgrey-%{version}.tar.gz Source1: postgrey.init Source2: README-rpm Patch0: postgrey-1.27-group.patch URL: http://isg.ee.ethz.ch/tools/postgrey/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root # We require postfix for its directories and gid Requires: postfix Requires(pre): /usr/sbin/useradd Requires(post): /sbin/chkconfig Requires(preun): /sbin/service, /sbin/chkconfig Requires(postun): /sbin/service BuildArch: noarch %description Postgrey is a Postfix policy server implementing greylisting. When a request for delivery of a mail is received by Postfix via SMTP, the triplet CLIENT_IP / SENDER / RECIPIENT is built. If it is the first time that this triplet is seen, or if the triplet was first seen less than 5 minutes, then the mail gets rejected with a temporary error. Hopefully spammers or viruses will not try again later, as it is however required per RFC. %prep %setup -q %patch0 -p1 -b .group %{__install} -p -m 0644 %{SOURCE2} README-rpm %build # We only have perl scripts, so just "build" the man page pod2man \ --center="Postgrey Policy Server for Postfix" \ --section="8" \ postgrey > postgrey.8 %install %{__rm} -rf %{buildroot} # Configuration files %{__mkdir_p} %{buildroot}%{confdir} %{__install} -p -m 0644 postgrey_whitelist_{clients,recipients} \ %{buildroot}%{confdir}/ # Local whitelist file echo "# Clients that should not be greylisted. See postgrey(8)." \ > %{buildroot}%{confdir}/postgrey_whitelist_clients.local # Main script %{__install} -D -p -m 0755 postgrey %{buildroot}%{_sbindir}/postgrey # Spool directory %{__mkdir_p} %{buildroot}%{_var}/spool/postfix/postgrey # Init script %{__install} -D -p -m 0755 %{SOURCE1} \ %{buildroot}%{_sysconfdir}/rc.d/init.d/postgrey # Man page %{__install} -D -p -m 0644 postgrey.8 \ %{buildroot}%{_mandir}/man8/postgrey.8 # Optional report script %{__install} -D -p -m 0755 contrib/postgreyreport \ %{buildroot}%{_sbindir}/postgreyreport %clean %{__rm} -rf %{buildroot} %pre /usr/sbin/useradd -d %{_var}/spool/postfix/postgrey -s /sbin/nologin \ -M -r postgrey &>/dev/null || : %post /sbin/chkconfig --add postgrey %preun if [ $1 -eq 0 ]; then /sbin/service postgrey stop &>/dev/null || : /sbin/chkconfig --del postgrey fi %postun if [ $1 -ge 1 ]; then /sbin/service postgrey condrestart &>/dev/null || : fi %files %defattr(-, root, root, 0755) %doc Changes COPYING README README-rpm %{_sysconfdir}/rc.d/init.d/postgrey %config(noreplace) %{confdir}/postgrey_whitelist_clients %config(noreplace) %{confdir}/postgrey_whitelist_recipients %config(noreplace) %{confdir}/postgrey_whitelist_clients.local %{_sbindir}/postgrey %{_sbindir}/postgreyreport %{_mandir}/man8/postgrey.8* %dir %attr(0751, postgrey, postfix) %{_var}/spool/postfix/postgrey/ %changelog * Mon Feb 12 2007 Matthias Saou 1.27-4 - Silence %%setup. - Fix init script mode in the srpm. - Remove explicit perl(IO::Multiplex) requirement, not needed on FC6 (but probably still on RHEL4). - Add a comment line to the empty local whitelist file. * Mon Dec 4 2006 Matthias Saou 1.27-3 - Add man page generation (Mike Wohlgemuth). * Fri Dec 1 2006 Matthias Saou 1.27-2 - Include postgreyreport script. * Mon Nov 6 2006 Matthias Saou 1.27-1 - Spec file cleanup. * Wed Jan 18 2006 Levente Farkas 1.24 - some minor changes thanks to Peter Bieringer * Mon Jan 16 2006 Levente Farkas 1.24 - upgrade to 1.24 * Sun Nov 13 2005 Levente Farkas 1.22 - upgrade to 1.22 * Mon Aug 22 2005 Levente Farkas 1.21 - spec file update from Luigi Iotti * Thu Apr 28 2005 Levente Farkas 1.21 - update to 1.21 * Tue Mar 8 2005 Levente Farkas 1.18 - update to 1.18 * Tue Dec 14 2004 Levente Farkas 1.17 - update to 1.17 * Wed Jul 14 2004 Levente Farkas 1.14 - guard the pre and post scripts * Wed Jul 7 2004 Levente Farkas 1.13 - initial release 1.13 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/postgrey/FC-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Feb 2007 19:09:04 -0000 1.1 +++ .cvsignore 12 Feb 2007 19:16:31 -0000 1.2 @@ -0,0 +1 @@ +postgrey-1.27.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/postgrey/FC-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Feb 2007 19:09:04 -0000 1.1 +++ sources 12 Feb 2007 19:16:31 -0000 1.2 @@ -0,0 +1 @@ +df3a8b4a0c6ab7e8e5bb5be0de096c47 postgrey-1.27.tar.gz From fedora-extras-commits at redhat.com Mon Feb 12 19:17:06 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 12 Feb 2007 14:17:06 -0500 Subject: rpms/postgrey/FC-6 README-rpm, NONE, 1.1 postgrey-1.27-group.patch, NONE, 1.1 postgrey.init, NONE, 1.1 postgrey.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702121917.l1CJH65e019385@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/postgrey/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19281/FC-6 Modified Files: .cvsignore sources Added Files: README-rpm postgrey-1.27-group.patch postgrey.init postgrey.spec Log Message: Initial import of postgrey. --- NEW FILE README-rpm --- Edit your configuration files: /etc/postfix/main.cf: smtpd_recipient_restrictions = ... check_policy_service unix:postgrey/socket, ... Or if you like to use inet sockets (modify the IP if needed): /etc/sysconfig/postgrey: OPTIONS="--inet=127.0.0.1:10023" /etc/postfix/main.cf: smtpd_recipient_restrictions = ... check_policy_service inet:127.0.0.1:10023, ... postgrey-1.27-group.patch: --- NEW FILE postgrey-1.27-group.patch --- diff -Naupr postgrey-1.27.orig/postgrey postgrey-1.27/postgrey --- postgrey-1.27.orig/postgrey 2006-07-17 14:53:30.000000000 +0200 +++ postgrey-1.27/postgrey 2006-11-06 13:34:04.000000000 +0100 @@ -441,7 +441,7 @@ sub main() port => [ $opt{inet} ? $opt{inet} : $opt{unix}."|unix" ], proto => $opt{inet} ? 'tcp' : 'unix', user => $opt{user} || 'postgrey', - group => $opt{group} || 'nogroup', + group => $opt{group} || 'postgrey', dbdir => $opt{dbdir} || '/var/spool/postfix/postgrey', setsid => $opt{daemonize} ? 1 : undef, pid_file => $opt{daemonize} ? $opt{pidfile} : undef, @@ -623,7 +623,7 @@ B [I...] -d, --daemonize run in the background --pidfile=PATH put daemon pid into this file --user=USER run as USER (default: postgrey) - --group=GROUP run as group GROUP (default: nogroup) + --group=GROUP run as group GROUP (default: postgrey) --dbdir=PATH put db files in PATH (default: /var/spool/postfix/postgrey) --delay=N greylist for N seconds (default: 300) --max-age=N delete entries older than N days since the last time --- NEW FILE postgrey.init --- #!/bin/sh # # chkconfig: - 79 31 # description: Postfix Greylisting Policy Server # # processname: postgrey # # Source function library. . /etc/rc.d/init.d/functions # Source networking configuration. . /etc/sysconfig/network # Check that networking is up. [ ${NETWORKING} = "no" ] && exit 0 prog=postgrey postgrey=/usr/sbin/$prog DBPATH=/var/spool/postfix/postgrey SOCKET=$DBPATH/socket OPTIONS="--unix=$SOCKET" # Source an auxiliary options file if we have one, and pick up OPTIONS, if [ -r /etc/sysconfig/$prog ]; then . /etc/sysconfig/$prog fi [ -x $postgrey -a -d $DBPATH ] || exit 0 RETVAL=0 start() { echo -n $"Starting $prog: " daemon $postgrey -d $OPTIONS RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog } stop() { echo -n $"Stopping $prog: " killproc $postgrey RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog } restart() { stop start } reload() { echo -n $"Reloading $prog: " killproc $postgrey -HUP RETVAL=$? echo } # See how we were called. case "$1" in start) start ;; stop) stop ;; restart) restart ;; reload) reload ;; condrestart) [ -f /var/lock/subsys/$prog ] && restart ;; status) status $postgrey ;; *) echo $"Usage: $0 {start|stop|restart|condrestart|reload|status}" exit 1 esac exit $RETVAL --- NEW FILE postgrey.spec --- %define confdir %{_sysconfdir}/postfix Summary: Postfix Greylisting Policy Server Name: postgrey Version: 1.27 Release: 4%{?dist} License: GPL Group: System Environment/Daemons Source0: http://isg.ee.ethz.ch/tools/postgrey/pub/postgrey-%{version}.tar.gz Source1: postgrey.init Source2: README-rpm Patch0: postgrey-1.27-group.patch URL: http://isg.ee.ethz.ch/tools/postgrey/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root # We require postfix for its directories and gid Requires: postfix Requires(pre): /usr/sbin/useradd Requires(post): /sbin/chkconfig Requires(preun): /sbin/service, /sbin/chkconfig Requires(postun): /sbin/service BuildArch: noarch %description Postgrey is a Postfix policy server implementing greylisting. When a request for delivery of a mail is received by Postfix via SMTP, the triplet CLIENT_IP / SENDER / RECIPIENT is built. If it is the first time that this triplet is seen, or if the triplet was first seen less than 5 minutes, then the mail gets rejected with a temporary error. Hopefully spammers or viruses will not try again later, as it is however required per RFC. %prep %setup -q %patch0 -p1 -b .group %{__install} -p -m 0644 %{SOURCE2} README-rpm %build # We only have perl scripts, so just "build" the man page pod2man \ --center="Postgrey Policy Server for Postfix" \ --section="8" \ postgrey > postgrey.8 %install %{__rm} -rf %{buildroot} # Configuration files %{__mkdir_p} %{buildroot}%{confdir} %{__install} -p -m 0644 postgrey_whitelist_{clients,recipients} \ %{buildroot}%{confdir}/ # Local whitelist file echo "# Clients that should not be greylisted. See postgrey(8)." \ > %{buildroot}%{confdir}/postgrey_whitelist_clients.local # Main script %{__install} -D -p -m 0755 postgrey %{buildroot}%{_sbindir}/postgrey # Spool directory %{__mkdir_p} %{buildroot}%{_var}/spool/postfix/postgrey # Init script %{__install} -D -p -m 0755 %{SOURCE1} \ %{buildroot}%{_sysconfdir}/rc.d/init.d/postgrey # Man page %{__install} -D -p -m 0644 postgrey.8 \ %{buildroot}%{_mandir}/man8/postgrey.8 # Optional report script %{__install} -D -p -m 0755 contrib/postgreyreport \ %{buildroot}%{_sbindir}/postgreyreport %clean %{__rm} -rf %{buildroot} %pre /usr/sbin/useradd -d %{_var}/spool/postfix/postgrey -s /sbin/nologin \ -M -r postgrey &>/dev/null || : %post /sbin/chkconfig --add postgrey %preun if [ $1 -eq 0 ]; then /sbin/service postgrey stop &>/dev/null || : /sbin/chkconfig --del postgrey fi %postun if [ $1 -ge 1 ]; then /sbin/service postgrey condrestart &>/dev/null || : fi %files %defattr(-, root, root, 0755) %doc Changes COPYING README README-rpm %{_sysconfdir}/rc.d/init.d/postgrey %config(noreplace) %{confdir}/postgrey_whitelist_clients %config(noreplace) %{confdir}/postgrey_whitelist_recipients %config(noreplace) %{confdir}/postgrey_whitelist_clients.local %{_sbindir}/postgrey %{_sbindir}/postgreyreport %{_mandir}/man8/postgrey.8* %dir %attr(0751, postgrey, postfix) %{_var}/spool/postfix/postgrey/ %changelog * Mon Feb 12 2007 Matthias Saou 1.27-4 - Silence %%setup. - Fix init script mode in the srpm. - Remove explicit perl(IO::Multiplex) requirement, not needed on FC6 (but probably still on RHEL4). - Add a comment line to the empty local whitelist file. * Mon Dec 4 2006 Matthias Saou 1.27-3 - Add man page generation (Mike Wohlgemuth). * Fri Dec 1 2006 Matthias Saou 1.27-2 - Include postgreyreport script. * Mon Nov 6 2006 Matthias Saou 1.27-1 - Spec file cleanup. * Wed Jan 18 2006 Levente Farkas 1.24 - some minor changes thanks to Peter Bieringer * Mon Jan 16 2006 Levente Farkas 1.24 - upgrade to 1.24 * Sun Nov 13 2005 Levente Farkas 1.22 - upgrade to 1.22 * Mon Aug 22 2005 Levente Farkas 1.21 - spec file update from Luigi Iotti * Thu Apr 28 2005 Levente Farkas 1.21 - update to 1.21 * Tue Mar 8 2005 Levente Farkas 1.18 - update to 1.18 * Tue Dec 14 2004 Levente Farkas 1.17 - update to 1.17 * Wed Jul 14 2004 Levente Farkas 1.14 - guard the pre and post scripts * Wed Jul 7 2004 Levente Farkas 1.13 - initial release 1.13 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/postgrey/FC-6/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Feb 2007 19:09:04 -0000 1.1 +++ .cvsignore 12 Feb 2007 19:16:34 -0000 1.2 @@ -0,0 +1 @@ +postgrey-1.27.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/postgrey/FC-6/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Feb 2007 19:09:04 -0000 1.1 +++ sources 12 Feb 2007 19:16:34 -0000 1.2 @@ -0,0 +1 @@ +df3a8b4a0c6ab7e8e5bb5be0de096c47 postgrey-1.27.tar.gz From fedora-extras-commits at redhat.com Mon Feb 12 19:17:08 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 12 Feb 2007 14:17:08 -0500 Subject: rpms/postgrey/devel README-rpm, NONE, 1.1 postgrey-1.27-group.patch, NONE, 1.1 postgrey.init, NONE, 1.1 postgrey.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702121917.l1CJH8o1019389@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/postgrey/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19281/devel Modified Files: .cvsignore sources Added Files: README-rpm postgrey-1.27-group.patch postgrey.init postgrey.spec Log Message: Initial import of postgrey. --- NEW FILE README-rpm --- Edit your configuration files: /etc/postfix/main.cf: smtpd_recipient_restrictions = ... check_policy_service unix:postgrey/socket, ... Or if you like to use inet sockets (modify the IP if needed): /etc/sysconfig/postgrey: OPTIONS="--inet=127.0.0.1:10023" /etc/postfix/main.cf: smtpd_recipient_restrictions = ... check_policy_service inet:127.0.0.1:10023, ... postgrey-1.27-group.patch: --- NEW FILE postgrey-1.27-group.patch --- diff -Naupr postgrey-1.27.orig/postgrey postgrey-1.27/postgrey --- postgrey-1.27.orig/postgrey 2006-07-17 14:53:30.000000000 +0200 +++ postgrey-1.27/postgrey 2006-11-06 13:34:04.000000000 +0100 @@ -441,7 +441,7 @@ sub main() port => [ $opt{inet} ? $opt{inet} : $opt{unix}."|unix" ], proto => $opt{inet} ? 'tcp' : 'unix', user => $opt{user} || 'postgrey', - group => $opt{group} || 'nogroup', + group => $opt{group} || 'postgrey', dbdir => $opt{dbdir} || '/var/spool/postfix/postgrey', setsid => $opt{daemonize} ? 1 : undef, pid_file => $opt{daemonize} ? $opt{pidfile} : undef, @@ -623,7 +623,7 @@ B [I...] -d, --daemonize run in the background --pidfile=PATH put daemon pid into this file --user=USER run as USER (default: postgrey) - --group=GROUP run as group GROUP (default: nogroup) + --group=GROUP run as group GROUP (default: postgrey) --dbdir=PATH put db files in PATH (default: /var/spool/postfix/postgrey) --delay=N greylist for N seconds (default: 300) --max-age=N delete entries older than N days since the last time --- NEW FILE postgrey.init --- #!/bin/sh # # chkconfig: - 79 31 # description: Postfix Greylisting Policy Server # # processname: postgrey # # Source function library. . /etc/rc.d/init.d/functions # Source networking configuration. . /etc/sysconfig/network # Check that networking is up. [ ${NETWORKING} = "no" ] && exit 0 prog=postgrey postgrey=/usr/sbin/$prog DBPATH=/var/spool/postfix/postgrey SOCKET=$DBPATH/socket OPTIONS="--unix=$SOCKET" # Source an auxiliary options file if we have one, and pick up OPTIONS, if [ -r /etc/sysconfig/$prog ]; then . /etc/sysconfig/$prog fi [ -x $postgrey -a -d $DBPATH ] || exit 0 RETVAL=0 start() { echo -n $"Starting $prog: " daemon $postgrey -d $OPTIONS RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog } stop() { echo -n $"Stopping $prog: " killproc $postgrey RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog } restart() { stop start } reload() { echo -n $"Reloading $prog: " killproc $postgrey -HUP RETVAL=$? echo } # See how we were called. case "$1" in start) start ;; stop) stop ;; restart) restart ;; reload) reload ;; condrestart) [ -f /var/lock/subsys/$prog ] && restart ;; status) status $postgrey ;; *) echo $"Usage: $0 {start|stop|restart|condrestart|reload|status}" exit 1 esac exit $RETVAL --- NEW FILE postgrey.spec --- %define confdir %{_sysconfdir}/postfix Summary: Postfix Greylisting Policy Server Name: postgrey Version: 1.27 Release: 4%{?dist} License: GPL Group: System Environment/Daemons Source0: http://isg.ee.ethz.ch/tools/postgrey/pub/postgrey-%{version}.tar.gz Source1: postgrey.init Source2: README-rpm Patch0: postgrey-1.27-group.patch URL: http://isg.ee.ethz.ch/tools/postgrey/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root # We require postfix for its directories and gid Requires: postfix Requires(pre): /usr/sbin/useradd Requires(post): /sbin/chkconfig Requires(preun): /sbin/service, /sbin/chkconfig Requires(postun): /sbin/service BuildArch: noarch %description Postgrey is a Postfix policy server implementing greylisting. When a request for delivery of a mail is received by Postfix via SMTP, the triplet CLIENT_IP / SENDER / RECIPIENT is built. If it is the first time that this triplet is seen, or if the triplet was first seen less than 5 minutes, then the mail gets rejected with a temporary error. Hopefully spammers or viruses will not try again later, as it is however required per RFC. %prep %setup -q %patch0 -p1 -b .group %{__install} -p -m 0644 %{SOURCE2} README-rpm %build # We only have perl scripts, so just "build" the man page pod2man \ --center="Postgrey Policy Server for Postfix" \ --section="8" \ postgrey > postgrey.8 %install %{__rm} -rf %{buildroot} # Configuration files %{__mkdir_p} %{buildroot}%{confdir} %{__install} -p -m 0644 postgrey_whitelist_{clients,recipients} \ %{buildroot}%{confdir}/ # Local whitelist file echo "# Clients that should not be greylisted. See postgrey(8)." \ > %{buildroot}%{confdir}/postgrey_whitelist_clients.local # Main script %{__install} -D -p -m 0755 postgrey %{buildroot}%{_sbindir}/postgrey # Spool directory %{__mkdir_p} %{buildroot}%{_var}/spool/postfix/postgrey # Init script %{__install} -D -p -m 0755 %{SOURCE1} \ %{buildroot}%{_sysconfdir}/rc.d/init.d/postgrey # Man page %{__install} -D -p -m 0644 postgrey.8 \ %{buildroot}%{_mandir}/man8/postgrey.8 # Optional report script %{__install} -D -p -m 0755 contrib/postgreyreport \ %{buildroot}%{_sbindir}/postgreyreport %clean %{__rm} -rf %{buildroot} %pre /usr/sbin/useradd -d %{_var}/spool/postfix/postgrey -s /sbin/nologin \ -M -r postgrey &>/dev/null || : %post /sbin/chkconfig --add postgrey %preun if [ $1 -eq 0 ]; then /sbin/service postgrey stop &>/dev/null || : /sbin/chkconfig --del postgrey fi %postun if [ $1 -ge 1 ]; then /sbin/service postgrey condrestart &>/dev/null || : fi %files %defattr(-, root, root, 0755) %doc Changes COPYING README README-rpm %{_sysconfdir}/rc.d/init.d/postgrey %config(noreplace) %{confdir}/postgrey_whitelist_clients %config(noreplace) %{confdir}/postgrey_whitelist_recipients %config(noreplace) %{confdir}/postgrey_whitelist_clients.local %{_sbindir}/postgrey %{_sbindir}/postgreyreport %{_mandir}/man8/postgrey.8* %dir %attr(0751, postgrey, postfix) %{_var}/spool/postfix/postgrey/ %changelog * Mon Feb 12 2007 Matthias Saou 1.27-4 - Silence %%setup. - Fix init script mode in the srpm. - Remove explicit perl(IO::Multiplex) requirement, not needed on FC6 (but probably still on RHEL4). - Add a comment line to the empty local whitelist file. * Mon Dec 4 2006 Matthias Saou 1.27-3 - Add man page generation (Mike Wohlgemuth). * Fri Dec 1 2006 Matthias Saou 1.27-2 - Include postgreyreport script. * Mon Nov 6 2006 Matthias Saou 1.27-1 - Spec file cleanup. * Wed Jan 18 2006 Levente Farkas 1.24 - some minor changes thanks to Peter Bieringer * Mon Jan 16 2006 Levente Farkas 1.24 - upgrade to 1.24 * Sun Nov 13 2005 Levente Farkas 1.22 - upgrade to 1.22 * Mon Aug 22 2005 Levente Farkas 1.21 - spec file update from Luigi Iotti * Thu Apr 28 2005 Levente Farkas 1.21 - update to 1.21 * Tue Mar 8 2005 Levente Farkas 1.18 - update to 1.18 * Tue Dec 14 2004 Levente Farkas 1.17 - update to 1.17 * Wed Jul 14 2004 Levente Farkas 1.14 - guard the pre and post scripts * Wed Jul 7 2004 Levente Farkas 1.13 - initial release 1.13 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/postgrey/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Feb 2007 19:09:04 -0000 1.1 +++ .cvsignore 12 Feb 2007 19:16:36 -0000 1.2 @@ -0,0 +1 @@ +postgrey-1.27.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/postgrey/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Feb 2007 19:09:04 -0000 1.1 +++ sources 12 Feb 2007 19:16:36 -0000 1.2 @@ -0,0 +1 @@ +df3a8b4a0c6ab7e8e5bb5be0de096c47 postgrey-1.27.tar.gz From fedora-extras-commits at redhat.com Mon Feb 12 19:19:01 2007 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Mon, 12 Feb 2007 14:19:01 -0500 Subject: rpms/perl-Proc-Daemon/devel .cvsignore,1.1,1.2 sources,1.1,1.2 Message-ID: <200702121919.l1CJJ123019490@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/perl-Proc-Daemon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19463 Modified Files: .cvsignore sources Log Message: initial upload Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Proc-Daemon/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Feb 2007 19:04:16 -0000 1.1 +++ .cvsignore 12 Feb 2007 19:18:29 -0000 1.2 @@ -0,0 +1 @@ +Proc-Daemon-0.03.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Proc-Daemon/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Feb 2007 19:04:16 -0000 1.1 +++ sources 12 Feb 2007 19:18:29 -0000 1.2 @@ -0,0 +1 @@ +6e1b83ac0f0add22f63597733f38c973 Proc-Daemon-0.03.tar.gz From fedora-extras-commits at redhat.com Mon Feb 12 19:20:07 2007 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Mon, 12 Feb 2007 14:20:07 -0500 Subject: rpms/perl-Proc-Daemon/devel perl-Proc-Daemon.spec,NONE,1.1 Message-ID: <200702121920.l1CJK7oc019548@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/perl-Proc-Daemon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19540 Added Files: perl-Proc-Daemon.spec Log Message: missing spec file --- NEW FILE perl-Proc-Daemon.spec --- %define perlname Proc-Daemon Name: perl-Proc-Daemon Version: 0.03 Release: 1%{?dist} Summary: Run Perl program as a daemon process Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Proc-Daemon/ Source: http://search.cpan.org/CPAN/authors/id/E/EH/EHOOD/%{perlname}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This is version %{version} of Proc::Daemon This module contains the routine Init which can be called by a Perl program to initialize itself as a daemon. A daemon is a process that runs in the background with no controlling terminal. Generally servers (like FTP and HTTP servers) run as daemon processes. %prep %setup -q -n %{perlname}-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' -print find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' -print chmod -R u+rwX,go+rX,go-w %{buildroot}/* %clean rm -rf %{buildroot} %check make test %files %defattr(-, root, root, -) %doc Changes README %{_mandir}/man3/Proc* %{perl_vendorlib}/Proc %changelog * Sun Feb 11 2006 Remi Collet 0.03-1 - initial spec for Extras From fedora-extras-commits at redhat.com Mon Feb 12 19:22:21 2007 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Mon, 12 Feb 2007 14:22:21 -0500 Subject: rpms/deltarpm/devel deltarpm.spec,1.3,1.4 Message-ID: <200702121922.l1CJMLqn019777@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/extras/rpms/deltarpm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19701 Modified Files: deltarpm.spec Log Message: * Mon Feb 12 2007 Adam Jackson 3.3-7 - Add RPM_OPT_FLAGS to make line. (#227380) Index: deltarpm.spec =================================================================== RCS file: /cvs/extras/rpms/deltarpm/devel/deltarpm.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- deltarpm.spec 5 Feb 2007 15:13:10 -0000 1.3 +++ deltarpm.spec 12 Feb 2007 19:21:48 -0000 1.4 @@ -1,7 +1,7 @@ Summary: Create deltas between rpms Name: deltarpm Version: 3.3 -Release: 6%{?dist} +Release: 7%{?dist} License: BSD Group: System Environment/Base URL: http://www.novell.com/products/linuxpackages/professional/deltarpm.html @@ -25,7 +25,8 @@ %patch -p0 -b .rpmdumpheader %build -%{__make} %{?_smp_mflags} bindir=%{_bindir} mandir=%{_mandir} prefix=%{_prefix} +%{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ + bindir=%{_bindir} mandir=%{_mandir} prefix=%{_prefix} %install %{__rm} -rf %{buildroot} @@ -47,6 +48,9 @@ %{_bindir}/rpmdumpheader %changelog +* Mon Feb 12 2007 Adam Jackson 3.3-7 +- Add RPM_OPT_FLAGS to make line. (#227380) + * Mon Feb 05 2007 Adam Jackson 3.3-6 - Fix rpm db corruption in rpmdumpheader. (#227326) From fedora-extras-commits at redhat.com Mon Feb 12 19:23:13 2007 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Mon, 12 Feb 2007 14:23:13 -0500 Subject: rpms/perl-Proc-Daemon/devel perl-Proc-Daemon.spec,1.1,1.2 Message-ID: <200702121923.l1CJNDLW019841@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/perl-Proc-Daemon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19815 Modified Files: perl-Proc-Daemon.spec Log Message: bump release Index: perl-Proc-Daemon.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Proc-Daemon/devel/perl-Proc-Daemon.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Proc-Daemon.spec 12 Feb 2007 19:20:05 -0000 1.1 +++ perl-Proc-Daemon.spec 12 Feb 2007 19:22:41 -0000 1.2 @@ -2,7 +2,7 @@ Name: perl-Proc-Daemon Version: 0.03 -Release: 1%{?dist} +Release: 1%{?dist}.1 Summary: Run Perl program as a daemon process Group: Development/Libraries From fedora-extras-commits at redhat.com Mon Feb 12 19:27:04 2007 From: fedora-extras-commits at redhat.com (Ian Burrell (iburrell)) Date: Mon, 12 Feb 2007 14:27:04 -0500 Subject: rpms/perl-App-CLI import.log,1.1,1.2 Message-ID: <200702121927.l1CJR4E1020149@cvs-int.fedora.redhat.com> Author: iburrell Update of /cvs/extras/rpms/perl-App-CLI In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20111 Modified Files: import.log Log Message: auto-import perl-App-CLI-0.07-2 on branch devel from perl-App-CLI-0.07-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-App-CLI/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 12 Feb 2007 18:53:45 -0000 1.1 +++ import.log 12 Feb 2007 19:26:32 -0000 1.2 @@ -0,0 +1 @@ +perl-App-CLI-0_07-2:HEAD:perl-App-CLI-0.07-2.src.rpm:1171308389 From fedora-extras-commits at redhat.com Mon Feb 12 19:27:07 2007 From: fedora-extras-commits at redhat.com (Ian Burrell (iburrell)) Date: Mon, 12 Feb 2007 14:27:07 -0500 Subject: rpms/perl-App-CLI/devel perl-App-CLI.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702121927.l1CJR7n2020161@cvs-int.fedora.redhat.com> Author: iburrell Update of /cvs/extras/rpms/perl-App-CLI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20111/devel Modified Files: .cvsignore sources Added Files: perl-App-CLI.spec Log Message: auto-import perl-App-CLI-0.07-2 on branch devel from perl-App-CLI-0.07-2.src.rpm --- NEW FILE perl-App-CLI.spec --- Name: perl-App-CLI Version: 0.07 Release: 2%{?dist} Summary: Dispatcher module for command line interface programs License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/App-CLI/ Source0: http://www.cpan.org/modules/by-module/App/App-CLI-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Locale::Maketext::Simple) BuildRequires: perl(Pod::Simple::Text) Requires: perl(Pod::Simple::Text) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description App::CLI dispatches CLI (command line interface) based commands into command classes. It also supports subcommand and per-command options. %prep %setup -q -n App-CLI-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Tue Jan 30 2007 Ian M. Burrell - 0.07-2 - Remove explicit requires * Mon Jan 29 2007 Ian Burrell 0.07-1 - Specfile autogenerated by cpanspec 1.69.1. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-App-CLI/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Feb 2007 18:53:52 -0000 1.1 +++ .cvsignore 12 Feb 2007 19:26:34 -0000 1.2 @@ -0,0 +1 @@ +App-CLI-0.07.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-App-CLI/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Feb 2007 18:53:52 -0000 1.1 +++ sources 12 Feb 2007 19:26:34 -0000 1.2 @@ -0,0 +1 @@ +8981b0628874bb7e83b00b00e58a7259 App-CLI-0.07.tar.gz From fedora-extras-commits at redhat.com Mon Feb 12 19:27:53 2007 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 12 Feb 2007 14:27:53 -0500 Subject: rpms/akode/FC-6 akode-pulseaudio.patch,NONE,1.1 akode.spec,1.5,1.6 Message-ID: <200702121927.l1CJRrfa020275@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/akode/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20200 Modified Files: akode.spec Added Files: akode-pulseaudio.patch Log Message: * Mon Feb 12 2007 Rex Dieter 2.0.1-5 - enable pulseaudio support - Requires: akode-pulseaudio (fc7+) * Thu Dec 14 2006 Rex Dieter 2.0.1-4 - enable jack support (subpkg) - package (GPL'd) libsamplerate-based resampler separately, to keep main pkg LGPL-clean akode-pulseaudio.patch: --- NEW FILE akode-pulseaudio.patch --- diff -urN akode-2.0.1.orig/Makefile.in akode-2.0.1/Makefile.in --- akode-2.0.1.orig/Makefile.in 2006-07-23 00:17:11.000000000 +0200 +++ akode-2.0.1/Makefile.in 2006-09-06 14:38:04.000000000 +0200 @@ -169,9 +169,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -POLYP_CFLAGS = @POLYP_CFLAGS@ -POLYP_LDFLAGS = @POLYP_LDFLAGS@ -POLYP_LIBADD = @POLYP_LIBADD@ +PULSE_CFLAGS = @PULSE_CFLAGS@ +PULSE_LDFLAGS = @PULSE_LDFLAGS@ +PULSE_LIBADD = @PULSE_LIBADD@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff -urN akode-2.0.1.orig/akode/Makefile.in akode-2.0.1/akode/Makefile.in --- akode-2.0.1.orig/akode/Makefile.in 2006-07-23 00:17:11.000000000 +0200 +++ akode-2.0.1/akode/Makefile.in 2006-09-06 14:38:04.000000000 +0200 @@ -158,9 +158,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -POLYP_CFLAGS = @POLYP_CFLAGS@ -POLYP_LDFLAGS = @POLYP_LDFLAGS@ -POLYP_LIBADD = @POLYP_LIBADD@ +PULSE_CFLAGS = @PULSE_CFLAGS@ +PULSE_LDFLAGS = @PULSE_LDFLAGS@ +PULSE_LIBADD = @PULSE_LIBADD@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff -urN akode-2.0.1.orig/akode/akodeplay/Makefile.in akode-2.0.1/akode/akodeplay/Makefile.in --- akode-2.0.1.orig/akode/akodeplay/Makefile.in 2006-07-23 00:17:11.000000000 +0200 +++ akode-2.0.1/akode/akodeplay/Makefile.in 2006-09-06 14:38:04.000000000 +0200 @@ -170,9 +170,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -POLYP_CFLAGS = @POLYP_CFLAGS@ -POLYP_LDFLAGS = @POLYP_LDFLAGS@ -POLYP_LIBADD = @POLYP_LIBADD@ +PULSE_CFLAGS = @PULSE_CFLAGS@ +PULSE_LDFLAGS = @PULSE_LDFLAGS@ +PULSE_LIBADD = @PULSE_LIBADD@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff -urN akode-2.0.1.orig/akode/configure.in.in akode-2.0.1/akode/configure.in.in --- akode-2.0.1.orig/akode/configure.in.in 2005-10-27 17:12:36.000000000 +0200 +++ akode-2.0.1/akode/configure.in.in 2006-09-06 14:45:46.000000000 +0200 @@ -295,24 +295,24 @@ AC_SUBST(JACK_LDFLAGS) fi -AC_ARG_WITH(polypaudio,AC_HELP_STRING([--with-polypaudio],[Enable Polypaudio server support @<:@default=check@:>@]),[polypaudio_test="$withval"],[polypaudio_test="yes"]) +AC_ARG_WITH(pulseaudio,AC_HELP_STRING([--with-pulseaudio],[Enable PulseAudio server support @<:@default=check@:>@]),[pulseaudio_test="$withval"],[pulseaudio_test="yes"]) -if test "x$polypaudio_test" = "xyes" ; then -AC_MSG_CHECKING(for Polypaudio 0.7 or later) -if $PKG_CONFIG --atleast-version 0.7 polyplib-simple >/dev/null 2>&1 ; then - POLYP_CFLAGS="`$PKG_CONFIG --cflags polyplib-simple`" - POLYP_LIBADD="`$PKG_CONFIG --libs-only-l polyplib-simple`" - POLYP_LDFLAGS="`$PKG_CONFIG --libs-only-L polyplib-simple`" - have_polyp=yes +if test "x$pulseaudio_test" = "xyes" ; then +AC_MSG_CHECKING(for PulseAudio 0.9.2 or later) +if $PKG_CONFIG --atleast-version 0.9.2 libpulse-simple >/dev/null 2>&1 ; then + PULSE_CFLAGS="`$PKG_CONFIG --cflags libpulse-simple`" + PULSE_LIBADD="`$PKG_CONFIG --libs-only-l libpulse-simple`" + PULSE_LDFLAGS="`$PKG_CONFIG --libs-only-L libpulse-simple`" + have_pulse=yes AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_LIBPOLYP, 1, - [Define if you have polyplib (required if you want Polypaudio server support)]) + AC_DEFINE(HAVE_LIBPULSE, 1, + [Define if you have libpulse (required if you want PulseAudio server support)]) else AC_MSG_RESULT(not installed) fi -AC_SUBST(POLYP_CFLAGS) -AC_SUBST(POLYP_LIBADD) -AC_SUBST(POLYP_LDFLAGS) +AC_SUBST(PULSE_CFLAGS) +AC_SUBST(PULSE_LIBADD) +AC_SUBST(PULSE_LDFLAGS) fi AC_ARG_WITH(ffmpeg,AC_HELP_STRING([--with-ffmpeg],[Enable experimental FFMPEG decoder support @<:@default=no@:>@]),[ffmpeg_test="$withval"],[ffmpeg_test="no"]) @@ -507,7 +507,7 @@ AM_CONDITIONAL(include_oss_sink, test x$have_oss = xyes) AM_CONDITIONAL(include_sun_sink, test x$have_sun = xyes) AM_CONDITIONAL(include_jack_sink, test x$have_jack = xyes) -AM_CONDITIONAL(include_polyp_sink, test x$have_polyp = xyes) +AM_CONDITIONAL(include_polyp_sink, test x$have_pulse = xyes) AM_CONDITIONAL(include_ffmpeg_decoder, test x$have_ffmpeg = xyes) AC_MSG_CHECKING(for compilable aKode) diff -urN akode-2.0.1.orig/akode/lib/Makefile.in akode-2.0.1/akode/lib/Makefile.in --- akode-2.0.1.orig/akode/lib/Makefile.in 2006-07-23 00:17:11.000000000 +0200 +++ akode-2.0.1/akode/lib/Makefile.in 2006-09-06 14:38:04.000000000 +0200 @@ -194,9 +194,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -POLYP_CFLAGS = @POLYP_CFLAGS@ -POLYP_LDFLAGS = @POLYP_LDFLAGS@ -POLYP_LIBADD = @POLYP_LIBADD@ +PULSE_CFLAGS = @PULSE_CFLAGS@ +PULSE_LDFLAGS = @PULSE_LDFLAGS@ +PULSE_LIBADD = @PULSE_LIBADD@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff -urN akode-2.0.1.orig/akode/plugins/Makefile.in akode-2.0.1/akode/plugins/Makefile.in --- akode-2.0.1.orig/akode/plugins/Makefile.in 2006-07-23 00:17:11.000000000 +0200 +++ akode-2.0.1/akode/plugins/Makefile.in 2006-09-06 14:38:04.000000000 +0200 @@ -154,9 +154,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -POLYP_CFLAGS = @POLYP_CFLAGS@ -POLYP_LDFLAGS = @POLYP_LDFLAGS@ -POLYP_LIBADD = @POLYP_LIBADD@ +PULSE_CFLAGS = @PULSE_CFLAGS@ +PULSE_LDFLAGS = @PULSE_LDFLAGS@ +PULSE_LIBADD = @PULSE_LIBADD@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -251,11 +251,11 @@ @include_oss_sink_TRUE at AKODE_OSS_SINK = oss_sink @include_sun_sink_TRUE at AKODE_SUN_SINK = sun_sink @include_jack_sink_TRUE at AKODE_JACK_SINK = jack_sink - at include_polyp_sink_TRUE@AKODE_POLYP_SINK = polyp_sink + at include_polyp_sink_TRUE@AKODE_PULSE_SINK = polyp_sink SUBDIRS = $(AKODE_MPC_DECODER) $(AKODE_XIPH_DECODER) \ $(AKODE_MPEG_DECODER) $(AKODE_FFMPEG_DECODER) \ $(AKODE_ALSA_SINK) $(AKODE_OSS_SINK) $(AKODE_SUN_SINK) \ - $(AKODE_JACK_SINK) $(AKODE_POLYP_SINK) \ + $(AKODE_JACK_SINK) $(AKODE_PULSE_SINK) \ $(AKODE_SRC_RESAMPLER) #>- all: all-recursive diff -urN akode-2.0.1.orig/akode/plugins/alsa_sink/Makefile.in akode-2.0.1/akode/plugins/alsa_sink/Makefile.in --- akode-2.0.1.orig/akode/plugins/alsa_sink/Makefile.in 2006-07-23 00:17:11.000000000 +0200 +++ akode-2.0.1/akode/plugins/alsa_sink/Makefile.in 2006-09-06 14:38:04.000000000 +0200 @@ -177,9 +177,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -POLYP_CFLAGS = @POLYP_CFLAGS@ -POLYP_LDFLAGS = @POLYP_LDFLAGS@ -POLYP_LIBADD = @POLYP_LIBADD@ +PULSE_CFLAGS = @PULSE_CFLAGS@ +PULSE_LDFLAGS = @PULSE_LDFLAGS@ +PULSE_LIBADD = @PULSE_LIBADD@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff -urN akode-2.0.1.orig/akode/plugins/ffmpeg_decoder/Makefile.in akode-2.0.1/akode/plugins/ffmpeg_decoder/Makefile.in --- akode-2.0.1.orig/akode/plugins/ffmpeg_decoder/Makefile.in 2006-07-23 00:17:11.000000000 +0200 +++ akode-2.0.1/akode/plugins/ffmpeg_decoder/Makefile.in 2006-09-06 14:38:04.000000000 +0200 @@ -178,9 +178,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -POLYP_CFLAGS = @POLYP_CFLAGS@ -POLYP_LDFLAGS = @POLYP_LDFLAGS@ -POLYP_LIBADD = @POLYP_LIBADD@ +PULSE_CFLAGS = @PULSE_CFLAGS@ +PULSE_LDFLAGS = @PULSE_LDFLAGS@ +PULSE_LIBADD = @PULSE_LIBADD@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff -urN akode-2.0.1.orig/akode/plugins/jack_sink/Makefile.in akode-2.0.1/akode/plugins/jack_sink/Makefile.in --- akode-2.0.1.orig/akode/plugins/jack_sink/Makefile.in 2006-07-23 00:17:11.000000000 +0200 +++ akode-2.0.1/akode/plugins/jack_sink/Makefile.in 2006-09-06 14:38:04.000000000 +0200 @@ -177,9 +177,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -POLYP_CFLAGS = @POLYP_CFLAGS@ -POLYP_LDFLAGS = @POLYP_LDFLAGS@ -POLYP_LIBADD = @POLYP_LIBADD@ +PULSE_CFLAGS = @PULSE_CFLAGS@ +PULSE_LDFLAGS = @PULSE_LDFLAGS@ +PULSE_LIBADD = @PULSE_LIBADD@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff -urN akode-2.0.1.orig/akode/plugins/mpc_decoder/Makefile.in akode-2.0.1/akode/plugins/mpc_decoder/Makefile.in --- akode-2.0.1.orig/akode/plugins/mpc_decoder/Makefile.in 2006-07-23 00:17:11.000000000 +0200 +++ akode-2.0.1/akode/plugins/mpc_decoder/Makefile.in 2006-09-06 14:38:04.000000000 +0200 @@ -191,9 +191,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -POLYP_CFLAGS = @POLYP_CFLAGS@ -POLYP_LDFLAGS = @POLYP_LDFLAGS@ -POLYP_LIBADD = @POLYP_LIBADD@ +PULSE_CFLAGS = @PULSE_CFLAGS@ +PULSE_LDFLAGS = @PULSE_LDFLAGS@ +PULSE_LIBADD = @PULSE_LIBADD@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff -urN akode-2.0.1.orig/akode/plugins/mpc_decoder/mppdec/Makefile.in akode-2.0.1/akode/plugins/mpc_decoder/mppdec/Makefile.in --- akode-2.0.1.orig/akode/plugins/mpc_decoder/mppdec/Makefile.in 2006-07-23 00:17:11.000000000 +0200 +++ akode-2.0.1/akode/plugins/mpc_decoder/mppdec/Makefile.in 2006-09-06 14:38:04.000000000 +0200 @@ -169,9 +169,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -POLYP_CFLAGS = @POLYP_CFLAGS@ -POLYP_LDFLAGS = @POLYP_LDFLAGS@ -POLYP_LIBADD = @POLYP_LIBADD@ +PULSE_CFLAGS = @PULSE_CFLAGS@ +PULSE_LDFLAGS = @PULSE_LDFLAGS@ +PULSE_LIBADD = @PULSE_LIBADD@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff -urN akode-2.0.1.orig/akode/plugins/mpeg_decoder/Makefile.in akode-2.0.1/akode/plugins/mpeg_decoder/Makefile.in --- akode-2.0.1.orig/akode/plugins/mpeg_decoder/Makefile.in 2006-07-23 00:17:11.000000000 +0200 +++ akode-2.0.1/akode/plugins/mpeg_decoder/Makefile.in 2006-09-06 14:38:04.000000000 +0200 @@ -178,9 +178,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -POLYP_CFLAGS = @POLYP_CFLAGS@ -POLYP_LDFLAGS = @POLYP_LDFLAGS@ -POLYP_LIBADD = @POLYP_LIBADD@ +PULSE_CFLAGS = @PULSE_CFLAGS@ +PULSE_LDFLAGS = @PULSE_LDFLAGS@ +PULSE_LIBADD = @PULSE_LIBADD@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff -urN akode-2.0.1.orig/akode/plugins/oss_sink/Makefile.in akode-2.0.1/akode/plugins/oss_sink/Makefile.in --- akode-2.0.1.orig/akode/plugins/oss_sink/Makefile.in 2006-07-23 00:17:11.000000000 +0200 +++ akode-2.0.1/akode/plugins/oss_sink/Makefile.in 2006-09-06 14:38:04.000000000 +0200 @@ -177,9 +177,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -POLYP_CFLAGS = @POLYP_CFLAGS@ -POLYP_LDFLAGS = @POLYP_LDFLAGS@ -POLYP_LIBADD = @POLYP_LIBADD@ +PULSE_CFLAGS = @PULSE_CFLAGS@ +PULSE_LDFLAGS = @PULSE_LDFLAGS@ +PULSE_LIBADD = @PULSE_LIBADD@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff -urN akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.am akode-2.0.1/akode/plugins/polyp_sink/Makefile.am --- akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.am 2005-07-15 13:20:03.000000000 +0200 +++ akode-2.0.1/akode/plugins/polyp_sink/Makefile.am 2006-09-06 14:38:04.000000000 +0200 @@ -1,7 +1,7 @@ -INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(POLYP_CFLAGS) $(all_includes) +INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(PULSE_CFLAGS) $(all_includes) lib_LTLIBRARIES = libakode_polyp_sink.la libakode_polyp_sink_la_SOURCES = polyp_sink.cpp -libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(POLYP_LDFLAGS) -libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(POLYP_LIBADD) +libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(PULSE_LDFLAGS) +libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(PULSE_LIBADD) diff -urN akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.in akode-2.0.1/akode/plugins/polyp_sink/Makefile.in --- akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.in 2006-07-23 00:17:11.000000000 +0200 +++ akode-2.0.1/akode/plugins/polyp_sink/Makefile.in 2006-09-06 14:38:04.000000000 +0200 @@ -177,9 +177,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -POLYP_CFLAGS = @POLYP_CFLAGS@ -POLYP_LDFLAGS = @POLYP_LDFLAGS@ -POLYP_LIBADD = @POLYP_LIBADD@ +PULSE_CFLAGS = @PULSE_CFLAGS@ +PULSE_LDFLAGS = @PULSE_LDFLAGS@ +PULSE_LIBADD = @PULSE_LIBADD@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -265,13 +265,13 @@ target_vendor = @target_vendor@ unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ -INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(POLYP_CFLAGS) $(all_includes) +INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(PULSE_CFLAGS) $(all_includes) lib_LTLIBRARIES = libakode_polyp_sink.la libakode_polyp_sink_la_SOURCES = polyp_sink.cpp -#>- libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(POLYP_LDFLAGS) +#>- libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(PULSE_LDFLAGS) #>+ 1 -libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED) $(POLYP_LDFLAGS) -libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(POLYP_LIBADD) +libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED) $(PULSE_LDFLAGS) +libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(PULSE_LIBADD) #>- all: all-am #>+ 1 all: docs-am all-am diff -urN akode-2.0.1.orig/akode/plugins/polyp_sink/polyp_sink.cpp akode-2.0.1/akode/plugins/polyp_sink/polyp_sink.cpp --- akode-2.0.1.orig/akode/plugins/polyp_sink/polyp_sink.cpp 2005-10-20 22:54:12.000000000 +0200 +++ akode-2.0.1/akode/plugins/polyp_sink/polyp_sink.cpp 2006-09-06 15:14:52.000000000 +0200 @@ -25,7 +25,7 @@ #elif defined(HAVE_INTTYPES_H) #include #endif -#include +#include #include "audioframe.h" #include "audiobuffer.h" @@ -59,7 +59,7 @@ bool PolypSink::open() { int error = 0; - m_data->server = pa_simple_new(0, "akode-client", PA_STREAM_PLAYBACK, 0, "", &m_data->sample_spec, 0, 255, &error ); + m_data->server = pa_simple_new(0, "akode-client", PA_STREAM_PLAYBACK, 0, "", &m_data->sample_spec, 0, 0, &error ); if (!m_data->server || error != 0) { m_data->error = true; close(); diff -urN akode-2.0.1.orig/akode/plugins/src_resampler/Makefile.in akode-2.0.1/akode/plugins/src_resampler/Makefile.in --- akode-2.0.1.orig/akode/plugins/src_resampler/Makefile.in 2006-07-23 00:17:11.000000000 +0200 +++ akode-2.0.1/akode/plugins/src_resampler/Makefile.in 2006-09-06 14:38:04.000000000 +0200 @@ -178,9 +178,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -POLYP_CFLAGS = @POLYP_CFLAGS@ -POLYP_LDFLAGS = @POLYP_LDFLAGS@ -POLYP_LIBADD = @POLYP_LIBADD@ +PULSE_CFLAGS = @PULSE_CFLAGS@ +PULSE_LDFLAGS = @PULSE_LDFLAGS@ +PULSE_LIBADD = @PULSE_LIBADD@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff -urN akode-2.0.1.orig/akode/plugins/sun_sink/Makefile.in akode-2.0.1/akode/plugins/sun_sink/Makefile.in --- akode-2.0.1.orig/akode/plugins/sun_sink/Makefile.in 2006-07-23 00:17:11.000000000 +0200 +++ akode-2.0.1/akode/plugins/sun_sink/Makefile.in 2006-09-06 14:38:04.000000000 +0200 @@ -175,9 +175,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -POLYP_CFLAGS = @POLYP_CFLAGS@ -POLYP_LDFLAGS = @POLYP_LDFLAGS@ -POLYP_LIBADD = @POLYP_LIBADD@ +PULSE_CFLAGS = @PULSE_CFLAGS@ +PULSE_LDFLAGS = @PULSE_LDFLAGS@ +PULSE_LIBADD = @PULSE_LIBADD@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff -urN akode-2.0.1.orig/akode/plugins/xiph_decoder/Makefile.in akode-2.0.1/akode/plugins/xiph_decoder/Makefile.in --- akode-2.0.1.orig/akode/plugins/xiph_decoder/Makefile.in 2006-07-23 00:17:11.000000000 +0200 +++ akode-2.0.1/akode/plugins/xiph_decoder/Makefile.in 2006-09-06 14:38:04.000000000 +0200 @@ -185,9 +185,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -POLYP_CFLAGS = @POLYP_CFLAGS@ -POLYP_LDFLAGS = @POLYP_LDFLAGS@ -POLYP_LIBADD = @POLYP_LIBADD@ +PULSE_CFLAGS = @PULSE_CFLAGS@ +PULSE_LDFLAGS = @PULSE_LDFLAGS@ +PULSE_LIBADD = @PULSE_LIBADD@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff -urN akode-2.0.1.orig/config.h.in akode-2.0.1/config.h.in --- akode-2.0.1.orig/config.h.in 2006-07-23 00:17:04.000000000 +0200 +++ akode-2.0.1/config.h.in 2006-09-06 14:44:55.000000000 +0200 @@ -43,9 +43,9 @@ /* Define if you have libOggFLAC (required for loading OggFLAC files) */ #undef HAVE_LIBOGGFLAC -/* Define if you have polyplib (required if you want Polypaudio server +/* Define if you have libpulse (required if you want PulseAudio server support) */ -#undef HAVE_LIBPOLYP +#undef HAVE_LIBPULSE /* defined if you have libsamplerate library and header */ #undef HAVE_LIBSAMPLERATE diff -urN akode-2.0.1.orig/configure.in akode-2.0.1/configure.in --- akode-2.0.1.orig/configure.in 2006-07-23 00:16:52.000000000 +0200 +++ akode-2.0.1/configure.in 2006-09-06 14:45:21.000000000 +0200 @@ -400,24 +400,24 @@ AC_SUBST(JACK_LDFLAGS) fi -AC_ARG_WITH(polypaudio,AC_HELP_STRING([--with-polypaudio],[Enable Polypaudio server support @<:@default=check@:>@]),[polypaudio_test="$withval"],[polypaudio_test="yes"]) +AC_ARG_WITH(pulseaudio,AC_HELP_STRING([--with-pulseaudio],[Enable PulseAudio server support @<:@default=check@:>@]),[pulseaudio_test="$withval"],[pulseaudio_test="yes"]) -if test "x$polypaudio_test" = "xyes" ; then -AC_MSG_CHECKING(for Polypaudio 0.7 or later) -if $PKG_CONFIG --atleast-version 0.7 polyplib-simple >/dev/null 2>&1 ; then - POLYP_CFLAGS="`$PKG_CONFIG --cflags polyplib-simple`" - POLYP_LIBADD="`$PKG_CONFIG --libs-only-l polyplib-simple`" - POLYP_LDFLAGS="`$PKG_CONFIG --libs-only-L polyplib-simple`" - have_polyp=yes +if test "x$pulseaudio_test" = "xyes" ; then +AC_MSG_CHECKING(for PulseAudio 0.9.2 or later) +if $PKG_CONFIG --atleast-version 0.9.2 libpulse-simple >/dev/null 2>&1 ; then + PULSE_CFLAGS="`$PKG_CONFIG --cflags libpulse-simple`" + PULSE_LIBADD="`$PKG_CONFIG --libs-only-l libpulse-simple`" + PULSE_LDFLAGS="`$PKG_CONFIG --libs-only-L libpulse-simple`" + have_pulse=yes AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_LIBPOLYP, 1, - [Define if you have polyplib (required if you want Polypaudio server support)]) + AC_DEFINE(HAVE_LIBPULSE, 1, + [Define if you have libpulse (required if you want PulseAudio server support)]) else AC_MSG_RESULT(not installed) fi -AC_SUBST(POLYP_CFLAGS) -AC_SUBST(POLYP_LIBADD) -AC_SUBST(POLYP_LDFLAGS) +AC_SUBST(PULSE_CFLAGS) +AC_SUBST(PULSE_LIBADD) +AC_SUBST(PULSE_LDFLAGS) fi AC_ARG_WITH(ffmpeg,AC_HELP_STRING([--with-ffmpeg],[Enable experimental FFMPEG decoder support @<:@default=no@:>@]),[ffmpeg_test="$withval"],[ffmpeg_test="no"]) @@ -612,7 +612,7 @@ AM_CONDITIONAL(include_oss_sink, test x$have_oss = xyes) AM_CONDITIONAL(include_sun_sink, test x$have_sun = xyes) AM_CONDITIONAL(include_jack_sink, test x$have_jack = xyes) -AM_CONDITIONAL(include_polyp_sink, test x$have_polyp = xyes) +AM_CONDITIONAL(include_polyp_sink, test x$have_pulse = xyes) AM_CONDITIONAL(include_ffmpeg_decoder, test x$have_ffmpeg = xyes) AC_MSG_CHECKING(for compilable aKode) Index: akode.spec =================================================================== RCS file: /cvs/extras/rpms/akode/FC-6/akode.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- akode.spec 28 Aug 2006 15:01:03 -0000 1.5 +++ akode.spec 12 Feb 2007 19:27:20 -0000 1.6 @@ -2,7 +2,7 @@ Summary: Audio-decoding framework Name: akode Version: 2.0.1 -Release: 2%{?dist} +Release: 5%{?dist} License: LGPL Group: System Environment/Libraries #URL: http://carewolf.com/akode/ @@ -10,6 +10,22 @@ Source0: http://www.kde-apps.org/content/files/30375-akode-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch1: akode-pulseaudio.patch + +#Conflicts: kdemultimedia < 6:3.5 + +%if 0%{?fedora} > 4 +%define _with_jack --with-jack +%define _with_pulseaudio --with-pulseaudio +%endif + +%if 0%{?fedora} > 6 +%define _with_pulseaudio --with-pulseaudio +# pulseaudio is/will-be the F7 default, +Requires: %{name}-pulseaudio +%endif + + BuildRequires: automake BuildRequires: alsa-lib-devel BuildRequires: flac-devel @@ -17,6 +33,8 @@ BuildRequires: speex-devel BuildRequires: libvorbis-devel BuildRequires: libtool +%{?_with_jack:BuildRequires: jack-audio-connection-kit-devel} +%{?_with_pulseaudio:BuildRequires: pulseaudio-devel} %description aKode is a simple audio-decoding frame-work that provides a uniform @@ -30,12 +48,6 @@ aKode also has the following audio outputs: * oss: Outputs to the OSS (Open Sound System) * alsa: Outputs to ALSA (dmix is recommended). -%if 0 -TODO -* jack: Outputs using Jack audio backend. -* polyp: Output to the polypaudio server. Recommended for network - transparent audio. -%endif %package devel Summary: Headers for developing programs that will use %{name} @@ -44,10 +56,36 @@ %description devel %{summary}. +%package jack +Summary: Jack audio output backend for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +%description jack +%{summary}. + +%package libsamplerate +Summary: Resampler based on (GPL) libsamplerate for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +%description libsamplerate +%{summary}. +Packaged separately to keep main/core %{akode} package LGPL-clean. + +%package pulseaudio +Summary: Pulseaudio output backend for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +%description pulseaudio +%{summary}. +Recommended for network transparent audio. + + %prep %setup -q -n %{name}-%{version}%{?beta} +%patch1 -p1 -b .pulseaudio + [ ! -f configure ] && make -f Makefile.cvs @@ -58,11 +96,11 @@ --without-libltdl \ --with-alsa \ --with-flac \ + %{?_with_jack} %{!?_with_jack:--without-jack} \ --with-libsamplerate \ + %{?_with_pulseaudio} %{!?_with_pulseaudio:--without-pulseaudio} \ --with-speex \ --with-vorbis \ - --without-jack \ - --without-polypaudio \ --without-ffmpeg \ --without-libmad @@ -97,7 +135,10 @@ %doc rpmdocs/* %{_bindir}/akodeplay %{_libdir}/libakode.so.* -%{_libdir}/libakode_*_*.so +%{_libdir}/libakode_alsa_sink.so +%{_libdir}/libakode_oss_sink.so +%{_libdir}/libakode_mpc_decoder.so +%{_libdir}/libakode_xiph_decoder.so %files devel %defattr(-,root,root,-) @@ -105,8 +146,34 @@ %{_includedir}/* %{_libdir}/libakode.so +%if "%{?_with_jack:1}" == "1" +%files jack +%defattr(-,root,root,-) +%{_libdir}/libakode_jack_sink.so +%endif + +%files libsamplerate +%defattr(-,root,root,-) +%{_libdir}/libakode_src_resampler.so + +%if "%{?_with_pulseaudio:1}" == "1" +%files pulseaudio +%defattr(-,root,root,-) +%{_libdir}/libakode_polyp_sink.so +%endif + + %changelog +* Mon Feb 12 2007 Rex Dieter 2.0.1-5 +- enable pulseaudio support +- Requires: akode-pulseaudio (fc7+) + +* Thu Dec 14 2006 Rex Dieter 2.0.1-4 +- enable jack support (subpkg) +- package (GPL'd) libsamplerate-based resampler separately, + to keep main pkg LGPL-clean + * Mon Aug 28 2006 Rex Dieter 2.0.1-2 - fc6 respin From fedora-extras-commits at redhat.com Mon Feb 12 19:28:50 2007 From: fedora-extras-commits at redhat.com (Ian Burrell (iburrell)) Date: Mon, 12 Feb 2007 14:28:50 -0500 Subject: rpms/perl-File-Next import.log,1.1,1.2 Message-ID: <200702121928.l1CJSoA6020429@cvs-int.fedora.redhat.com> Author: iburrell Update of /cvs/extras/rpms/perl-File-Next In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20351 Modified Files: import.log Log Message: auto-import perl-File-Next-0.38-2 on branch devel from perl-File-Next-0.38-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-File-Next/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 12 Feb 2007 18:51:26 -0000 1.1 +++ import.log 12 Feb 2007 19:28:17 -0000 1.2 @@ -0,0 +1 @@ +perl-File-Next-0_38-2:HEAD:perl-File-Next-0.38-2.src.rpm:1171308494 From fedora-extras-commits at redhat.com Mon Feb 12 19:28:52 2007 From: fedora-extras-commits at redhat.com (Ian Burrell (iburrell)) Date: Mon, 12 Feb 2007 14:28:52 -0500 Subject: rpms/perl-File-Next/devel perl-File-Next.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702121928.l1CJSq8U020433@cvs-int.fedora.redhat.com> Author: iburrell Update of /cvs/extras/rpms/perl-File-Next/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20351/devel Modified Files: .cvsignore sources Added Files: perl-File-Next.spec Log Message: auto-import perl-File-Next-0.38-2 on branch devel from perl-File-Next-0.38-2.src.rpm --- NEW FILE perl-File-Next.spec --- Name: perl-File-Next Version: 0.38 Release: 2%{?dist} Summary: File::Next Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/File-Next/ Source0: http://www.cpan.org/modules/by-module/File/File-Next-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Test::Pod::Coverage) >= 1.04 BuildRequires: perl(Test::Pod) >= 1.14 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description File::Next is an iterator-based module for finding files. It's lightweight, has no dependencies, runs under taint mode, and puts your program more directly in control of file selection. %prep %setup -q -n File-Next-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes perlcriticrc README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Tue Jan 30 2007 Ian M. Burrell - 0.38-2 - Add BuildRequires Test::Pod and Test::Pod::Coverage * Mon Jan 29 2007 Ian Burrell 0.38-1 - Specfile autogenerated by cpanspec 1.69.1. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-File-Next/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Feb 2007 18:51:28 -0000 1.1 +++ .cvsignore 12 Feb 2007 19:28:20 -0000 1.2 @@ -0,0 +1 @@ +File-Next-0.38.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-File-Next/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Feb 2007 18:51:28 -0000 1.1 +++ sources 12 Feb 2007 19:28:20 -0000 1.2 @@ -0,0 +1 @@ +3ba4accaafebd1dcada17839c122eca6 File-Next-0.38.tar.gz From fedora-extras-commits at redhat.com Mon Feb 12 19:32:15 2007 From: fedora-extras-commits at redhat.com (Ian Burrell (iburrell)) Date: Mon, 12 Feb 2007 14:32:15 -0500 Subject: rpms/perl-Path-Class import.log,1.1,1.2 Message-ID: <200702121932.l1CJWFZh020732@cvs-int.fedora.redhat.com> Author: iburrell Update of /cvs/extras/rpms/perl-Path-Class In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20694 Modified Files: import.log Log Message: auto-import perl-Path-Class-0.16-1 on branch devel from perl-Path-Class-0.16-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Path-Class/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 12 Feb 2007 18:56:20 -0000 1.1 +++ import.log 12 Feb 2007 19:31:43 -0000 1.2 @@ -0,0 +1 @@ +perl-Path-Class-0_16-1:HEAD:perl-Path-Class-0.16-1.src.rpm:1171308700 From fedora-extras-commits at redhat.com Mon Feb 12 19:32:18 2007 From: fedora-extras-commits at redhat.com (Ian Burrell (iburrell)) Date: Mon, 12 Feb 2007 14:32:18 -0500 Subject: rpms/perl-Path-Class/devel perl-Path-Class.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702121932.l1CJWIJb020736@cvs-int.fedora.redhat.com> Author: iburrell Update of /cvs/extras/rpms/perl-Path-Class/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20694/devel Modified Files: .cvsignore sources Added Files: perl-Path-Class.spec Log Message: auto-import perl-Path-Class-0.16-1 on branch devel from perl-Path-Class-0.16-1.src.rpm --- NEW FILE perl-Path-Class.spec --- Name: perl-Path-Class Version: 0.16 Release: 1%{?dist} Summary: Cross-platform path specification manipulation License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Path-Class/ Source0: http://www.cpan.org/modules/by-module/Path/Path-Class-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Path::Class is a module for manipulation of file and directory specifications (strings describing their locations, like '/home/ken/foo.txt' or 'C:\Windows\Foo.txt') in a cross-platform manner. It supports pretty much every platform Perl runs on, including Unix, Windows, Mac, VMS, Epoc, Cygwin, OS/2, and NetWare. %prep %setup -q -n Path-Class-%{version} %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check ./Build test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon Jan 29 2007 Ian Burrell 0.16-1 - Specfile autogenerated by cpanspec 1.69.1. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Path-Class/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Feb 2007 18:56:27 -0000 1.1 +++ .cvsignore 12 Feb 2007 19:31:45 -0000 1.2 @@ -0,0 +1 @@ +Path-Class-0.16.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Path-Class/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Feb 2007 18:56:27 -0000 1.1 +++ sources 12 Feb 2007 19:31:45 -0000 1.2 @@ -0,0 +1 @@ +3a2416d2f5ed1a8a98525baea5c25e1c Path-Class-0.16.tar.gz From fedora-extras-commits at redhat.com Mon Feb 12 19:34:54 2007 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Mon, 12 Feb 2007 14:34:54 -0500 Subject: rpms/php-pear-PHP-CompatInfo/FC-6 .cvsignore, 1.3, 1.4 php-pear-PHP-CompatInfo.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200702121934.l1CJYsUS020934@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-PHP-CompatInfo/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20837 Modified Files: .cvsignore php-pear-PHP-CompatInfo.spec sources Log Message: update to 1.4.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-pear-PHP-CompatInfo/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Oct 2006 15:23:35 -0000 1.3 +++ .cvsignore 12 Feb 2007 19:34:22 -0000 1.4 @@ -1 +1 @@ -PHP_CompatInfo-1.4.0.tgz +PHP_CompatInfo-1.4.1.tgz Index: php-pear-PHP-CompatInfo.spec =================================================================== RCS file: /cvs/extras/rpms/php-pear-PHP-CompatInfo/FC-6/php-pear-PHP-CompatInfo.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- php-pear-PHP-CompatInfo.spec 2 Oct 2006 15:25:49 -0000 1.3 +++ php-pear-PHP-CompatInfo.spec 12 Feb 2007 19:34:22 -0000 1.4 @@ -2,8 +2,8 @@ %define pear_name PHP_CompatInfo Name: php-pear-PHP-CompatInfo -Version: 1.4.0 -Release: 1%{?dist}.1 +Version: 1.4.1 +Release: 1%{?dist} Summary: Find out version and extensions required for a piece of code to run Summary(fr): Trouver version et extensions n??cessaires ?? l'ex??cution d'un code @@ -17,7 +17,7 @@ BuildArch: noarch BuildRequires: dos2unix php-pear >= 1:1.4.9-1.2 -Requires: php-pear(PEAR) >= 1.4.3 php-pear(Console_Getargs) >= 1.3.1 php-pear(Console_Table) >= 1.0.5 +Requires: php-pear(PEAR) >= 1.4.3 php-pear(Console_Getargs) >= 1.3.3 php-pear(Console_Table) >= 1.0.5 Requires(post): %{__pear} Requires(postun): %{__pear} Provides: php-pear(%{pear_name}) = %{version} @@ -93,6 +93,10 @@ %{_bindir}/pcicmd %changelog +* Mon Feb 12 2007 Remi Collet 1.4.1-1 +- upgrade to 1.4.1 +- upgrade Requires Console_Getargs to 1.3.3 + * Thu Sep 28 2006 Remi Collet 1.4.0-1 - upgrade to 1.4.0 - Change Requires from Console_Getopt to Console_Getargs Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pear-PHP-CompatInfo/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Oct 2006 15:23:35 -0000 1.3 +++ sources 12 Feb 2007 19:34:22 -0000 1.4 @@ -1 +1 @@ -0e7da112542fa124f7b523cb09c7624a PHP_CompatInfo-1.4.0.tgz +eff50211512322d7197c65e25816b287 PHP_CompatInfo-1.4.1.tgz From fedora-extras-commits at redhat.com Mon Feb 12 19:35:21 2007 From: fedora-extras-commits at redhat.com (Ian Burrell (iburrell)) Date: Mon, 12 Feb 2007 14:35:21 -0500 Subject: rpms/perl-Module-Depends import.log,1.1,1.2 Message-ID: <200702121935.l1CJZLdc020975@cvs-int.fedora.redhat.com> Author: iburrell Update of /cvs/extras/rpms/perl-Module-Depends In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20893 Modified Files: import.log Log Message: auto-import perl-Module-Depends-0.10-2 on branch devel from perl-Module-Depends-0.10-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Depends/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 12 Feb 2007 18:58:01 -0000 1.1 +++ import.log 12 Feb 2007 19:34:48 -0000 1.2 @@ -0,0 +1 @@ +perl-Module-Depends-0_10-2:HEAD:perl-Module-Depends-0.10-2.src.rpm:1171308885 From fedora-extras-commits at redhat.com Mon Feb 12 19:35:23 2007 From: fedora-extras-commits at redhat.com (Ian Burrell (iburrell)) Date: Mon, 12 Feb 2007 14:35:23 -0500 Subject: rpms/perl-Module-Depends/devel perl-Module-Depends.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702121935.l1CJZNiB020984@cvs-int.fedora.redhat.com> Author: iburrell Update of /cvs/extras/rpms/perl-Module-Depends/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20893/devel Modified Files: .cvsignore sources Added Files: perl-Module-Depends.spec Log Message: auto-import perl-Module-Depends-0.10-2 on branch devel from perl-Module-Depends-0.10-2.src.rpm --- NEW FILE perl-Module-Depends.spec --- Name: perl-Module-Depends Version: 0.10 Release: 2%{?dist} Summary: Identify the dependencies of a distribution License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Module-Depends/ Source0: http://www.cpan.org/modules/by-module/Module/Module-Depends-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Class::Accessor::Chained) BuildRequires: perl(File::chdir) BuildRequires: perl(Module::Build) BuildRequires: perl(YAML) Requires: perl(Class::Accessor::Chained) Requires: perl(File::chdir) Requires: perl(YAML) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Module::Depends extracts module dependencies from an unpacked distribution tree. %prep %setup -q -n Module-Depends-%{version} %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check ./Build test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon Jan 29 2007 Ian Burrell 0.10-2 - Specfile autogenerated by cpanspec 1.69.1. * Thu Mar 30 2006 Ian Burrell 0.10-1 - Specfile autogenerated by cpanspec 1.64. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Depends/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Feb 2007 18:58:08 -0000 1.1 +++ .cvsignore 12 Feb 2007 19:34:51 -0000 1.2 @@ -0,0 +1 @@ +Module-Depends-0.10.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Depends/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Feb 2007 18:58:08 -0000 1.1 +++ sources 12 Feb 2007 19:34:51 -0000 1.2 @@ -0,0 +1 @@ +a5751f458e410217ba39f7f32fa8899a Module-Depends-0.10.tar.gz From fedora-extras-commits at redhat.com Mon Feb 12 19:37:28 2007 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Mon, 12 Feb 2007 14:37:28 -0500 Subject: rpms/php-pear-PHP-CompatInfo/FC-5 .cvsignore, 1.3, 1.4 php-pear-PHP-CompatInfo.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200702121937.l1CJbSwD021126@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-PHP-CompatInfo/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21090 Modified Files: .cvsignore php-pear-PHP-CompatInfo.spec sources Log Message: update to 1.4.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-pear-PHP-CompatInfo/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Oct 2006 15:36:45 -0000 1.3 +++ .cvsignore 12 Feb 2007 19:36:55 -0000 1.4 @@ -1 +1 @@ -PHP_CompatInfo-1.4.0.tgz +PHP_CompatInfo-1.4.1.tgz Index: php-pear-PHP-CompatInfo.spec =================================================================== RCS file: /cvs/extras/rpms/php-pear-PHP-CompatInfo/FC-5/php-pear-PHP-CompatInfo.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- php-pear-PHP-CompatInfo.spec 2 Oct 2006 15:36:45 -0000 1.3 +++ php-pear-PHP-CompatInfo.spec 12 Feb 2007 19:36:55 -0000 1.4 @@ -2,7 +2,7 @@ %define pear_name PHP_CompatInfo Name: php-pear-PHP-CompatInfo -Version: 1.4.0 +Version: 1.4.1 Release: 1%{?dist} Summary: Find out version and extensions required for a piece of code to run Summary(fr): Trouver version et extensions n??cessaires ?? l'ex??cution d'un code @@ -17,7 +17,7 @@ BuildArch: noarch BuildRequires: dos2unix php-pear >= 1:1.4.9-1.2 -Requires: php-pear(PEAR) >= 1.4.3 php-pear(Console_Getargs) >= 1.3.1 php-pear(Console_Table) >= 1.0.5 +Requires: php-pear(PEAR) >= 1.4.3 php-pear(Console_Getargs) >= 1.3.3 php-pear(Console_Table) >= 1.0.5 Requires(post): %{__pear} Requires(postun): %{__pear} Provides: php-pear(%{pear_name}) = %{version} @@ -93,6 +93,10 @@ %{_bindir}/pcicmd %changelog +* Mon Feb 12 2007 Remi Collet 1.4.1-1 +- upgrade to 1.4.1 +- upgrade Requires Console_Getargs to 1.3.3 + * Thu Sep 28 2006 Remi Collet 1.4.0-1 - upgrade to 1.4.0 - Change Requires from Console_Getopt to Console_Getargs Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pear-PHP-CompatInfo/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Oct 2006 15:36:45 -0000 1.3 +++ sources 12 Feb 2007 19:36:55 -0000 1.4 @@ -1 +1 @@ -0e7da112542fa124f7b523cb09c7624a PHP_CompatInfo-1.4.0.tgz +eff50211512322d7197c65e25816b287 PHP_CompatInfo-1.4.1.tgz From fedora-extras-commits at redhat.com Mon Feb 12 19:40:17 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Mon, 12 Feb 2007 14:40:17 -0500 Subject: rpms/TeXmacs/FC-6 .cvsignore, 1.25, 1.26 TeXmacs.spec, 1.47, 1.48 sources, 1.26, 1.27 Message-ID: <200702121940.l1CJeHKJ021309@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21261/FC-6 Modified Files: .cvsignore TeXmacs.spec sources Log Message: new version 1.0.6.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-6/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 19 Jan 2007 21:25:15 -0000 1.25 +++ .cvsignore 12 Feb 2007 19:39:44 -0000 1.26 @@ -1 +1 @@ -TeXmacs-1.0.6.8-src.tar.gz +TeXmacs-1.0.6.9-src.tar.gz Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-6/TeXmacs.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- TeXmacs.spec 11 Feb 2007 16:53:12 -0000 1.47 +++ TeXmacs.spec 12 Feb 2007 19:39:44 -0000 1.48 @@ -1,12 +1,12 @@ Name: TeXmacs -Version: 1.0.6.8 -Release: 2%{?dist} +Version: 1.0.6.9 +Release: 1%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors License: GPL URL: http://www.texmacs.org -Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6.8-src.tar.gz +Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6.9-src.tar.gz Patch2: TeXmacs-event.patch Patch5: TeXmacs-1.6.0.7-rdelim.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -154,6 +154,9 @@ %changelog +* Mon Feb 12 2007 Gerard Milmeister - 1.0.6.9-1 +- new version 1.0.6.9 + * Sun Feb 11 2007 Gerard Milmeister - 1.0.6.8-2 - build with optflags (bugzilla 228152) Index: sources =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-6/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 19 Jan 2007 21:25:15 -0000 1.26 +++ sources 12 Feb 2007 19:39:44 -0000 1.27 @@ -1 +1 @@ -0253af6268dac5e5f59e76822271ad08 TeXmacs-1.0.6.8-src.tar.gz +fde50d2c6a543e63be22534d77de474d TeXmacs-1.0.6.9-src.tar.gz From fedora-extras-commits at redhat.com Mon Feb 12 19:40:19 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Mon, 12 Feb 2007 14:40:19 -0500 Subject: rpms/TeXmacs/devel .cvsignore, 1.25, 1.26 TeXmacs.spec, 1.45, 1.46 sources, 1.26, 1.27 Message-ID: <200702121940.l1CJeJu4021314@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21261/devel Modified Files: .cvsignore TeXmacs.spec sources Log Message: new version 1.0.6.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 19 Jan 2007 21:25:15 -0000 1.25 +++ .cvsignore 12 Feb 2007 19:39:47 -0000 1.26 @@ -1 +1 @@ -TeXmacs-1.0.6.8-src.tar.gz +TeXmacs-1.0.6.9-src.tar.gz Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/TeXmacs.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- TeXmacs.spec 11 Feb 2007 16:53:14 -0000 1.45 +++ TeXmacs.spec 12 Feb 2007 19:39:47 -0000 1.46 @@ -1,12 +1,12 @@ Name: TeXmacs -Version: 1.0.6.8 -Release: 2%{?dist} +Version: 1.0.6.9 +Release: 1%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors License: GPL URL: http://www.texmacs.org -Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6.8-src.tar.gz +Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6.9-src.tar.gz Patch2: TeXmacs-event.patch Patch5: TeXmacs-1.6.0.7-rdelim.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -154,6 +154,9 @@ %changelog +* Mon Feb 12 2007 Gerard Milmeister - 1.0.6.9-1 +- new version 1.0.6.9 + * Sun Feb 11 2007 Gerard Milmeister - 1.0.6.8-2 - build with optflags (bugzilla 228152) Index: sources =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 19 Jan 2007 21:25:15 -0000 1.26 +++ sources 12 Feb 2007 19:39:47 -0000 1.27 @@ -1 +1 @@ -0253af6268dac5e5f59e76822271ad08 TeXmacs-1.0.6.8-src.tar.gz +fde50d2c6a543e63be22534d77de474d TeXmacs-1.0.6.9-src.tar.gz From fedora-extras-commits at redhat.com Mon Feb 12 19:42:23 2007 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 12 Feb 2007 14:42:23 -0500 Subject: rpms/kdemultimedia-extras/devel .cvsignore, 1.6, 1.7 kdemultimedia-extras.spec, 1.13, 1.14 sources, 1.6, 1.7 Message-ID: <200702121942.l1CJgNHd021435@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdemultimedia-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21410 Modified Files: .cvsignore kdemultimedia-extras.spec sources Log Message: * Sat Jan 20 2007 Rex Dieter 6:3.5.6-2 - use gst 0.10 instead of gst08 (where available) * Tue Jan 16 2007 Rex Dieter 6:3.5.6-1 - kde-3.5.6 * Mon Dec 18 2006 Rex Dieter 6:3.5.5-4 - -extras: include xine_artsplugin here (instead of -extras-nonfree) * Wed Dec 13 2006 Rex Dieter 6:3.5.5-3 - Requires(post,postun): xdg-utils Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 1 Nov 2006 18:32:36 -0000 1.6 +++ .cvsignore 12 Feb 2007 19:41:51 -0000 1.7 @@ -1,4 +1,3 @@ -kdemultimedia-3.5.2-patched.tar.bz2 -kdemultimedia-3.5.3-patched.tar.bz2 kdemultimedia-3.5.4-patched.tar.bz2 kdemultimedia-3.5.5-patched.tar.bz2 +kdemultimedia-3.5.6-patched.tar.bz2 Index: kdemultimedia-extras.spec =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/devel/kdemultimedia-extras.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- kdemultimedia-extras.spec 1 Nov 2006 18:32:36 -0000 1.13 +++ kdemultimedia-extras.spec 12 Feb 2007 19:41:51 -0000 1.14 @@ -1,4 +1,9 @@ -# $Id$ + +## FIXME/TODO: +# * kdemultimedia-arts/arts-extras subpkg, http://bugzilla.redhat.com/191097 +# * split free/nonfree codecs from *.mcopclass files, in particular: +# akodePlayObject.mcopclass, xine*.mcopclass (yuck) +# * -juk,-kaboodle,-noatun subpkgs? # NOTE: can only build *one* of the following at a time # core: kdemultidia/kdemultimedia-devel @@ -8,9 +13,6 @@ %define extras 1 #define nonfree 1 -# enable pkg/filelist debugging -- Rex -#define debug 1 - %if "%{?core}" == "1" %define patched -patched %endif @@ -18,14 +20,12 @@ %if "%{?extras}" == "1" %define patched -patched %define _with_akode --with-akode -# to make sure no nonfree bits get included -BuildConflicts: akode-extras -# debugging: to make sure no extras bits (accidentally) get excluded -%{?debug:BuildConflicts: kdemultimedia-extras = %{epoch}:%{version}} +%define _with_gstreamer --with-gstreamer ## not currently compatible with libtunepimp-0.5 (only libtunepimp-0.4) #define _with_musicbrainz --with-musicbrainz %define _with_libsamplerate --with-libsamplerate %define _with_taglib --with-taglib +%define _with_xine --with-xine %endif %if "%{?nonfree}" == "1" @@ -33,15 +33,10 @@ BuildRequires: akode-extras %define _with_lame --with-lame %define _with_taglib --with-taglib -%define _with_xine --with-xine %endif # distro/release bits -#if "%{?fedora}" > "2" || "%{?rhel}" > "3" -%define _with_gstreamer --with-gstreamer -#endif -%if "%{?fedora}" > "4" || "%{?rhel}" > "4" -%define gst gstreamer08 +%if 0%{?fedora} > 4 || 0%{?rhel} > 4 BuildRequires: libXxf86vm-devel # likely only required for nonfree -- Rex BuildRequires: libXxf86dga-devel @@ -66,12 +61,18 @@ #if "%{?core}" == "1" Epoch: 6 #endif -Version: 3.5.5 -Release: 0.3%{?dist}%{?kde} +Version: 3.5.6 +Release: 2%{?dist}%{?kde} License: GPL %if "%{?patched:1}" == "1" -# From Core's kdemultimedia pkg +%define nonfree_bits mpeglib mpeglib_artsplugin mpg123_artsplugin +## To generate -patched tarball, +# 1. tar xjf kdemultimedia-%{version} +# 2. mv kdemultimedia-%{version} kdemultimedia-%{version}-patched +# 3. (cd kdemultimedia-%{version}-patched; rm -rf %nonfree_bits ) +# 4. remove %nonfree_bits from kdemultimedia-%{version}-patched/subdirs +# 5. tar cjf kdemultimedia-%{version}-patched.tar.bz2 kdemultimedia-%{version}-patched Source0: kdemultimedia-%{version}-patched.tar.bz2 %else Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdemultimedia-%{version}.tar.bz2 @@ -79,6 +80,9 @@ Url: http://multimedia.kde.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires(post): xdg-utils +Requires(postun): xdg-utils + BuildRequires: kdelibs-devel >= 6:%{version} Requires: kdelibs >= 6:%{version} %if "%{is_release}" != "1" @@ -86,7 +90,6 @@ %endif BuildRequires: gettext -BuildRequires: desktop-file-utils BuildRequires: audiofile-devel BuildRequires: alsa-lib-devel BuildRequires: cdparanoia-devel cdparanoia @@ -97,15 +100,10 @@ %{?_with_taglib:BuildRequires: taglib-devel} %{?_with_musicbrainz:BuildRequires: libmusicbrainz-devel >= 0:2.1, libtunepimp-devel} %{?_with_akode:BuildRequires: akode-devel} -# gstreamer(08) pkg_name -%{?_with_gstreamer:BuildRequires: %{?gst}%{!?gst:gstreamer}-plugins-devel} +%{?_with_gstreamer:BuildRequires: gstreamer-devel} %{?_with_lame:BuildRequires: lame-devel} %{?_with_libsamplerate:BuildRequires: libsamplerate-devel} %{?_with_xine:BuildRequires: xine-lib-devel >= 0:1.0} -## TODO (?) -#BuildRequires: gstreamer/gst, -%{?_with_jack:BuildRequires: jack-audio-connection-kit} -%{?_with_polypaudio:BuildRequires: polypaudio-devel} Patch2: kdemultimedia-3.5.3-config.patch Patch3: kdemultimedia-3.4.0-xdg.patch @@ -149,21 +147,17 @@ %endif %if "%{?extras}" == "1" -# debugging -%{?debug:BuildConflicts: kdemultimedia-extras } Requires: kdemultimedia >= %{epoch}:%{version} %description %{summary}, including: * akode_artsplugin (akode) * juk %{?_with_musicbrainz:(libtunepimp)} * kfile-plugins: flac, mpc (taglib) +* xine_artsplugin (xine-lib) %endif %if "%{?nonfree}" == "1" Obsoletes: kdemultimedia-nonfree < %{epoch}:%{version}-%{release} -# debugging -%{?debug:BuildRequires: kdemultimedia-extras = %{epoch}:%{version}} -%{?debug:BuildConflicts: kdemultimedia-extras-nonfree} Requires: kdemultimedia >= %{epoch}:%{version} # for main akode_artsplugins bits Requires: kdemultimedia-extras >= %{epoch}:%{version} @@ -174,7 +168,6 @@ * kfile-plugins: mp3 (taglib), mpeg * krec mp3 export (lame), * mpeglib_artsplugin, -* xine_artsplugin (xine-lib) %endif @@ -206,12 +199,7 @@ DO_NOT_COMPILE="" -#{!?extras:export DO_NOT_COMPILE="$DO_NOT_COMPILE juk"} -#{!?extras:export DO_NOT_COMPILE="$DO_NOT_COMPILE akode_artsplugin"} -#{!?nonfree:export DO_NOT_COMPILE="$DO_NOT_COMPILE akode_artsplugin"} -#{!?nonfree:export DO_NOT_COMPILE="$DO_NOT_COMPILE xine_artsplugin"} -%{!?nonfree:export DO_NOT_COMPILE="$DO_NOT_COMPILE mpeglib mpeglib_artsplug"} -%{!?nonfree:export DO_NOT_COMPILE="$DO_NOT_COMPILE mpg123_artsplugin"} +%{!?nonfree:export DO_NOT_COMPILE="$DO_NOT_COMPILE %{nonfree_bits}"} %{?extras:export CPPFLAGS="$CPPFLAGS -I%{_includedir}/kde/arts"} @@ -242,7 +230,6 @@ %{?_with_lame} %{!?_with_lame:--without-lame} \ %{?_with_libsamplerate} %{!?_with_libsamplerate:--without-libsamplerate} \ %{?_with_musicbrainz} %{!?_with_musicbrainz:--without-musicbrainz} \ - %{?_with_polypaudio} %{!?_with_polypaudio:--without-polypaudio} \ %{?_with_taglib} %{!?_with_taglib:--without-taglib} \ %{?_with_xine} %{!?_with_xine:--without-xine} @@ -251,13 +238,13 @@ %endif %if "%{?extras}" == "1" -for module in arts akode_artsplugin juk kfile-plugins/flac kfile-plugins/mpc ; do +for module in arts akode_artsplugin juk kfile-plugins/flac kfile-plugins/mpc xine_artsplugin ; do make %{?_smp_mflags} -C $module done %endif %if "%{?nonfree}" == "1" -for module in arts akode_artsplugin kfile-plugins/mp3 kfile-plugins/mpeg krec krec/mp3_export mpeglib mpeglib_artsplug xine_artsplugin ; do +for module in arts akode_artsplugin kfile-plugins/mp3 kfile-plugins/mpeg krec krec/mp3_export mpeglib mpeglib_artsplug ; do make %{?_smp_mflags} -C $module done %endif @@ -267,52 +254,26 @@ rm -rf $RPM_BUILD_ROOT %if "%{?core}" == "1" -make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT %endif %if "%{?extras}" == "1" -for module in akode_artsplugin juk kfile-plugins/flac kfile-plugins/mpc ; do -make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT -C $module -done - -desktop-file-install \ - --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \ - --add-category="X-Fedora" --vendor="" \ - $RPM_BUILD_ROOT%{_datadir}/applications/kde/juk.desktop - -%if "%{?debug}" == "1" -# Conflicts check (debuging only) -find $RPM_BUILD_ROOT -type f -o -type l | sed -e "s|$RPM_BUILD_ROOT||" | while read FILE -do - if [ -f ${FILE} -o -L ${FILE} ]; then - echo "WARNING: $FILE conflicts (already installed)" # && rm -f $RPM_BUILD_ROOT${FILE} - fi +for module in akode_artsplugin juk kfile-plugins/flac kfile-plugins/mpc xine_artsplugin ; do +make install DESTDIR=$RPM_BUILD_ROOT -C $module done -%endif -# file list (naive) -find $RPM_BUILD_ROOT -type f -o -type l | sed -e "s|$RPM_BUILD_ROOT||" | grep -v '.debug$' > extras.list +## Remove/uninstall (conflicting) bits we don't want +rm -f $RPM_BUILD_ROOT%{_libdir}/mcop/akodeMPEGPlayObject.mcopclass %endif %if "%{?nonfree}" == "1" -for module in akode_artsplugin kfile-plugins/mp3 kfile-plugins/mpeg krec/mp3_export mpeglib mpeglib_artsplug xine_artsplugin ; do -make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT -C $module +for module in akode_artsplugin kfile-plugins/mp3 kfile-plugins/mpeg krec/mp3_export mpeglib mpeglib_artsplug ; do +make install DESTDIR=$RPM_BUILD_ROOT -C $module done ## Remove/unstinstall (conflicting) bits we don't want # -extras bits rm -f $RPM_BUILD_ROOT%{_libdir}/mcop/akodearts.mcop{class,type} rm -f $RPM_BUILD_ROOT%{_libdir}/mcop/akode{,MPC,SpeexStream,VorbisStream,Xiph}PlayObject.mcopclass rm -f $RPM_BUILD_ROOT%{_libdir}/libarts_akode.* -%if "%{?debug}" == "1" -# Conflicts check (debuging only) -find $RPM_BUILD_ROOT -type f -o -type l| sed -e "s|$RPM_BUILD_ROOT||" | while read FILE -do - if [ -f ${FILE} -o -L ${FILE} ]; then - echo "WARNING: $FILE conflicts (already installed)" # && rm -f $RPM_BUILD_ROOT${FILE} - fi -done -%endif -## (regen) file list (naive) -find $RPM_BUILD_ROOT -type f -o -type l| sed -e "s|$RPM_BUILD_ROOT||" | grep -v '.debug$' | grep -v "%{_includedir}" > nonfree.list %endif ## File lists @@ -334,9 +295,24 @@ fi done fi - mv %{name}.lang %{name}.list -# Handle .la, .so files (v0.6) + +## remove references to optional external libraries in .la files (#178734) +find $RPM_BUILD_ROOT%{_libdir} -name "*.la" | xargs \ + sed -i \ + -e "s at -lasound@@g" \ + -e "s at -laudiofile@@g" \ + -e "s at -lvorbisfile@@g" \ + -e "s at -lvorbisenc@@g" \ + -e "s at -lvorbis@@g" \ + -e "s at -logg@@g" \ + -e "s@%{_libdir}/libltdl.la@@g" + +# Die, die, die, requires patched kdelibs -- Rex +rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/libkdeinit_*.la + +# Handle .la, .so files (v0.7) [ ! -f %{name}.list ] && echo "%defattr(-,root,root,-)" > %{name}.list [ ! -f devel.list ] && echo "%defattr(-,root,root,-)" > devel.list for solib in ${RPM_BUILD_ROOT}%{_libdir}/*.so* ; do @@ -346,8 +322,6 @@ if [ "${soname}" == "${base}.so" ]; then echo "%{_libdir}/${soname}" >> devel.list if [ -f ${RPM_BUILD_ROOT}%{_libdir}/${base}.la ]; then - ## Should be able to omit these, but that's not always true -- Rex - #echo "%exclude %{_libdir}/${base}.la" >> devel.list echo "%{_libdir}/${base}.la" >> devel.list fi else @@ -364,51 +338,34 @@ done -## remove references to optional external libraries in .la files (#178734) -# alsa-lib/asound -sed -i -e "s at -lasound@@g" $RPM_BUILD_ROOT%{_libdir}/*.la -# audiofile -sed -i -e "s at -laudiofile@@g" $RPM_BUILD_ROOT%{_libdir}/*.la -# ogg/vorbis -sed -i -e "s at -lvorbisfile@@g" $RPM_BUILD_ROOT%{_libdir}/*.la -sed -i -e "s at -lvorbisenc@@g" $RPM_BUILD_ROOT%{_libdir}/*.la -sed -i -e "s at -lvorbis@@g" $RPM_BUILD_ROOT%{_libdir}/*.la -sed -i -e "s at -logg@@g" $RPM_BUILD_ROOT%{_libdir}/*.la -# if built without --without-libltdl: /usr/lib/libltdl.la -sed -i -e "s@%{_libdir}/libltdl.la@@g" $RPM_BUILD_ROOT%{_libdir}/lib*.la ||: - %if "%{?core}" == "1" %post /sbin/ldconfig ||: -for icon_theme in crystalsvg hicolor locolor ; do - touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: - gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: -done -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : +%{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : +%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +%{_bindir}/xdg-icon-resource forceupdate --theme locolor 2> /dev/null || : +%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || : %postun /sbin/ldconfig ||: -for icon_theme in crystalsvg hicolor locolor ; do - touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: - gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: -done -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : +%{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : +%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +%{_bindir}/xdg-icon-resource forceupdate --theme locolor 2> /dev/null || : +%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || : %endif -%if "%{?extras}" == "1" +%if "%{?extras}" == "1" %post -for icon_theme in crystalsvg hicolor ; do - touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: - gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: -done +%{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : +%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || : %postun -for icon_theme in crystalsvg hicolor ; do - touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: - gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: -done +%{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : +%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || : %endif %if "%{?nonfree}" == "1" @@ -426,7 +383,7 @@ %files -f %{name}.list %defattr(-,root,root,-) %doc AUTHORS COPYING README -%{_libdir}/lib*.* +%{_libdir}/lib*.so.* %{_bindir}/* # Own dir(s) until owned by kdelibs? -- Rex %{_sysconfdir}/xdg/menus/applications-merged/ @@ -449,7 +406,6 @@ %endif %if "%{?extras}" == "1" -#files -f extras.list %files %defattr(-,root,root,-) %doc AUTHORS COPYING README @@ -475,10 +431,19 @@ %{_libdir}/mcop/akodeXiphPlayObject.mcopclass %{_libdir}/mcop/akodearts.mcopclass %{_libdir}/mcop/akodearts.mcoptype +## xine_artsplugin (free bits) +%{_libdir}/libarts_xine.[ls][ao] +%{_libdir}/libarts_xine.so.* +%{_libdir}/kde3/videothumbnail.[ls][ao] +%{_datadir}/apps/videothumbnail/ +%{_datadir}/services/videothumbnail.desktop + +# FIXME: split these into extras/extras-nonfree bits +%{_libdir}/mcop/xineAudioPlayObject.mcopclass +%{_libdir}/mcop/xineVideoPlayObject.mcopclass %endif %if "%{?nonfree}" == "1" -#files -f nonfree.list %files %defattr(-,root,root,-) %doc AUTHORS COPYING README @@ -491,14 +456,11 @@ %{_libdir}/kde3/kfile_mp3.[ls][ao] %{_libdir}/kde3/kfile_mpeg.[ls][ao] %{_libdir}/kde3/libkrecexport_mp3.[ls][ao] -%{_libdir}/kde3/videothumbnail.[ls][ao] %{_libdir}/libyafcore.[ls][ao] %{_libdir}/libyafxplayer.[ls][ao] -%{_datadir}/apps/videothumbnail/ %{_datadir}/services/kfile_mp3.desktop %{_datadir}/services/kfile_mpeg.desktop %{_datadir}/services/krec_exportmp3.desktop -%{_datadir}/services/videothumbnail.desktop # (akode|mpeglib|xine)_artsplugin (nonfree bits) #files artsplugin @@ -506,7 +468,6 @@ %{_bindir}/mpeglibartsplay %{_libdir}/libarts_mpeglib-0.3.0.so.* %{_libdir}/libarts_splay.so.* -%{_libdir}/libarts_xine.so.* %{_libdir}/libmpeg-0.3.0.so %{_libdir}/mcop/CDDAPlayObject.mcopclass %{_libdir}/mcop/MP3PlayObject.mcopclass @@ -517,18 +478,15 @@ %{_libdir}/mcop/akodeMPEGPlayObject.mcopclass ## FIXME, there has to be a better way of catching/conditionalizing this ## ie, to determine if akode-extras in use was built with ffmpeg support -- Rex -%if "%{?fedora}" > "4" +%if 0%{?fedora} > 4 %{_libdir}/mcop/akodeFFMPEGPlayObject.mcopclass %endif -%{_libdir}/mcop/xineAudioPlayObject.mcopclass -%{_libdir}/mcop/xineVideoPlayObject.mcopclass ## FIXME -- Rex #files devel #defattr(-,root,root,-) %{_libdir}/libarts_mpeglib.[ls][ao] %{_libdir}/libarts_splay.[ls][ao] -%{_libdir}/libarts_xine.[ls][ao] %{_libdir}/libmpeg.[ls][ao] %{_includedir}/kde/mpeglib/ %{_includedir}/kde/mpeglib_artsplug/ @@ -540,6 +498,18 @@ %changelog +* Sat Jan 20 2007 Rex Dieter 6:3.5.6-2 +- use gst 0.10 instead of gst08 (where available) + +* Tue Jan 16 2007 Rex Dieter 6:3.5.6-1 +- kde-3.5.6 + +* Mon Dec 18 2006 Rex Dieter 6:3.5.5-4 +- -extras: include xine_artsplugin here (instead of -extras-nonfree) + +* Wed Dec 13 2006 Rex Dieter 6:3.5.5-3 +- Requires(post,postun): xdg-utils + * Wed Nov 01 2006 Rex Dieter 6:3.5.5-0.3 - use kdemultimedia-3.5.5-patched.tar.bz2 (from core pkg) Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 1 Nov 2006 18:32:36 -0000 1.6 +++ sources 12 Feb 2007 19:41:51 -0000 1.7 @@ -1 +1 @@ -7439844e5105091e2b93b3821d999da5 kdemultimedia-3.5.5-patched.tar.bz2 +bbbf0d6f568242b3bd3a232895a9663c kdemultimedia-3.5.6-patched.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 12 19:57:04 2007 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Mon, 12 Feb 2007 14:57:04 -0500 Subject: rpms/basket/FC-6 .cvsignore, 1.3, 1.4 basket.spec, 1.9, 1.10 sources, 1.3, 1.4 Message-ID: <200702121957.l1CJv4f7021699@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/basket/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21661/FC-6 Modified Files: .cvsignore basket.spec sources Log Message: version 1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/basket/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 25 Oct 2006 20:03:12 -0000 1.3 +++ .cvsignore 12 Feb 2007 19:56:32 -0000 1.4 @@ -1 +1 @@ -basket-0.6.0.tar.gz +basket-1.0.tar.gz Index: basket.spec =================================================================== RCS file: /cvs/extras/rpms/basket/FC-6/basket.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- basket.spec 25 Oct 2006 20:03:12 -0000 1.9 +++ basket.spec 12 Feb 2007 19:56:32 -0000 1.10 @@ -1,15 +1,16 @@ Name: basket Summary: Notes taker for KDE -Version: 0.6.0 +Version: 1.0 Release: 1%{?dist} -URL: http://basket.kde.org/ -Source0: http://basket.kde.org/downloads/basket-0.6.0.tar.gz +URL: http://basket.kde.org/ +Source0: http://basket.kde.org/downloads/basket-%{version}.tar.gz License: GPL Group: Applications/Productivity BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs-devel, desktop-file-utils, gamin-devel -Requires: kdebase >= 3.0 +BuildRequires: gpgme-devel, kdepim-devel +Requires: kdebase >= 3.0, hicolor-icon-theme %description This application is mainly an all-purpose notes taker. It provides baskets @@ -24,8 +25,6 @@ %build unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh -# work around an improper ${kdelibsuff} -export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include %configure --disable-rpath --disable-debug make %{?_smp_mflags} @@ -43,8 +42,6 @@ desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --delete-original \ - --add-category Application \ - --add-category X-Fedora \ --add-category Utility \ --add-category Qt \ --add-category KDE \ @@ -66,12 +63,14 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi +update-desktop-database &> /dev/null ||: %postun touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi +update-desktop-database &> /dev/null ||: %clean @@ -84,15 +83,28 @@ %{_bindir}/basket %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/actions/*.png +%{_datadir}/icons/hicolor/*/mimetypes/*.png %{_datadir}/icons/hicolor/*/apps/%{name}.* %{_datadir}/apps/basket %{_libdir}/kde3/kcm_basket.* %{_libdir}/kde3/libbasketpart.* +%{_libdir}/kde3/basketthumbcreator.* +%{_libdir}/kde3/libkontact_basket.* %{_libdir}/libbasketcommon.so %{_datadir}/services/*.desktop +%{_datadir}/config/magic/basket.magic +%{_datadir}/mimelnk/application/*.desktop +# Kontact +%{_datadir}/apps/kontact/ksettingsdialog/kontact_basketplugin.setdlg +%{_datadir}/services/kontact/*.desktop + + %changelog +* Mon Feb 12 2007 Aurelien Bompard 1.0-1 +- version 1.0 + * Wed Oct 25 2006 Aurelien Bompard 0.6.0-1 - version 0.6.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/basket/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 25 Oct 2006 20:03:12 -0000 1.3 +++ sources 12 Feb 2007 19:56:32 -0000 1.4 @@ -1 +1 @@ -968072a1c1dce84a0c6f8b72bd9b65b8 basket-0.6.0.tar.gz +c1a563e1fe7394b04836e95d19180b2c basket-1.0.tar.gz From fedora-extras-commits at redhat.com Mon Feb 12 19:57:07 2007 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Mon, 12 Feb 2007 14:57:07 -0500 Subject: rpms/basket/devel .cvsignore, 1.3, 1.4 basket.spec, 1.9, 1.10 sources, 1.3, 1.4 Message-ID: <200702121957.l1CJv7Aa021704@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/basket/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21661/devel Modified Files: .cvsignore basket.spec sources Log Message: version 1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/basket/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 25 Oct 2006 20:03:14 -0000 1.3 +++ .cvsignore 12 Feb 2007 19:56:35 -0000 1.4 @@ -1 +1 @@ -basket-0.6.0.tar.gz +basket-1.0.tar.gz Index: basket.spec =================================================================== RCS file: /cvs/extras/rpms/basket/devel/basket.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- basket.spec 25 Oct 2006 20:03:14 -0000 1.9 +++ basket.spec 12 Feb 2007 19:56:35 -0000 1.10 @@ -1,15 +1,16 @@ Name: basket Summary: Notes taker for KDE -Version: 0.6.0 +Version: 1.0 Release: 1%{?dist} -URL: http://basket.kde.org/ -Source0: http://basket.kde.org/downloads/basket-0.6.0.tar.gz +URL: http://basket.kde.org/ +Source0: http://basket.kde.org/downloads/basket-%{version}.tar.gz License: GPL Group: Applications/Productivity BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs-devel, desktop-file-utils, gamin-devel -Requires: kdebase >= 3.0 +BuildRequires: gpgme-devel, kdepim-devel +Requires: kdebase >= 3.0, hicolor-icon-theme %description This application is mainly an all-purpose notes taker. It provides baskets @@ -24,8 +25,6 @@ %build unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh -# work around an improper ${kdelibsuff} -export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include %configure --disable-rpath --disable-debug make %{?_smp_mflags} @@ -43,8 +42,6 @@ desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --delete-original \ - --add-category Application \ - --add-category X-Fedora \ --add-category Utility \ --add-category Qt \ --add-category KDE \ @@ -66,12 +63,14 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi +update-desktop-database &> /dev/null ||: %postun touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi +update-desktop-database &> /dev/null ||: %clean @@ -84,15 +83,28 @@ %{_bindir}/basket %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/actions/*.png +%{_datadir}/icons/hicolor/*/mimetypes/*.png %{_datadir}/icons/hicolor/*/apps/%{name}.* %{_datadir}/apps/basket %{_libdir}/kde3/kcm_basket.* %{_libdir}/kde3/libbasketpart.* +%{_libdir}/kde3/basketthumbcreator.* +%{_libdir}/kde3/libkontact_basket.* %{_libdir}/libbasketcommon.so %{_datadir}/services/*.desktop +%{_datadir}/config/magic/basket.magic +%{_datadir}/mimelnk/application/*.desktop +# Kontact +%{_datadir}/apps/kontact/ksettingsdialog/kontact_basketplugin.setdlg +%{_datadir}/services/kontact/*.desktop + + %changelog +* Mon Feb 12 2007 Aurelien Bompard 1.0-1 +- version 1.0 + * Wed Oct 25 2006 Aurelien Bompard 0.6.0-1 - version 0.6.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/basket/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 25 Oct 2006 20:03:14 -0000 1.3 +++ sources 12 Feb 2007 19:56:35 -0000 1.4 @@ -1 +1 @@ -968072a1c1dce84a0c6f8b72bd9b65b8 basket-0.6.0.tar.gz +c1a563e1fe7394b04836e95d19180b2c basket-1.0.tar.gz From fedora-extras-commits at redhat.com Mon Feb 12 20:33:31 2007 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 12 Feb 2007 15:33:31 -0500 Subject: rpms/kdemultimedia-extras/devel kdemultimedia-extras.spec, 1.14, 1.15 Message-ID: <200702122033.l1CKXVjR025357@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdemultimedia-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25340 Modified Files: kdemultimedia-extras.spec Log Message: * Mon Feb 12 2007 Rex Dieter 6:3.5.6-3 - -extras: move kfile_mp3 here (no decoding, only metadata via taglib) - -extras: Conflicts: kdemultimedia-extras-nonfree < 3.5.6-3 (to highlight move of xine_artsplugin, kfile_mp3 from there) Index: kdemultimedia-extras.spec =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/devel/kdemultimedia-extras.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- kdemultimedia-extras.spec 12 Feb 2007 19:41:51 -0000 1.14 +++ kdemultimedia-extras.spec 12 Feb 2007 20:32:59 -0000 1.15 @@ -26,6 +26,8 @@ %define _with_libsamplerate --with-libsamplerate %define _with_taglib --with-taglib %define _with_xine --with-xine +# moved xine_artsplugin,kfile_mp3 from there -- Rex +Conflicts: kdemultimedia-extras-nonfree < 6:3.5.6-3 %endif %if "%{?nonfree}" == "1" @@ -62,7 +64,7 @@ Epoch: 6 #endif Version: 3.5.6 -Release: 2%{?dist}%{?kde} +Release: 3%{?dist}%{?kde} License: GPL %if "%{?patched:1}" == "1" @@ -152,7 +154,7 @@ %{summary}, including: * akode_artsplugin (akode) * juk %{?_with_musicbrainz:(libtunepimp)} -* kfile-plugins: flac, mpc (taglib) +* kfile-plugins: flac, mp3 (taglib), mpc (taglib) * xine_artsplugin (xine-lib) %endif @@ -165,7 +167,7 @@ %description %{summary}, including: * akode_artsplugin (akode-extras), -* kfile-plugins: mp3 (taglib), mpeg +* kfile-plugins: mpeg * krec mp3 export (lame), * mpeglib_artsplugin, %endif @@ -238,13 +240,13 @@ %endif %if "%{?extras}" == "1" -for module in arts akode_artsplugin juk kfile-plugins/flac kfile-plugins/mpc xine_artsplugin ; do +for module in arts akode_artsplugin juk kfile-plugins/flac kfile-plugins/mp3 kfile-plugins/mpc xine_artsplugin ; do make %{?_smp_mflags} -C $module done %endif %if "%{?nonfree}" == "1" -for module in arts akode_artsplugin kfile-plugins/mp3 kfile-plugins/mpeg krec krec/mp3_export mpeglib mpeglib_artsplug ; do +for module in arts akode_artsplugin kfile-plugins/mpeg krec krec/mp3_export mpeglib mpeglib_artsplug ; do make %{?_smp_mflags} -C $module done %endif @@ -258,7 +260,7 @@ %endif %if "%{?extras}" == "1" -for module in akode_artsplugin juk kfile-plugins/flac kfile-plugins/mpc xine_artsplugin ; do +for module in akode_artsplugin juk kfile-plugins/flac kfile-plugins/mp3 kfile-plugins/mpc xine_artsplugin ; do make install DESTDIR=$RPM_BUILD_ROOT -C $module done ## Remove/uninstall (conflicting) bits we don't want @@ -266,7 +268,7 @@ %endif %if "%{?nonfree}" == "1" -for module in akode_artsplugin kfile-plugins/mp3 kfile-plugins/mpeg krec/mp3_export mpeglib mpeglib_artsplug ; do +for module in akode_artsplugin kfile-plugins/mpeg krec/mp3_export mpeglib mpeglib_artsplug ; do make install DESTDIR=$RPM_BUILD_ROOT -C $module done ## Remove/unstinstall (conflicting) bits we don't want @@ -419,8 +421,10 @@ # kfile-plugins %{_libdir}/kde3/kfile_flac.* %{_libdir}/kde3/kfile_mpc.* +%{_libdir}/kde3/kfile_mp3.* %{_datadir}/services/kfile_flac.desktop %{_datadir}/services/kfile_mpc.desktop +%{_datadir}/services/kfile_mp3.desktop # akode_artsplugin (free bits) %{_libdir}/libarts_akode.[ls][ao] %{_libdir}/libarts_akode.so.* @@ -453,12 +457,10 @@ %{_bindir}/yaf-tplay %{_bindir}/yaf-vorbis %{_bindir}/yaf-yuv -%{_libdir}/kde3/kfile_mp3.[ls][ao] %{_libdir}/kde3/kfile_mpeg.[ls][ao] %{_libdir}/kde3/libkrecexport_mp3.[ls][ao] %{_libdir}/libyafcore.[ls][ao] %{_libdir}/libyafxplayer.[ls][ao] -%{_datadir}/services/kfile_mp3.desktop %{_datadir}/services/kfile_mpeg.desktop %{_datadir}/services/krec_exportmp3.desktop @@ -498,6 +500,11 @@ %changelog +* Mon Feb 12 2007 Rex Dieter 6:3.5.6-3 +- -extras: move kfile_mp3 here (no decoding, only metadata via taglib) +- -extras: Conflicts: kdemultimedia-extras-nonfree < 3.5.6-3 + (to highlight move of xine_artsplugin, kfile_mp3 from there) + * Sat Jan 20 2007 Rex Dieter 6:3.5.6-2 - use gst 0.10 instead of gst08 (where available) From fedora-extras-commits at redhat.com Mon Feb 12 21:16:02 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?= (sindrepb)) Date: Mon, 12 Feb 2007 16:16:02 -0500 Subject: rpms/gtranslator/devel gtranslator.spec,1.13,1.14 sources,1.5,1.6 Message-ID: <200702122116.l1CLG25X029209@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/gtranslator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29177 Modified Files: gtranslator.spec sources Log Message: Update to 1.1.7 Index: gtranslator.spec =================================================================== RCS file: /cvs/extras/rpms/gtranslator/devel/gtranslator.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gtranslator.spec 23 Jan 2007 21:27:18 -0000 1.13 +++ gtranslator.spec 12 Feb 2007 21:15:30 -0000 1.14 @@ -1,24 +1,25 @@ -Name: gtranslator -Version: 1.1.6 -Release: 5%{?dist} - -Summary: Gettext po file editor for GNOME - -Group: Development/Tools -License: GPL -URL: http://gtranslator.sourceforge.net -Source0: http://dl.sf.net/gtranslator/gtranslator-1.1.6.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: scrollkeeper -BuildRequires: desktop-file-utils -BuildRequires: gettext -BuildRequires: libgnomeui-devel +Name: gtranslator +Version: 1.1.7 +Release: 1%{?dist} + +Summary: Gettext po file editor for GNOME + +Group: Development/Tools +License: GPL +URL: http://gtranslator.sourceforge.net +Source0: http://ftp.gnome.org/pub/GNOME/sources/gtranslator/1.1/%{name}-%{version}.tar.bz2 +Patch0: %{name}-%{version}-desktop.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: scrollkeeper +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: libgnomeui-devel BuildRequires: gtkspell-devel -BuildRequires:perl(XML::Parser) +BuildRequires: perl(XML::Parser) -Requires(post): scrollkeeper -Requires(postun): scrollkeeper +Requires(post): scrollkeeper +Requires(postun): scrollkeeper %description gtranslator is an enhanced gettext po file editor for the GNOME @@ -28,7 +29,8 @@ %prep -%setup -q +%setup -q +%patch0 -p1 %build %configure @@ -38,12 +40,12 @@ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -desktop-file-install \ - --vendor fedora \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category X-Fedora \ - --delete-original \ - $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop + +desktop-file-install --vendor fedora --delete-original \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --remove-category Application \ + $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop + %find_lang %{name} rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper/ @@ -54,10 +56,6 @@ ln doc/UMTF/ChangeLog ChangeLog.UMTF -%check || : -make check - - %clean rm -rf $RPM_BUILD_ROOT @@ -71,7 +69,7 @@ %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO +%doc AUTHORS COPYING NEWS README THANKS TODO %doc doc/UMTF/README.UMTF ChangeLog.UMTF doc/UMTF/example.xml %{_bindir}/* %{_datadir}/gnome/help/gtranslator @@ -81,12 +79,13 @@ %{_datadir}/omf/gtranslator %{_datadir}/pixmaps/*.png %{_datadir}/pixmaps/gtranslator -%{_mandir}/man[^3]/* +%{_mandir}/man?/* %changelog -* Tue Jan 23 2007 Sindre Pedersen Bj??rdal 1.1.6-5 -- Rebuild to resurrect +* Mon Jan 22 2007 Sindre Pedersen Bj??rdal 1.1.7-1 +- Take over ownership of package +- Update to 1.1.7 * Mon Feb 13 2006 Roozbeh Pournader 1.1.6-3 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtranslator/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 23 Jan 2007 21:22:11 -0000 1.5 +++ sources 12 Feb 2007 21:15:30 -0000 1.6 @@ -1 +1 @@ -44b3c0f79cd282f63713b504d3c4f696 gtranslator-1.1.6.tar.gz +8c850ad0c897ca41c7c9552de45011bf gtranslator-1.1.7-desktop.patch From fedora-extras-commits at redhat.com Mon Feb 12 21:18:05 2007 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Mon, 12 Feb 2007 16:18:05 -0500 Subject: rpms/tilda Makefile,NONE,1.1 import.log,NONE,1.1 pkg.acl,NONE,1.1 Message-ID: <200702122118.l1CLI5p0029327@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/tilda In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvso29303/rpms/tilda Added Files: Makefile import.log pkg.acl Log Message: Setup of module tilda --- NEW FILE Makefile --- # Top level Makefile for module tilda all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Mon Feb 12 21:18:07 2007 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Mon, 12 Feb 2007 16:18:07 -0500 Subject: rpms/tilda/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702122118.l1CLI74Y029344@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/tilda/devel In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvso29303/rpms/tilda/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module tilda --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: tilda # $Id: Makefile,v 1.1 2007/02/12 21:18:05 wtogami Exp $ NAME := tilda SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Feb 12 21:45:37 2007 From: fedora-extras-commits at redhat.com (Josef Whiter (josef)) Date: Mon, 12 Feb 2007 16:45:37 -0500 Subject: rpms/tilda/devel tilda-segfault-fix.patch, NONE, 1.1 tilda.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702122145.l1CLjbcc029888@cvs-int.fedora.redhat.com> Author: josef Update of /cvs/extras/rpms/tilda/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29841/devel Modified Files: .cvsignore sources Added Files: tilda-segfault-fix.patch tilda.spec Log Message: auto-import tilda-0.9.4-6 on branch devel from tilda-0.9.4-6.src.rpm tilda-segfault-fix.patch: --- NEW FILE tilda-segfault-fix.patch --- --- tilda-0.9.4/src/key_grabber.c.josef 2007-01-22 11:43:36.000000000 -0500 +++ tilda-0.9.4/src/key_grabber.c 2007-01-22 11:43:49.000000000 -0500 @@ -241,8 +241,10 @@ static void key_grab (tilda_window *tw) if (strstr(tmp_key, "None")) modmask = 0; - if (!strstr(tmp_key, "+")) + if (!strstr(tmp_key, "+")) { perror ("Key Incorrect -- Read the README or tilda.sf.net for info, rerun as 'tilda -C' to set keybinding\n"); + return; + } if (strtok(tmp_key, "+")) key = XStringToKeysym(strtok(NULL, "+")); --- NEW FILE tilda.spec --- Name: tilda Version: 0.9.4 Release: 6%{?dist} Summary: A quake like terminal for GNOME Group: Applications/System License: GPL URL: http://tilda.sourceforge.net/ Source0: http://downloads.sourceforge.net/tilda/%{name}-%{version}.tar.gz Patch0: tilda-segfault-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils, pango-devel, vte-devel BuildRequires: libconfuse-devel, libXt-devel %description Tilda is a Linux terminal taking after the likeness of many classic terminals from first person shooter games, Quake, Doom and Half-Life (to name a few), where the terminal has no border and is hidden from the desktop until a key is pressed. %prep %setup -q %patch0 -p1 -b .segfix echo "Comment=A quake like terminal for GNOME" >> tilda.desktop %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install --delete-original --vendor="fedora" \ --dir=$RPM_BUILD_ROOT/%{_datadir}/applications \ --mode 0644 \ --remove-category="Application" \ --copy-name-to-generic-name \ $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop install -D -p -m 644 %{name}.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS COPYING README ChangeLog TODO %{_bindir}/%{name} %{_datadir}/pixmaps/%{name}.png %{_datadir}/icons/hicolor/48x48/apps/%{name}.png %{_datadir}/applications/fedora-%{name}.desktop %changelog * Mon Jan 22 2007 Josef Whiter 0.9.4-6 - fix segfault when specifying invalid keybinding * Mon Jan 22 2007 Josef Whiter 0.9.4-5 - install icon into the size specific folder as well * Mon Jan 22 2007 Josef Whiter 0.9.4-4 - fixed changelog entry - removed NEWS from the %%doc section - removed gettext from the BR - added libXt-devel as a BR - added --remove-category and --copy-name-to-generic name to the desktop-file-install - added a comment to the desktop file * Fri Jan 12 2007 Josef Whiter 0.9.4-3 - Removed my ghetto doc install script and added %%doc section * Thu Jan 11 2007 Josef Whiter 0.9.4-2 - Added BR for libconfuse-devel * Thu Jan 11 2007 Josef Whiter 0.9.4-1 - Initial Release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tilda/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Feb 2007 21:18:05 -0000 1.1 +++ .cvsignore 12 Feb 2007 21:45:05 -0000 1.2 @@ -0,0 +1 @@ +tilda-0.9.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tilda/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Feb 2007 21:18:05 -0000 1.1 +++ sources 12 Feb 2007 21:45:05 -0000 1.2 @@ -0,0 +1 @@ +773d47e3985f7e778b662a38b053c1df tilda-0.9.4.tar.gz From fedora-extras-commits at redhat.com Mon Feb 12 21:45:34 2007 From: fedora-extras-commits at redhat.com (Josef Whiter (josef)) Date: Mon, 12 Feb 2007 16:45:34 -0500 Subject: rpms/tilda import.log,1.1,1.2 Message-ID: <200702122145.l1CLjYqP029884@cvs-int.fedora.redhat.com> Author: josef Update of /cvs/extras/rpms/tilda In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29841 Modified Files: import.log Log Message: auto-import tilda-0.9.4-6 on branch devel from tilda-0.9.4-6.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/tilda/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 12 Feb 2007 21:18:03 -0000 1.1 +++ import.log 12 Feb 2007 21:45:02 -0000 1.2 @@ -0,0 +1 @@ +tilda-0_9_4-6:HEAD:tilda-0.9.4-6.src.rpm:1171316738 From fedora-extras-commits at redhat.com Mon Feb 12 21:50:01 2007 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Mon, 12 Feb 2007 16:50:01 -0500 Subject: rpms/dnsmasq/devel .cvsignore, 1.9, 1.10 dnsmasq.spec, 1.17, 1.18 sources, 1.9, 1.10 Message-ID: <200702122150.l1CLo1r9029967@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29942 Modified Files: .cvsignore dnsmasq.spec sources Log Message: * Mon Feb 12 2007 Patrick "Jima" Laughton 2.38-1 - New upstream version with bugfix for potential hang Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 6 Feb 2007 19:56:31 -0000 1.9 +++ .cvsignore 12 Feb 2007 21:49:28 -0000 1.10 @@ -1 +1 @@ -dnsmasq-2.37.tar.gz +dnsmasq-2.38.tar.gz Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/devel/dnsmasq.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- dnsmasq.spec 6 Feb 2007 19:56:31 -0000 1.17 +++ dnsmasq.spec 12 Feb 2007 21:49:28 -0000 1.18 @@ -1,5 +1,5 @@ Name: dnsmasq -Version: 2.37 +Version: 2.38 Release: 1%{?dist} Summary: A lightweight DHCP/caching DNS server @@ -92,6 +92,9 @@ %changelog +* Mon Feb 12 2007 Patrick "Jima" Laughton 2.38-1 +- New upstream version with bugfix for potential hang + * Tue Feb 06 2007 Patrick "Jima" Laughton 2.37-1 - New upstream version Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 6 Feb 2007 19:56:31 -0000 1.9 +++ sources 12 Feb 2007 21:49:28 -0000 1.10 @@ -1 +1 @@ -e105a41cdf5adb8b615f0a06eb17ecb9 dnsmasq-2.37.tar.gz +ab066a97c226066485ad20e5ad5ce424 dnsmasq-2.38.tar.gz From fedora-extras-commits at redhat.com Mon Feb 12 22:00:15 2007 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Mon, 12 Feb 2007 17:00:15 -0500 Subject: rpms/dnsmasq/FC-6 dnsmasq.spec,1.15,1.16 sources,1.8,1.9 Message-ID: <200702122200.l1CM0FMN030184@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30165 Modified Files: dnsmasq.spec sources Log Message: * Mon Feb 12 2007 Patrick "Jima" Laughton 2.38-1 - New upstream version with bugfix for potential hang Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-6/dnsmasq.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- dnsmasq.spec 9 Feb 2007 17:17:07 -0000 1.15 +++ dnsmasq.spec 12 Feb 2007 21:59:42 -0000 1.16 @@ -1,5 +1,5 @@ Name: dnsmasq -Version: 2.37 +Version: 2.38 Release: 1%{?dist} Summary: A lightweight DHCP/caching DNS server @@ -92,6 +92,9 @@ %changelog +* Mon Feb 12 2007 Patrick "Jima" Laughton 2.38-1 +- New upstream version with bugfix for potential hang + * Tue Feb 06 2007 Patrick "Jima" Laughton 2.37-1 - New upstream version Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-6/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 9 Feb 2007 17:17:07 -0000 1.8 +++ sources 12 Feb 2007 21:59:42 -0000 1.9 @@ -1 +1 @@ -e105a41cdf5adb8b615f0a06eb17ecb9 dnsmasq-2.37.tar.gz +ab066a97c226066485ad20e5ad5ce424 dnsmasq-2.38.tar.gz From fedora-extras-commits at redhat.com Mon Feb 12 22:01:27 2007 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Mon, 12 Feb 2007 17:01:27 -0500 Subject: rpms/dnsmasq/FC-5 dnsmasq.spec,1.10,1.11 sources,1.8,1.9 Message-ID: <200702122201.l1CM1Rvm001152@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30232 Modified Files: dnsmasq.spec sources Log Message: * Mon Feb 12 2007 Patrick "Jima" Laughton 2.38-1 - New upstream version with bugfix for potential hang Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-5/dnsmasq.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- dnsmasq.spec 9 Feb 2007 17:20:33 -0000 1.10 +++ dnsmasq.spec 12 Feb 2007 22:00:54 -0000 1.11 @@ -1,5 +1,5 @@ Name: dnsmasq -Version: 2.37 +Version: 2.38 Release: 1%{?dist} Summary: A lightweight DHCP/caching DNS server @@ -92,6 +92,9 @@ %changelog +* Mon Feb 12 2007 Patrick "Jima" Laughton 2.38-1 +- New upstream version with bugfix for potential hang + * Tue Feb 06 2007 Patrick "Jima" Laughton 2.37-1 - New upstream version Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 9 Feb 2007 17:20:33 -0000 1.8 +++ sources 12 Feb 2007 22:00:54 -0000 1.9 @@ -1 +1 @@ -e105a41cdf5adb8b615f0a06eb17ecb9 dnsmasq-2.37.tar.gz +ab066a97c226066485ad20e5ad5ce424 dnsmasq-2.38.tar.gz From fedora-extras-commits at redhat.com Mon Feb 12 22:02:25 2007 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Mon, 12 Feb 2007 17:02:25 -0500 Subject: rpms/dnsmasq/EL-5 dnsmasq.spec,1.16,1.17 sources,1.8,1.9 Message-ID: <200702122202.l1CM2PWv001223@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1198 Modified Files: dnsmasq.spec sources Log Message: * Mon Feb 12 2007 Patrick "Jima" Laughton 2.38-1 - New upstream version with bugfix for potential hang Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/EL-5/dnsmasq.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- dnsmasq.spec 9 Feb 2007 19:47:34 -0000 1.16 +++ dnsmasq.spec 12 Feb 2007 22:01:53 -0000 1.17 @@ -1,5 +1,5 @@ Name: dnsmasq -Version: 2.37 +Version: 2.38 Release: 1%{?dist} Summary: A lightweight DHCP/caching DNS server @@ -92,6 +92,9 @@ %changelog +* Mon Feb 12 2007 Patrick "Jima" Laughton 2.38-1 +- New upstream version with bugfix for potential hang + * Tue Feb 06 2007 Patrick "Jima" Laughton 2.37-1 - New upstream version Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/EL-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 9 Feb 2007 19:47:34 -0000 1.8 +++ sources 12 Feb 2007 22:01:53 -0000 1.9 @@ -1 +1 @@ -e105a41cdf5adb8b615f0a06eb17ecb9 dnsmasq-2.37.tar.gz +ab066a97c226066485ad20e5ad5ce424 dnsmasq-2.38.tar.gz From fedora-extras-commits at redhat.com Mon Feb 12 22:18:32 2007 From: fedora-extras-commits at redhat.com (Thomas Fitzsimmons (fitzsim)) Date: Mon, 12 Feb 2007 17:18:32 -0500 Subject: rpms/classpathx-jaxp - New directory Message-ID: <200702122218.l1CMIWBL001436@cvs-int.fedora.redhat.com> Author: fitzsim Update of /cvs/extras/rpms/classpathx-jaxp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1431/classpathx-jaxp Log Message: Directory /cvs/extras/rpms/classpathx-jaxp added to the repository From fedora-extras-commits at redhat.com Mon Feb 12 22:18:40 2007 From: fedora-extras-commits at redhat.com (Thomas Fitzsimmons (fitzsim)) Date: Mon, 12 Feb 2007 17:18:40 -0500 Subject: rpms/classpathx-jaxp/devel - New directory Message-ID: <200702122218.l1CMIeKq001450@cvs-int.fedora.redhat.com> Author: fitzsim Update of /cvs/extras/rpms/classpathx-jaxp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1431/classpathx-jaxp/devel Log Message: Directory /cvs/extras/rpms/classpathx-jaxp/devel added to the repository From fedora-extras-commits at redhat.com Mon Feb 12 23:04:28 2007 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 12 Feb 2007 18:04:28 -0500 Subject: rpms/ncarg/devel ncarg.csh, 1.3, 1.4 ncarg.sh, 1.3, 1.4 ncarg.spec, 1.10, 1.11 Message-ID: <200702122304.l1CN4SAY005496@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/ncarg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5453/devel Modified Files: ncarg.csh ncarg.sh ncarg.spec Log Message: Fix up the source files that were modified then checked in :-(. Index: ncarg.csh =================================================================== RCS file: /cvs/extras/rpms/ncarg/devel/ncarg.csh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ncarg.csh 22 Jan 2007 18:04:34 -0000 1.3 +++ ncarg.csh 12 Feb 2007 23:03:55 -0000 1.4 @@ -1,2 +1,2 @@ setenv NCARG_ROOT /usr -setenv NCARG_LIB /usr/lib/ncarg +setenv NCARG_LIB /usr/LIB/ncarg Index: ncarg.sh =================================================================== RCS file: /cvs/extras/rpms/ncarg/devel/ncarg.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ncarg.sh 22 Jan 2007 18:04:34 -0000 1.3 +++ ncarg.sh 12 Feb 2007 23:03:55 -0000 1.4 @@ -1,2 +1,2 @@ export NCARG_ROOT=/usr -export NCARG_LIB=/usr/lib/ncarg +export NCARG_LIB=/usr/LIB/ncarg Index: ncarg.spec =================================================================== RCS file: /cvs/extras/rpms/ncarg/devel/ncarg.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ncarg.spec 9 Feb 2007 18:31:31 -0000 1.10 +++ ncarg.spec 12 Feb 2007 23:03:55 -0000 1.11 @@ -1,6 +1,6 @@ Name: ncarg Version: 4.4.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A Fortran and C based software package for scientific visualization Group: Development/Libraries License: GPL @@ -140,6 +140,9 @@ %changelog +* Mon Feb 12 2007 - Orion Poplawski - 4.4.1-9 +- Fix up the source files that were modified then checked in :-(. + * Fri Feb 09 2007 - Orion Poplawski - 4.4.1-8 - Don't modify SOURCE files directly From fedora-extras-commits at redhat.com Mon Feb 12 23:04:25 2007 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 12 Feb 2007 18:04:25 -0500 Subject: rpms/ncarg/FC-6 ncarg.csh, 1.3, 1.4 ncarg.sh, 1.3, 1.4 ncarg.spec, 1.12, 1.13 Message-ID: <200702122304.l1CN4PLb005491@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/ncarg/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5453/FC-6 Modified Files: ncarg.csh ncarg.sh ncarg.spec Log Message: Fix up the source files that were modified then checked in :-(. Index: ncarg.csh =================================================================== RCS file: /cvs/extras/rpms/ncarg/FC-6/ncarg.csh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ncarg.csh 19 Jan 2007 22:23:40 -0000 1.3 +++ ncarg.csh 12 Feb 2007 23:03:53 -0000 1.4 @@ -1,2 +1,2 @@ setenv NCARG_ROOT /usr -setenv NCARG_LIB /usr/lib/ncarg +setenv NCARG_LIB /usr/LIB/ncarg Index: ncarg.sh =================================================================== RCS file: /cvs/extras/rpms/ncarg/FC-6/ncarg.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ncarg.sh 19 Jan 2007 22:23:40 -0000 1.3 +++ ncarg.sh 12 Feb 2007 23:03:53 -0000 1.4 @@ -1,2 +1,2 @@ export NCARG_ROOT=/usr -export NCARG_LIB=/usr/lib/ncarg +export NCARG_LIB=/usr/LIB/ncarg Index: ncarg.spec =================================================================== RCS file: /cvs/extras/rpms/ncarg/FC-6/ncarg.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ncarg.spec 9 Feb 2007 18:31:28 -0000 1.12 +++ ncarg.spec 12 Feb 2007 23:03:53 -0000 1.13 @@ -1,6 +1,6 @@ Name: ncarg Version: 4.4.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A Fortran and C based software package for scientific visualization Group: Development/Libraries License: GPL @@ -140,6 +140,9 @@ %changelog +* Mon Feb 12 2007 - Orion Poplawski - 4.4.1-9 +- Fix up the source files that were modified then checked in :-(. + * Fri Feb 09 2007 - Orion Poplawski - 4.4.1-8 - Don't modify SOURCE files directly From fedora-extras-commits at redhat.com Mon Feb 12 23:22:36 2007 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Mon, 12 Feb 2007 18:22:36 -0500 Subject: rpms/smolt/FC-6 smolt.spec,1.10,1.11 sources,1.6,1.7 Message-ID: <200702122322.l1CNMa2a005771@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/smolt/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5686/FC-6 Modified Files: smolt.spec sources Log Message: upstream released new version Index: smolt.spec =================================================================== RCS file: /cvs/extras/rpms/smolt/FC-6/smolt.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- smolt.spec 7 Feb 2007 22:47:29 -0000 1.10 +++ smolt.spec 12 Feb 2007 23:22:03 -0000 1.11 @@ -1,6 +1,6 @@ Name: smolt Summary: Fedora hardware profiler -Version: 0.7 +Version: 0.8 Release: 1%{?dist} License: GPL Group: Applications/Internet @@ -99,6 +99,9 @@ %{_datadir}/firstboot/modules/smolt.py* %changelog +* Mon Feb 12 2007 Mike McGrath 0.8-1 +- New version released, major changes in both server and client + * Wed Feb 07 2007 Mike McGrath 0.7-1 - Upstream released new version Index: sources =================================================================== RCS file: /cvs/extras/rpms/smolt/FC-6/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 7 Feb 2007 22:47:29 -0000 1.6 +++ sources 12 Feb 2007 23:22:03 -0000 1.7 @@ -1 +1 @@ -b3876205ca06ecc64b73364ca70e1f5b smolt-0.7.tar.gz +76df28c0d21418665e12d275198af5d8 smolt-0.8.tar.gz From fedora-extras-commits at redhat.com Mon Feb 12 23:22:38 2007 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Mon, 12 Feb 2007 18:22:38 -0500 Subject: rpms/smolt/devel .cvsignore, 1.5, 1.6 smolt.spec, 1.10, 1.11 sources, 1.6, 1.7 Message-ID: <200702122322.l1CNMc7q005778@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/smolt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5686/devel Modified Files: .cvsignore smolt.spec sources Log Message: upstream released new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/smolt/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 31 Jan 2007 16:58:05 -0000 1.5 +++ .cvsignore 12 Feb 2007 23:22:06 -0000 1.6 @@ -1 +1 @@ -smolt-0.6.2.tar.bz2 +smolt-0.8.tar.gz Index: smolt.spec =================================================================== RCS file: /cvs/extras/rpms/smolt/devel/smolt.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- smolt.spec 7 Feb 2007 22:47:32 -0000 1.10 +++ smolt.spec 12 Feb 2007 23:22:06 -0000 1.11 @@ -1,6 +1,6 @@ Name: smolt Summary: Fedora hardware profiler -Version: 0.7 +Version: 0.8 Release: 1%{?dist} License: GPL Group: Applications/Internet @@ -99,6 +99,9 @@ %{_datadir}/firstboot/modules/smolt.py* %changelog +* Mon Feb 12 2007 Mike McGrath 0.8-1 +- New version released, major changes in both server and client + * Wed Feb 07 2007 Mike McGrath 0.7-1 - Upstream released new version Index: sources =================================================================== RCS file: /cvs/extras/rpms/smolt/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 7 Feb 2007 22:47:32 -0000 1.6 +++ sources 12 Feb 2007 23:22:06 -0000 1.7 @@ -1 +1 @@ -b3876205ca06ecc64b73364ca70e1f5b smolt-0.7.tar.gz +76df28c0d21418665e12d275198af5d8 smolt-0.8.tar.gz From fedora-extras-commits at redhat.com Mon Feb 12 23:34:35 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?= (sindrepb)) Date: Mon, 12 Feb 2007 18:34:35 -0500 Subject: rpms/gtranslator/devel gtranslator-1.1.7-desktop.patch, NONE, 1.1 gtranslator.spec, 1.14, 1.15 sources, 1.6, 1.7 Message-ID: <200702122334.l1CNYZvq006100@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/gtranslator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6078 Modified Files: gtranslator.spec sources Added Files: gtranslator-1.1.7-desktop.patch Log Message: rebuild, should work this time gtranslator-1.1.7-desktop.patch: --- NEW FILE gtranslator-1.1.7-desktop.patch --- --- gtranslator-1.1.7/data/desktop/gtranslator.desktop.in.orig 2007-02-11 17:35:13.000000000 +0100 +++ gtranslator-1.1.7/data/desktop/gtranslator.desktop.in 2007-02-11 17:59:42.000000000 +0100 @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 -_Name=gtranslator -_Comment=The GNOME translation program +Name=gtranslator +Comment=The GNOME translation program Icon=gtranslator.png Exec=gtranslator Terminal=false Index: gtranslator.spec =================================================================== RCS file: /cvs/extras/rpms/gtranslator/devel/gtranslator.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- gtranslator.spec 12 Feb 2007 21:15:30 -0000 1.14 +++ gtranslator.spec 12 Feb 2007 23:34:03 -0000 1.15 @@ -1,6 +1,6 @@ Name: gtranslator Version: 1.1.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Gettext po file editor for GNOME @@ -83,6 +83,9 @@ %changelog +* Tue Feb 13 2007 Sindre Pedersen Bj??rdal 1.1.7-2 +- Rebuild + * Mon Jan 22 2007 Sindre Pedersen Bj??rdal 1.1.7-1 - Take over ownership of package - Update to 1.1.7 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtranslator/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 12 Feb 2007 21:15:30 -0000 1.6 +++ sources 12 Feb 2007 23:34:03 -0000 1.7 @@ -1 +1 @@ -8c850ad0c897ca41c7c9552de45011bf gtranslator-1.1.7-desktop.patch +47531195b74b22a6284dad609377cbb0 gtranslator-1.1.7.tar.bz2 From fedora-extras-commits at redhat.com Tue Feb 13 02:12:19 2007 From: fedora-extras-commits at redhat.com (ZC Miao (hellwolf)) Date: Mon, 12 Feb 2007 21:12:19 -0500 Subject: rpms/fuse-convmvfs/devel fuse-convmvfs.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702130212.l1D2CJt9017117@cvs-int.fedora.redhat.com> Author: hellwolf Update of /cvs/extras/rpms/fuse-convmvfs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17073/devel Modified Files: .cvsignore sources Added Files: fuse-convmvfs.spec Log Message: auto-import fuse-convmvfs-0.2.3-2.fc6 on branch devel from fuse-convmvfs-0.2.3-2.fc6.src.rpm --- NEW FILE fuse-convmvfs.spec --- ## this section was generated by ybuild system ### #begin ypkgopts #end ypkgopts ################################################## Name: fuse-convmvfs Version: 0.2.3 Release: 2%{?dist}%{?ybuildnum:.%{ybuildnum_prefix}%{ybuildnum}} Summary: FUSE-Filesystem to convert filesystem encodings Group: System Environment/Base License: GPL URL: http://fuse-convmvfs.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/fuse-convmvfs/fuse-convmvfs-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: fuse-devel >= 2.5.0 %description This is a filesystem client use the FUSE(Filesystem in USErspace) interface to convert file name from one charset to another. Inspired by convmv. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/convmvfs %doc README* COPYING ChangeLog AUTHORS NEWS %changelog * Mon Feb 12 2007 ZC Miao - 0.2.3-2 - add doc AUTHORS NEWS, remove doc INSTALL - Change URL * Mon Feb 12 2007 ZC Miao - 0.2.3-1 - update to 0.2.3 * Fri Jul 28 2006 ZC Miao - 0.2.2-1 - update to 0.2.2 * Tue Jul 25 2006 ZC Miao - 0.2.1-1 - update to 0.2.1 * Mon Jul 3 2006 ZC Miao - 0.2-2 - add URL for Source0 * Fri Jun 30 2006 ZC Miao - 0.2-1 - init build Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fuse-convmvfs/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Feb 2007 18:31:03 -0000 1.1 +++ .cvsignore 13 Feb 2007 02:11:46 -0000 1.2 @@ -0,0 +1 @@ +fuse-convmvfs-0.2.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/fuse-convmvfs/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Feb 2007 18:31:03 -0000 1.1 +++ sources 13 Feb 2007 02:11:46 -0000 1.2 @@ -0,0 +1 @@ +40ca966feb47d2fcdaedb682655fd3e3 fuse-convmvfs-0.2.3.tar.gz From fedora-extras-commits at redhat.com Tue Feb 13 02:12:16 2007 From: fedora-extras-commits at redhat.com (ZC Miao (hellwolf)) Date: Mon, 12 Feb 2007 21:12:16 -0500 Subject: rpms/fuse-convmvfs import.log,1.1,1.2 Message-ID: <200702130212.l1D2CGL3017111@cvs-int.fedora.redhat.com> Author: hellwolf Update of /cvs/extras/rpms/fuse-convmvfs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17073 Modified Files: import.log Log Message: auto-import fuse-convmvfs-0.2.3-2.fc6 on branch devel from fuse-convmvfs-0.2.3-2.fc6.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fuse-convmvfs/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 12 Feb 2007 18:30:56 -0000 1.1 +++ import.log 13 Feb 2007 02:11:44 -0000 1.2 @@ -0,0 +1 @@ +fuse-convmvfs-0_2_3-2_fc6:HEAD:fuse-convmvfs-0.2.3-2.fc6.src.rpm:1171332519 From fedora-extras-commits at redhat.com Tue Feb 13 02:33:19 2007 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Mon, 12 Feb 2007 21:33:19 -0500 Subject: rpms/eb - New directory Message-ID: <200702130233.l1D2XJUI017434@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/eb In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17429/eb Log Message: Directory /cvs/extras/rpms/eb added to the repository From fedora-extras-commits at redhat.com Tue Feb 13 02:33:22 2007 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Mon, 12 Feb 2007 21:33:22 -0500 Subject: rpms/eb/devel - New directory Message-ID: <200702130233.l1D2XMZr017448@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/eb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17429/eb/devel Log Message: Directory /cvs/extras/rpms/eb/devel added to the repository From fedora-extras-commits at redhat.com Tue Feb 13 02:59:13 2007 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Mon, 12 Feb 2007 21:59:13 -0500 Subject: rpms/openbox/devel openbox.spec,1.20,1.21 Message-ID: <200702130259.l1D2xDbd017763@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/openbox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17716/devel Modified Files: openbox.spec Log Message: %%ghost the byte-compiled themeupdate scripts to fix multilib conflict (bug #228379). Index: openbox.spec =================================================================== RCS file: /cvs/extras/rpms/openbox/devel/openbox.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- openbox.spec 23 Nov 2006 18:57:37 -0000 1.20 +++ openbox.spec 13 Feb 2007 02:58:41 -0000 1.21 @@ -1,6 +1,6 @@ Name: openbox Version: 3.3.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A highly configurable and standards-compliant X11 window manager Group: User Interface/Desktops @@ -84,6 +84,8 @@ %{_bindir}/%{name} %{_datadir}/themes/*/ %{_datadir}/pixmaps/%{name}.png +%ghost %{_datadir}/%{name}/themeupdate.pyc +%ghost %{_datadir}/%{name}/themeupdate.pyo %{_datadir}/%{name}/ %{_datadir}/gnome/wm-properties/%{name}.desktop %{_datadir}/xsessions/%{name}.desktop @@ -107,6 +109,10 @@ %changelog +* Mon Feb 12 2007 Peter Gordon - 3.3.1-5 +- %%ghost the byte-compiled themeupdate scripts to fix multilib conflict + (bug #228379). + * Thu Nov 23 2006 Peter Gordon - 3.3.1-4 - Don't own %%{_datadir}/gnome/wm-properties anymore, as that's now owned by gnome-session in Rawhide and we should not have ownership conflicts with From fedora-extras-commits at redhat.com Tue Feb 13 02:59:18 2007 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Mon, 12 Feb 2007 21:59:18 -0500 Subject: rpms/openbox/FC-6 openbox.spec,1.19,1.20 Message-ID: <200702130259.l1D2xIQG017769@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/openbox/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17716/FC-6 Modified Files: openbox.spec Log Message: %%ghost the byte-compiled themeupdate scripts to fix multilib conflict (bug #228379). Index: openbox.spec =================================================================== RCS file: /cvs/extras/rpms/openbox/FC-6/openbox.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- openbox.spec 3 Oct 2006 03:13:27 -0000 1.19 +++ openbox.spec 13 Feb 2007 02:58:46 -0000 1.20 @@ -1,6 +1,6 @@ Name: openbox Version: 3.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A highly configurable and standards-compliant X11 window manager Group: User Interface/Desktops @@ -83,6 +83,8 @@ %{_bindir}/%{name} %{_datadir}/themes/*/ %{_datadir}/pixmaps/%{name}.png +%ghost %{_datadir}/%{name}/themeupdate.pyc +%ghost %{_datadir}/%{name}/themeupdate.pyo %{_datadir}/%{name}/ %dir %{_datadir}/gnome/wm-properties %{_datadir}/gnome/wm-properties/%{name}.desktop @@ -107,6 +109,10 @@ %changelog +* Mon Feb 12 2007 Peter Gordon - 3.3.1-4 +- %%ghost the byte-compiled themeupdate scripts to fix multilib conflict + (bug #228379). + * Mon Oct 02 2006 Peter Gordon - 3.3.1-3 - Rebuild to pick up unwind info generation fixes in new GCC From fedora-extras-commits at redhat.com Tue Feb 13 02:59:16 2007 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Mon, 12 Feb 2007 21:59:16 -0500 Subject: rpms/openbox/FC-5 openbox.spec,1.17,1.18 Message-ID: <200702130259.l1D2xG0n017766@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/openbox/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17716/FC-5 Modified Files: openbox.spec Log Message: %%ghost the byte-compiled themeupdate scripts to fix multilib conflict (bug #228379). Index: openbox.spec =================================================================== RCS file: /cvs/extras/rpms/openbox/FC-5/openbox.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- openbox.spec 20 Sep 2006 19:38:35 -0000 1.17 +++ openbox.spec 13 Feb 2007 02:58:43 -0000 1.18 @@ -1,6 +1,6 @@ Name: openbox Version: 3.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A highly configurable and standards-compliant X11 window manager Group: User Interface/Desktops @@ -83,6 +83,8 @@ %{_bindir}/%{name} %{_datadir}/themes/*/ %{_datadir}/pixmaps/%{name}.png +%ghost %{_datadir}/%{name}/themeupdate.pyc +%ghost %{_datadir}/%{name}/themeupdate.pyo %{_datadir}/%{name}/ %dir %{_datadir}/gnome/wm-properties %{_datadir}/gnome/wm-properties/%{name}.desktop @@ -107,6 +109,10 @@ %changelog +* Mon Feb 12 2007 Peter Gordon - 3.3.1-3 +- %%ghost the byte-compiled themeupdate scripts to fix multilib conflict + (bug #228379). + * Wed Sep 20 2006 Peter Gordon - 3.3.1-2 - Allow building with startup-notification as an rpmbuild option (though it is disabled by default as recommended by upstream). From fedora-extras-commits at redhat.com Tue Feb 13 04:43:51 2007 From: fedora-extras-commits at redhat.com (Yuichi Nakamura (ynakam)) Date: Mon, 12 Feb 2007 23:43:51 -0500 Subject: rpms/seedit/devel seedit.spec,1.3,1.4 Message-ID: <200702130443.l1D4hpsC025330@cvs-int.fedora.redhat.com> Author: ynakam Update of /cvs/extras/rpms/seedit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25312 Modified Files: seedit.spec Log Message: increment release due to mistake in tag Index: seedit.spec =================================================================== RCS file: /cvs/extras/rpms/seedit/devel/seedit.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- seedit.spec 9 Feb 2007 05:38:41 -0000 1.3 +++ seedit.spec 13 Feb 2007 04:43:19 -0000 1.4 @@ -1,4 +1,4 @@ -%define buildnum 2 +%define buildnum 3 %define python_sitelib %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib()') %define selinuxconf %{_sysconfdir}/selinux/config @@ -166,6 +166,9 @@ %changelog +* Fri Feb 9 2007 Yuichi Nakamura 2.1.0-3 + - Fixed build failure + * Fri Feb 9 2007 Yuichi Nakamura 2.1.0-2 - Fixed build failure From fedora-extras-commits at redhat.com Tue Feb 13 05:06:25 2007 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Tue, 13 Feb 2007 00:06:25 -0500 Subject: rpms/kinput2/devel kinput2.spec,1.11,1.12 Message-ID: <200702130506.l1D56PiU028845@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/kinput2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28824 Modified Files: kinput2.spec Log Message: * Tue Feb 13 2007 Akira TAGOH - v3.1-31 - Build with RPM_OPT_FLAGS. (#227752) Index: kinput2.spec =================================================================== RCS file: /cvs/extras/rpms/kinput2/devel/kinput2.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- kinput2.spec 26 Jan 2007 12:01:45 -0000 1.11 +++ kinput2.spec 13 Feb 2007 05:05:52 -0000 1.12 @@ -25,7 +25,7 @@ Name: kinput2 Version: v3.1 -Release: 30%{?dist} +Release: 31%{?dist} License: Distributable BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libICE-devel libSM-devel libX11-devel libXaw-devel libXext-devel libXmu-devel libXpm-devel libXt-devel libXp-devel @@ -92,9 +92,16 @@ head -21 cmd/kinput2.c >Copyright %build + +fixoptflags() { + find . -name Makefile \ + | xargs sed -i -e 's/^\(\s*CDEBUGFLAGS\s*=.*\)/\1 $(RPM_OPT_FLAGS)/' +} + %if %{build_with_wnn4} ln -sf Kinput2.conf.wnn4 Kinput2.conf xmkmf -a +fixoptflags make %{?_smp_mflags} mv cmd/kinput2 kinput2.wnn4 make clean @@ -103,6 +110,7 @@ %if %{build_with_wnn6} ln -sf Kinput2.conf.wnn6 Kinput2.conf xmkmf -a +fixoptflags make %{?_smp_mflags} mv cmd/kinput2 kinput2.wnn6 make clean @@ -112,6 +120,7 @@ rm -f Kinput2.conf ln -sf Kinput2.conf.canna Kinput2.conf xmkmf -a +fixoptflags make %{?_smp_mflags} mv cmd/kinput2 kinput2.canna make clean @@ -120,6 +129,7 @@ %if %{build_with_canna_wnn4} ln -sf Kinput2.conf.canna-wnn4 Kinput2.conf xmkmf -a +fixoptflags make %{?_smp_mflags} mv cmd/kinput2 kinput2.canna-wnn4 make clean @@ -128,6 +138,7 @@ %if %{build_with_canna_wnn6} ln -sf Kinput2.conf.canna-wnn6 Kinput2.conf xmkmf -a +fixoptflags make %{?_smp_mflags} mv cmd/kinput2 kinput2.canna-wnn6 %endif @@ -242,6 +253,9 @@ %{_sysconfdir}/X11/xinit/xinput.d %changelog +* Tue Feb 13 2007 Akira TAGOH - v3.1-31 +- Build with RPM_OPT_FLAGS. (#227752) + * Fri Jan 26 2007 Akira TAGOH - v3.1-30 - Backport a patch to update the status with XmbResetIC() properly. - Disable Wnn support so that no *Wnn* devel package available anymore. From fedora-extras-commits at redhat.com Tue Feb 13 06:04:24 2007 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Tue, 13 Feb 2007 01:04:24 -0500 Subject: rpms/kinput2/FC-6 kinput2.spec,1.9,1.10 Message-ID: <200702130604.l1D64OIT032593@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/kinput2/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32576 Modified Files: kinput2.spec Log Message: * Tue Feb 13 2007 Akira TAGOH - v3.1-31 - Build with RPM_OPT_FLAGS. (#227752) Index: kinput2.spec =================================================================== RCS file: /cvs/extras/rpms/kinput2/FC-6/kinput2.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- kinput2.spec 26 Jan 2007 11:59:33 -0000 1.9 +++ kinput2.spec 13 Feb 2007 06:03:51 -0000 1.10 @@ -25,7 +25,7 @@ Name: kinput2 Version: v3.1 -Release: 30%{?dist} +Release: 31%{?dist} License: Distributable BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libICE-devel libSM-devel libX11-devel libXaw-devel libXext-devel libXmu-devel libXpm-devel libXt-devel libXp-devel @@ -92,9 +92,16 @@ head -21 cmd/kinput2.c >Copyright %build + +fixoptflags() { + find . -name Makefile \ + | xargs sed -i -e 's/^\(\s*CDEBUGFLAGS\s*=.*\)/\1 $(RPM_OPT_FLAGS)/' +} + %if %{build_with_wnn4} ln -sf Kinput2.conf.wnn4 Kinput2.conf xmkmf -a +fixoptflags make %{?_smp_mflags} mv cmd/kinput2 kinput2.wnn4 make clean @@ -103,6 +110,7 @@ %if %{build_with_wnn6} ln -sf Kinput2.conf.wnn6 Kinput2.conf xmkmf -a +fixoptflags make %{?_smp_mflags} mv cmd/kinput2 kinput2.wnn6 make clean @@ -112,6 +120,7 @@ rm -f Kinput2.conf ln -sf Kinput2.conf.canna Kinput2.conf xmkmf -a +fixoptflags make %{?_smp_mflags} mv cmd/kinput2 kinput2.canna make clean @@ -120,6 +129,7 @@ %if %{build_with_canna_wnn4} ln -sf Kinput2.conf.canna-wnn4 Kinput2.conf xmkmf -a +fixoptflags make %{?_smp_mflags} mv cmd/kinput2 kinput2.canna-wnn4 make clean @@ -128,6 +138,7 @@ %if %{build_with_canna_wnn6} ln -sf Kinput2.conf.canna-wnn6 Kinput2.conf xmkmf -a +fixoptflags make %{?_smp_mflags} mv cmd/kinput2 kinput2.canna-wnn6 %endif @@ -242,6 +253,9 @@ %{_sysconfdir}/X11/xinit/xinput.d %changelog +* Tue Feb 13 2007 Akira TAGOH - v3.1-31 +- Build with RPM_OPT_FLAGS. (#227752) + * Fri Jan 26 2007 Akira TAGOH - v3.1-30 - Backport a patch to update the status with XmbResetIC() properly. - Disable Wnn support so that no *Wnn* devel package available anymore. From fedora-extras-commits at redhat.com Tue Feb 13 06:41:02 2007 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Tue, 13 Feb 2007 01:41:02 -0500 Subject: rpms/ScientificPython/devel ScientificPython.spec,1.2,1.3 Message-ID: <200702130641.l1D6f2PO000449@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/ScientificPython/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv428 Modified Files: ScientificPython.spec Log Message: * Mon Feb 12 2007 Jef Spaleta 2.6-7 - Correct for multilib conflict in impipython.sh Index: ScientificPython.spec =================================================================== RCS file: /cvs/extras/rpms/ScientificPython/devel/ScientificPython.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ScientificPython.spec 31 Dec 2006 08:04:03 -0000 1.2 +++ ScientificPython.spec 13 Feb 2007 06:40:29 -0000 1.3 @@ -3,7 +3,7 @@ Name: ScientificPython Version: 2.6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A collection of Python modules that are useful for scientific computing Group: Development/Languages @@ -104,8 +104,7 @@ # files that comes with the ScientificPython package and to the available # documentation for the mpirun executable. -mpirun -np 2 %{_bindir}/mpipython %{python_sitearch}/Scientific/BSP/Console.py $* - +mpirun -np 2 `python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)+'/Scientific/BSP/console.py'"` $* EOF cat impipython.sh @@ -152,6 +151,9 @@ %doc Doc/Reference Examples Doc/BSP_Tutorial.pdf %changelog +* Mon Feb 12 2007 Jef Spaleta 2.6-7 +- Correct for multilib conflict in impipython.sh + * Sat Dec 30 2006 Jef Spaleta 2.6-6 - Correct for netcdf location patch to work with /usr/lib/lib64 From fedora-extras-commits at redhat.com Tue Feb 13 06:44:26 2007 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Tue, 13 Feb 2007 01:44:26 -0500 Subject: rpms/Canna/devel Canna.spec,1.6,1.7 Message-ID: <200702130644.l1D6iQuH000552@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/Canna/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv533 Modified Files: Canna.spec Log Message: * Tue Feb 13 2007 Akira TAGOH - 3.7p3-17 - cleanups spec file. - Build with RPM_OPT_FLAGS (#227378) Index: Canna.spec =================================================================== RCS file: /cvs/extras/rpms/Canna/devel/Canna.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Canna.spec 11 Nov 2006 17:00:26 -0000 1.6 +++ Canna.spec 13 Feb 2007 06:43:54 -0000 1.7 @@ -39,8 +39,11 @@ Patch42: Canna-3.7p3-redecl.patch Patch43: Canna-3.7p3-fix-gcc4-warning.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot -Prereq: /sbin/chkconfig, /etc/services, /bin/grep, /bin/cp +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires(pre): /bin/grep %{_sbindir}/userdel %{_sbindir}/useradd /etc/passwd +Requires(post): /bin/grep /etc/services /sbin/chkconfig /bin/chown +Requires(preun): /sbin/service /sbin/chkconfig +Requires(postun): /sbin/service BuildRequires: cpp gawk BuildRequires: imake >= 1.0.1-3 Obsoletes: tamago @@ -144,16 +147,14 @@ xmkmf make sglobal.h popd +find . -name Makefile | xargs sed -i -e 's/^\(\s*CDEBUGFLAGS\s*=.*\)/\1 $(RPM_OPT_FLAGS)/' %ifarch ia64 -sed 's/-O2//' Makefile > Makefile.tmp -mv Makefile.tmp Makefile +sed -i -e 's/-O2//' Makefile %endif # ugly hack to avoid X.Org: no such file or directory issue -TMP_MAKEFILE=`mktemp /tmp/Canna-build-makefile.XXXXXX` -sed -e 's/$(VENDOR_DEFINES)//' Makefile > $TMP_MAKEFILE && cp $TMP_MAKEFILE Makefile -rm $TMP_MAKEFILE +sed -i -e 's/$(VENDOR_DEFINES)//' Makefile make canna -gcc -o ./misc/cannaping %{SOURCE22} -I./include -L./lib/canna -lcanna +gcc $RPM_OPT_FLAGS -o ./misc/cannaping %{SOURCE22} -I./include -L./lib/canna -lcanna cd .. cd cannadic-%{cannadicver} @@ -185,7 +186,7 @@ cd .. %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT cd %{cannadir} make libCannaDir=%{_libdir} DESTDIR=$RPM_BUILD_ROOT install @@ -244,7 +245,7 @@ %{__mkdir_p} $RPM_BUILD_ROOT%{_localstatedir}/run/.iroha_unix %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -fr $RPM_BUILD_ROOT +rm -fr $RPM_BUILD_ROOT %pre @@ -325,6 +326,10 @@ %{_libdir}/libcanna16.so.* %changelog +* Tue Feb 13 2007 Akira TAGOH - 3.7p3-17 +- cleanups spec file. +- Build with RPM_OPT_FLAGS (#227378) + * Mon Sep 11 2006 Akira TAGOH - 3.7p3-16 - rebuilt From fedora-extras-commits at redhat.com Tue Feb 13 06:45:59 2007 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Tue, 13 Feb 2007 01:45:59 -0500 Subject: rpms/ScientificPython/FC-6 ScientificPython.spec,1.2,1.3 Message-ID: <200702130645.l1D6jxcb000617@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/ScientificPython/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv598 Modified Files: ScientificPython.spec Log Message: * Mon Feb 12 2007 Jef Spaleta 2.6-7 - Correct for multilib conflict in impipython.sh Index: ScientificPython.spec =================================================================== RCS file: /cvs/extras/rpms/ScientificPython/FC-6/ScientificPython.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ScientificPython.spec 31 Dec 2006 08:04:03 -0000 1.2 +++ ScientificPython.spec 13 Feb 2007 06:45:26 -0000 1.3 @@ -3,7 +3,7 @@ Name: ScientificPython Version: 2.6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A collection of Python modules that are useful for scientific computing Group: Development/Languages @@ -104,8 +104,7 @@ # files that comes with the ScientificPython package and to the available # documentation for the mpirun executable. -mpirun -np 2 %{_bindir}/mpipython %{python_sitearch}/Scientific/BSP/Console.py $* - +mpirun -np 2 `python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)+'/Scientific/BSP/console.py'"` $* EOF cat impipython.sh @@ -152,6 +151,9 @@ %doc Doc/Reference Examples Doc/BSP_Tutorial.pdf %changelog +* Mon Feb 12 2007 Jef Spaleta 2.6-7 +- Correct for multilib conflict in impipython.sh + * Sat Dec 30 2006 Jef Spaleta 2.6-6 - Correct for netcdf location patch to work with /usr/lib/lib64 From fedora-extras-commits at redhat.com Tue Feb 13 08:46:22 2007 From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau)) Date: Tue, 13 Feb 2007 03:46:22 -0500 Subject: rpms/libsyncml/devel .cvsignore, 1.2, 1.3 libsyncml.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200702130846.l1D8kMFC008197@cvs-int.fedora.redhat.com> Author: rineau Update of /cvs/extras/rpms/libsyncml/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8176 Modified Files: .cvsignore libsyncml.spec sources Log Message: New upstream version 0.4.3. No longer need for patch libsyncml-0.4.2.doctype.patch (merged upstream). The soversion of libsyncml.so is libsyncml.so.0.0.0. Maybe upstream do not even know what sonames are for. :-( Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libsyncml/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Nov 2006 17:33:08 -0000 1.2 +++ .cvsignore 13 Feb 2007 08:45:49 -0000 1.3 @@ -1 +1 @@ -libsyncml-0.4.2.tar.gz +libsyncml-0.4.3.tar.gz Index: libsyncml.spec =================================================================== RCS file: /cvs/extras/rpms/libsyncml/devel/libsyncml.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libsyncml.spec 28 Nov 2006 17:33:08 -0000 1.1 +++ libsyncml.spec 13 Feb 2007 08:45:49 -0000 1.2 @@ -1,5 +1,5 @@ Name: libsyncml -Version: 0.4.2 +Version: 0.4.3 Release: 1%{?dist} Summary: SyncML protocol library @@ -10,10 +10,8 @@ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# Upstream patch submitted to SVN after the release. -Patch0: libsyncml-0.4.2.doctype.patch - -BuildRequires: wbxml2-devel libxml2-devel libsoup-devel +BuildRequires: wbxml2-devel >= 0.9.2 +BuildRequires: libxml2-devel libsoup-devel BuildRequires: openobex-devel bluez-libs-devel %description @@ -31,7 +29,6 @@ %prep %setup -q -%patch0 -p1 # Fix some permissions chmod a-x libsyncml/syncml.h @@ -79,5 +76,12 @@ %changelog +* Tue Feb 13 2007 Laurent Rineau - 0.4.3-1 +- New upstream version 0.4.3. +- No longer need for patch libsyncml-0.4.2.doctype.patch (merged upstream). + +* Wed Nov 29 2006 Laurent Rineau - 0.4.2-2 +- Modify the BR: wbxml2-devel, so that it build-requires wbxml2>=0.9.2. + * Mon Nov 27 2006 Laurent Rineau - 0.4.2-1 - Initial release for Fedora Extras. Index: sources =================================================================== RCS file: /cvs/extras/rpms/libsyncml/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Nov 2006 17:33:08 -0000 1.2 +++ sources 13 Feb 2007 08:45:49 -0000 1.3 @@ -1 +1 @@ -66fad49f54e78ce34c1453c62958e037 libsyncml-0.4.2.tar.gz +2ea3a48b35ef3300d917b3eb4666ab66 libsyncml-0.4.3.tar.gz From fedora-extras-commits at redhat.com Tue Feb 13 09:43:10 2007 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Tue, 13 Feb 2007 04:43:10 -0500 Subject: rpms/Canna/FC-6 Canna.spec,1.6,1.7 Message-ID: <200702130943.l1D9hAxg013126@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/Canna/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13107 Modified Files: Canna.spec Log Message: * Tue Feb 13 2007 Akira TAGOH - 3.7p3-17 - cleanups spec file. - Build with RPM_OPT_FLAGS (#227378) Index: Canna.spec =================================================================== RCS file: /cvs/extras/rpms/Canna/FC-6/Canna.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Canna.spec 11 Nov 2006 17:00:25 -0000 1.6 +++ Canna.spec 13 Feb 2007 09:42:38 -0000 1.7 @@ -39,8 +39,11 @@ Patch42: Canna-3.7p3-redecl.patch Patch43: Canna-3.7p3-fix-gcc4-warning.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot -Prereq: /sbin/chkconfig, /etc/services, /bin/grep, /bin/cp +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires(pre): /bin/grep %{_sbindir}/userdel %{_sbindir}/useradd /etc/passwd +Requires(post): /bin/grep /etc/services /sbin/chkconfig /bin/chown +Requires(preun): /sbin/service /sbin/chkconfig +Requires(postun): /sbin/service BuildRequires: cpp gawk BuildRequires: imake >= 1.0.1-3 Obsoletes: tamago @@ -144,16 +147,14 @@ xmkmf make sglobal.h popd +find . -name Makefile | xargs sed -i -e 's/^\(\s*CDEBUGFLAGS\s*=.*\)/\1 $(RPM_OPT_FLAGS)/' %ifarch ia64 -sed 's/-O2//' Makefile > Makefile.tmp -mv Makefile.tmp Makefile +sed -i -e 's/-O2//' Makefile %endif # ugly hack to avoid X.Org: no such file or directory issue -TMP_MAKEFILE=`mktemp /tmp/Canna-build-makefile.XXXXXX` -sed -e 's/$(VENDOR_DEFINES)//' Makefile > $TMP_MAKEFILE && cp $TMP_MAKEFILE Makefile -rm $TMP_MAKEFILE +sed -i -e 's/$(VENDOR_DEFINES)//' Makefile make canna -gcc -o ./misc/cannaping %{SOURCE22} -I./include -L./lib/canna -lcanna +gcc $RPM_OPT_FLAGS -o ./misc/cannaping %{SOURCE22} -I./include -L./lib/canna -lcanna cd .. cd cannadic-%{cannadicver} @@ -185,7 +186,7 @@ cd .. %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT cd %{cannadir} make libCannaDir=%{_libdir} DESTDIR=$RPM_BUILD_ROOT install @@ -244,7 +245,7 @@ %{__mkdir_p} $RPM_BUILD_ROOT%{_localstatedir}/run/.iroha_unix %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -fr $RPM_BUILD_ROOT +rm -fr $RPM_BUILD_ROOT %pre @@ -325,6 +326,10 @@ %{_libdir}/libcanna16.so.* %changelog +* Tue Feb 13 2007 Akira TAGOH - 3.7p3-17 +- cleanups spec file. +- Build with RPM_OPT_FLAGS (#227378) + * Mon Sep 11 2006 Akira TAGOH - 3.7p3-16 - rebuilt From fedora-extras-commits at redhat.com Tue Feb 13 09:51:53 2007 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Tue, 13 Feb 2007 04:51:53 -0500 Subject: rpms/Canna/devel Canna.spec,1.7,1.8 Message-ID: <200702130951.l1D9prNE013212@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/Canna/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13193 Modified Files: Canna.spec Log Message: Index: Canna.spec =================================================================== RCS file: /cvs/extras/rpms/Canna/devel/Canna.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Canna.spec 13 Feb 2007 06:43:54 -0000 1.7 +++ Canna.spec 13 Feb 2007 09:51:21 -0000 1.8 @@ -6,7 +6,7 @@ Summary: A Japanese character set input system. Name: Canna Version: 3.7p3 -Release: 16%{?dist} +Release: 17%{?dist} License: Distributable Group: System Environment/Libraries URL: http://www.nec.co.jp/japanese/product/computer/soft/canna/ From fedora-extras-commits at redhat.com Tue Feb 13 09:54:58 2007 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Tue, 13 Feb 2007 04:54:58 -0500 Subject: rpms/Canna/FC-6 Canna.spec,1.7,1.8 Message-ID: <200702130954.l1D9swnM013316@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/Canna/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13297 Modified Files: Canna.spec Log Message: Index: Canna.spec =================================================================== RCS file: /cvs/extras/rpms/Canna/FC-6/Canna.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Canna.spec 13 Feb 2007 09:42:38 -0000 1.7 +++ Canna.spec 13 Feb 2007 09:54:26 -0000 1.8 @@ -6,7 +6,7 @@ Summary: A Japanese character set input system. Name: Canna Version: 3.7p3 -Release: 16%{?dist} +Release: 17%{?dist} License: Distributable Group: System Environment/Libraries URL: http://www.nec.co.jp/japanese/product/computer/soft/canna/ From fedora-extras-commits at redhat.com Tue Feb 13 10:38:19 2007 From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa)) Date: Tue, 13 Feb 2007 05:38:19 -0500 Subject: rpms/icewm - New directory Message-ID: <200702131038.l1DAcJQG017355@cvs-int.fedora.redhat.com> Author: gilboa Update of /cvs/extras/rpms/icewm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17341/icewm Log Message: Directory /cvs/extras/rpms/icewm added to the repository From fedora-extras-commits at redhat.com Tue Feb 13 10:38:26 2007 From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa)) Date: Tue, 13 Feb 2007 05:38:26 -0500 Subject: rpms/icewm/devel - New directory Message-ID: <200702131038.l1DAcQ3D017385@cvs-int.fedora.redhat.com> Author: gilboa Update of /cvs/extras/rpms/icewm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17341/icewm/devel Log Message: Directory /cvs/extras/rpms/icewm/devel added to the repository From fedora-extras-commits at redhat.com Tue Feb 13 12:24:08 2007 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Tue, 13 Feb 2007 07:24:08 -0500 Subject: rpms/python-simpy/FC-6 .cvsignore, 1.4, 1.5 python-simpy.spec, 1.11, 1.12 sources, 1.4, 1.5 Message-ID: <200702131224.l1DCO8Bk026095@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26072 Modified Files: .cvsignore python-simpy.spec sources Log Message: Update to 1.8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-simpy/FC-6/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 19 Jun 2006 11:54:34 -0000 1.4 +++ .cvsignore 13 Feb 2007 12:23:36 -0000 1.5 @@ -1 +1 @@ -SimPy-1.7.1.tar.gz +SimPy-1.8.tar.gz Index: python-simpy.spec =================================================================== RCS file: /cvs/extras/rpms/python-simpy/FC-6/python-simpy.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- python-simpy.spec 6 Sep 2006 14:12:56 -0000 1.11 +++ python-simpy.spec 13 Feb 2007 12:23:36 -0000 1.12 @@ -2,8 +2,8 @@ %define pkgname SimPy Name: python-simpy -Version: 1.7.1 -Release: 4%{?dist} +Version: 1.8 +Release: 1%{?dist} Summary: Python simulation framework Group: Development/Languages License: LGPL @@ -38,7 +38,10 @@ %prep %setup -q -n %{pkgname}-%{version} # Remove the shebangs to make rpmlint happy -%{__sed} -i '1{\?^#!/usr/bin/env\ python$?d}' SimPy/*.py +sed -i -e '/^#!.*python/,1D' SimPy/*.py + +# Remove carriage returns to make rpmlint happy +sed -i 's/\r//' SimPy/*.py %build %{__python} setup.py build @@ -58,18 +61,26 @@ %defattr(-,root,root,-) %{python_sitelib}/%{pkgname}/ # choose html over txt files for documentation -#%doc *.html PKG-INFO LGPLlicense_files SimPyModels -%doc *.html PKG-INFO SimPyModels -%doc SimPyDocs/*.html SimPyDocs/*.css +%doc *.html PKG-INFO LGPLlicense_files SimPyModels +%doc SimPyDocs/*.html SimPyDocs/*.css SimPyDocs/*.pdf SimPyDocs/*.xls %doc SimPyDocs/bankprograms SimPyDocs/images SimPyDocs/Interfacing SimPyDocs/SimGUIManual SimPyDocs/SimPlotManual SimPyDocs/SimStepManual %files doc %defattr(-,root,root) -%doc SimPyDocs/SimPy_Sourcecode_Documentation/* +%doc SimPyDocs/SimPy_Sourcecode_Documentation/ %changelog +* Mon Feb 12 2007 Sarantis Paskalis - 1.8-1 +- Update to 1.8 + +* Mon Jan 22 2007 Sarantis Paskalis - 1.8-0.1.rc1 +- Update to 1.8rc. + +* Sat Dec 9 2006 Sarantis Paskalis - 1.7.1-5 +- Rebuild for rawhide. + * Wed Sep 6 2006 Sarantis Paskalis - 1.7.1-4 - Un-ghost .pyo files. Thanks Christian Iseli (bug #205424). Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-simpy/FC-6/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 19 Jun 2006 11:54:34 -0000 1.4 +++ sources 13 Feb 2007 12:23:36 -0000 1.5 @@ -1 +1 @@ -3ec045f8d02fc1008258d00d0f97c7ff SimPy-1.7.1.tar.gz +7abc6365009375b6f3d814288eeeb283 SimPy-1.8.tar.gz From fedora-extras-commits at redhat.com Tue Feb 13 12:27:24 2007 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Tue, 13 Feb 2007 07:27:24 -0500 Subject: rpms/python-simpy/FC-5 .cvsignore, 1.4, 1.5 python-simpy.spec, 1.12, 1.13 sources, 1.4, 1.5 Message-ID: <200702131227.l1DCROfS026196@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26166 Modified Files: .cvsignore python-simpy.spec sources Log Message: Update to 1.8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-simpy/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 19 Jun 2006 12:00:22 -0000 1.4 +++ .cvsignore 13 Feb 2007 12:26:51 -0000 1.5 @@ -1 +1 @@ -SimPy-1.7.1.tar.gz +SimPy-1.8.tar.gz Index: python-simpy.spec =================================================================== RCS file: /cvs/extras/rpms/python-simpy/FC-5/python-simpy.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- python-simpy.spec 6 Sep 2006 14:14:17 -0000 1.12 +++ python-simpy.spec 13 Feb 2007 12:26:51 -0000 1.13 @@ -2,8 +2,8 @@ %define pkgname SimPy Name: python-simpy -Version: 1.7.1 -Release: 4%{?dist} +Version: 1.8 +Release: 1%{?dist} Summary: Python simulation framework Group: Development/Languages License: LGPL @@ -38,7 +38,10 @@ %prep %setup -q -n %{pkgname}-%{version} # Remove the shebangs to make rpmlint happy -%{__sed} -i '1{\?^#!/usr/bin/env\ python$?d}' SimPy/*.py +sed -i -e '/^#!.*python/,1D' SimPy/*.py + +# Remove carriage returns to make rpmlint happy +sed -i 's/\r//' SimPy/*.py %build %{__python} setup.py build @@ -58,18 +61,20 @@ %defattr(-,root,root,-) %{python_sitelib}/%{pkgname}/ # choose html over txt files for documentation -#%doc *.html PKG-INFO LGPLlicense_files SimPyModels -%doc *.html PKG-INFO SimPyModels -%doc SimPyDocs/*.html SimPyDocs/*.css +%doc *.html PKG-INFO LGPLlicense_files SimPyModels +%doc SimPyDocs/*.html SimPyDocs/*.css SimPyDocs/*.pdf SimPyDocs/*.xls %doc SimPyDocs/bankprograms SimPyDocs/images SimPyDocs/Interfacing SimPyDocs/SimGUIManual SimPyDocs/SimPlotManual SimPyDocs/SimStepManual %files doc %defattr(-,root,root) -%doc SimPyDocs/SimPy_Sourcecode_Documentation/* +%doc SimPyDocs/SimPy_Sourcecode_Documentation/ %changelog +* Mon Feb 12 2007 Sarantis Paskalis - 1.8-1 +- Update to 1.8 + * Wed Sep 6 2006 Sarantis Paskalis - 1.7.1-4 - Un-ghost .pyo files. Thanks Christian Iseli (bug #205424). Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-simpy/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 19 Jun 2006 12:00:22 -0000 1.4 +++ sources 13 Feb 2007 12:26:51 -0000 1.5 @@ -1 +1 @@ -3ec045f8d02fc1008258d00d0f97c7ff SimPy-1.7.1.tar.gz +7abc6365009375b6f3d814288eeeb283 SimPy-1.8.tar.gz From fedora-extras-commits at redhat.com Tue Feb 13 12:37:23 2007 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 13 Feb 2007 07:37:23 -0500 Subject: rpms/gnome-libs/devel gnome-libs-1.4.2-multilib.patch, NONE, 1.1 gnome-libs.spec, 1.1, 1.2 Message-ID: <200702131237.l1DCbNOO026365@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gnome-libs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26342 Modified Files: gnome-libs.spec Added Files: gnome-libs-1.4.2-multilib.patch Log Message: Fix multilib conflict in /etc/mime-magic.dat (#228361) gnome-libs-1.4.2-multilib.patch: --- NEW FILE gnome-libs-1.4.2-multilib.patch --- --- gnome-libs-1.4.2/libgnome/gnome-magic.c 2000-03-06 16:37:04.000000000 +0000 +++ gnome-libs-1.4.2/libgnome/gnome-magic.c 2007-02-13 11:36:18.000000000 +0000 @@ -188,6 +188,7 @@ while(fgets(aline, sizeof(aline), infile)) { curpos = aline; + memset(&newent, 0, sizeof(newent)); while(*curpos && isspace(*curpos)) curpos++; /* eat the head */ if(!isdigit(*curpos)) continue; Index: gnome-libs.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-libs/devel/gnome-libs.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnome-libs.spec 14 Sep 2006 06:23:10 -0000 1.1 +++ gnome-libs.spec 13 Feb 2007 12:36:51 -0000 1.2 @@ -5,7 +5,7 @@ Name: gnome-libs Epoch: 1 Version: 1.4.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The main GNOME1 libraries License: LGPL Group: System Environment/Libraries @@ -62,6 +62,9 @@ Patch81: db.1.85.s390.patch Patch82: db.1.85.nodebug.patch +# Fedora patches +Patch100: gnome-libs-1.4.2-multilib.patch + %description GNOME (GNU Network Object Model Environment) is a user-friendly set of GUI applications and desktop tools to be used in conjunction with a window manager @@ -120,6 +123,8 @@ %patch82 -p1 -b .nodebug cd - +%patch100 -p1 -b .multilib + %build ## db1 @@ -212,7 +217,7 @@ %postun -p /sbin/ldconfig %files -f %{name}.lang -%defattr(-,root,root,755) +%defattr(-,root,root,-) %doc AUTHORS COPYING COPYING.LIB ChangeLog NEWS README %{dbdir}/LICENSE %{dbdir}/changelog %{_bindir}/db1_dump185 %{_bindir}/dns-helper @@ -242,7 +247,7 @@ %config %{_sysconfdir}/sound/events/*.soundlist %files devel -%defattr(-,root,root,755) +%defattr(-,root,root,-) %{_bindir}/gnome-config %{_bindir}/libart-config %{_bindir}/gnome-doc @@ -256,6 +261,9 @@ %{_datadir}/emacs/site-lisp/gnome-doc.el %changelog +* Tue Feb 13 2007 Paul Howarth 1:1.4.2-4 +- Fix multilib conflict in /etc/mime-magic.dat (#228361) + * Wed Sep 13 2006 Paul Howarth 1:1.4.2-3 - Add full URLs or CVS information for source files - Remove conflicts for ancient glibc versions From fedora-extras-commits at redhat.com Tue Feb 13 15:29:17 2007 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Tue, 13 Feb 2007 10:29:17 -0500 Subject: rpms/codeblocks/devel codeblocks-wx28-wizard.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 codeblocks.spec, 1.13, 1.14 sources, 1.13, 1.14 Message-ID: <200702131529.l1DFTHlQ005501@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/codeblocks/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5475 Modified Files: .cvsignore codeblocks.spec sources Added Files: codeblocks-wx28-wizard.patch Log Message: - update to revision 3592 - added patch for New Project wizard with wxGTK 2.8 (#225058) - created -libs subpackage to make package multilib-aware (#228356) codeblocks-wx28-wizard.patch: --- NEW FILE codeblocks-wx28-wizard.patch --- Index: src/plugins/scriptedwizard/wiz.cpp =================================================================== --- src/plugins/scriptedwizard/wiz.cpp (revision 3562) +++ src/plugins/scriptedwizard/wiz.cpp (working copy) @@ -1001,8 +1001,12 @@ wxWizardPageSimple::Chain(m_Pages[i - 1], m_Pages[i]); // allow the wizard to size itself around the pages +#if wxCHECK_VERSION(2, 8, 0) + m_pWizard->GetPageAreaSizer()->Add(m_Pages[0]); +#else for (size_t i = 1; i < m_Pages.GetCount(); ++i) m_pWizard->GetPageAreaSizer()->Add(m_Pages[i]); +#endif m_pWizard->Fit(); } Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/codeblocks/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 26 Jan 2007 13:25:09 -0000 1.13 +++ .cvsignore 13 Feb 2007 15:28:45 -0000 1.14 @@ -1 +1 @@ -codeblocks-svn3540.tar.bz2 +codeblocks-svn3592.tar.bz2 Index: codeblocks.spec =================================================================== RCS file: /cvs/extras/rpms/codeblocks/devel/codeblocks.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- codeblocks.spec 26 Jan 2007 13:51:18 -0000 1.13 +++ codeblocks.spec 13 Feb 2007 15:28:45 -0000 1.14 @@ -1,9 +1,9 @@ -%define rev 3540 -%define date 20070125 +%define rev 3592 +%define date 20070211 Name: codeblocks Version: 1.0 -Release: 0.21.%{date}svn%{rev}%{?dist} +Release: 0.22.%{date}svn%{rev}%{?dist} Summary: An open source, cross platform, free C++ IDE Group: Development/Tools License: GPL @@ -15,12 +15,14 @@ BuildRequires: dos2unix BuildRequires: autoconf, automake, libtool BuildRequires: desktop-file-utils +Requires: %{name}-libs = %{version}-%{release} Requires: shared-mime-info Patch1: codeblocks-plugins.patch Patch2: codeblocks-desktop.patch Patch3: codeblocks-autorev.patch Patch100: codeblocks-wx28-listbook.patch Patch101: codeblocks-wx28-wxsmith.patch +Patch102: codeblocks-wx28-wizard.patch Source100: codeblocks-getsvn %description @@ -30,10 +32,17 @@ extended with plugin DLLs. It includes a plugin wizard, so you can compile your own plugins. +%package libs +Summary: Libraries needed to run Code::Blocks and its plugins +Group: System Environment/Libraries + +%description libs +Libraries needed to run Code::Blocks and its plugins. + %package devel Summary: Files needed to build Code::Blocks plugins Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Requires: pkgconfig %description devel @@ -60,6 +69,7 @@ %patch3 %patch100 %patch101 +%patch102 %build find . -type f -and -not -name "*.cpp" -and -not -name "*.h" -and -not -name "*.png" -and -not -name "*.bmp" -and -not -name "*.c" -and -not -name "*.cxx" -and -not -name "*.ico" | sed "s/.*/\"\\0\"/" | xargs dos2unix &> /dev/null @@ -79,7 +89,8 @@ sed -i 's|@libdir@|%{_libdir}|' src/sdk/configmanager.cpp # generate revision.m4 -echo "m4_define([SVN_REVISION], trunk-r%{rev})" > revision.m4 +echo "m4_define([SVN_REV], %{rev})" > revision.m4 +echo "m4_define([SVN_REVISION], trunk-r%{rev})" >> revision.m4 ./bootstrap @@ -134,19 +145,20 @@ rm -rf $RPM_BUILD_ROOT %post -/sbin/ldconfig update-mime-database /usr/share/mime &> /dev/null || : %postun -/sbin/ldconfig update-mime-database /usr/share/mime &> /dev/null || : +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig + %files %defattr(-,root,root) %doc README COPYING AUTHORS BUGS COMPILERS NEWS ChangeLog %{_bindir}/* -%{_libdir}/*.so.* %{_mandir}/man1/*.gz %dir %{pkglibdir} @@ -192,6 +204,10 @@ %{pkgdatadir}/todo.zip %{pkgdatadir}/tips.txt +%files libs +%defattr(-,root,root) +%{_libdir}/*.so.* + %files devel %defattr(-,root,root) %{_includedir}/%{name} @@ -234,6 +250,11 @@ %changelog +* Tue Feb 13 2007 Dan Horak 1.0-0.22.20070211svn3592 +- update to revision 3592 +- added patch for New Project wizard with wxGTK 2.8 (#225058) +- created -libs subpackage to make package multilib-aware (#228356) + * Fri Jan 26 2007 Dan Horak 1.0-0.21.20070125svn3540 - update the listbook.patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/codeblocks/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 26 Jan 2007 13:25:09 -0000 1.13 +++ sources 13 Feb 2007 15:28:45 -0000 1.14 @@ -1 +1 @@ -cd2382b6c0f932f5d46f03c935979504 codeblocks-svn3540.tar.bz2 +7c3e8b377cb4df9817b55a609e853a0c codeblocks-svn3592.tar.bz2 From fedora-extras-commits at redhat.com Tue Feb 13 15:44:36 2007 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Tue, 13 Feb 2007 10:44:36 -0500 Subject: rpms/codeblocks/devel codeblocks-autorev.patch, 1.2, 1.3 codeblocks.spec, 1.14, 1.15 Message-ID: <200702131544.l1DFiabZ005696@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/codeblocks/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5674 Modified Files: codeblocks-autorev.patch codeblocks.spec Log Message: - update the autorev.patch codeblocks-autorev.patch: Index: codeblocks-autorev.patch =================================================================== RCS file: /cvs/extras/rpms/codeblocks/devel/codeblocks-autorev.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- codeblocks-autorev.patch 30 Oct 2006 07:50:41 -0000 1.2 +++ codeblocks-autorev.patch 13 Feb 2007 15:44:04 -0000 1.3 @@ -1,19 +1,21 @@ ---- bootstrap.orig 2006-09-13 18:01:54.000000000 +0200 -+++ bootstrap 2006-09-13 18:02:04.000000000 +0200 -@@ -8,13 +8,6 @@ - # - automake 1.7+ +--- bootstrap (revision 3562) ++++ bootstrap (working copy) +@@ -6,15 +6,6 @@ + # - automake 1.7+, 1.9+ for make dist # - libtool 1.4+ -# Touch revision.m4 -if [ -f ./update_revision.sh ]; then - ./update_revision.sh; -elif [ ! -f ./revision.m4 ]; then -- echo "m4_define([SVN_REVISION], trunk-r0)" > ./revision.m4; +- echo "m4_define([SVN_REV], 0)" > ./revision.m4; +- echo "m4_define([SVN_REVISION], trunk-r0)" >> ./revision.m4; +- echo "m4_define([SVN_DATE], )" >> ./revision.m4; -fi - # Deal with some gentoo-specific issues - export WANT_AUTOMAKE='1.7' - export WANT_AUTOCONF='2.5' + WANT_AUTOMAKE='1.9 1.8 1.7' #latest of these is chosen or default if none hits + export WANT_AUTOMAKE --- src/Makefile.am.orig 2006-10-15 10:11:04.000000000 +0200 +++ src/Makefile.am 2006-10-15 10:11:09.000000000 +0200 @@ -1,4 +1,4 @@ Index: codeblocks.spec =================================================================== RCS file: /cvs/extras/rpms/codeblocks/devel/codeblocks.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- codeblocks.spec 13 Feb 2007 15:28:45 -0000 1.14 +++ codeblocks.spec 13 Feb 2007 15:44:04 -0000 1.15 @@ -3,7 +3,7 @@ Name: codeblocks Version: 1.0 -Release: 0.22.%{date}svn%{rev}%{?dist} +Release: 0.23.%{date}svn%{rev}%{?dist} Summary: An open source, cross platform, free C++ IDE Group: Development/Tools License: GPL @@ -250,6 +250,9 @@ %changelog +* Tue Feb 13 2007 Dan Horak 1.0-0.23.20070211svn3592 +- update the autorev.patch + * Tue Feb 13 2007 Dan Horak 1.0-0.22.20070211svn3592 - update to revision 3592 - added patch for New Project wizard with wxGTK 2.8 (#225058) From fedora-extras-commits at redhat.com Tue Feb 13 16:02:22 2007 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Tue, 13 Feb 2007 11:02:22 -0500 Subject: rpms/codeblocks/FC-6 codeblocks-wx28-wizard.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 codeblocks-autorev.patch, 1.2, 1.3 codeblocks.spec, 1.13, 1.14 sources, 1.13, 1.14 Message-ID: <200702131602.l1DG2MuE009415@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/codeblocks/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9347 Modified Files: .cvsignore codeblocks-autorev.patch codeblocks.spec sources Added Files: codeblocks-wx28-wizard.patch Log Message: - update the autorev.patch - update to revision 3592 - added patch for New Project wizard with wxGTK 2.8 (#225058) - created -libs subpackage to make package multilib-aware (#228356) codeblocks-wx28-wizard.patch: --- NEW FILE codeblocks-wx28-wizard.patch --- Index: src/plugins/scriptedwizard/wiz.cpp =================================================================== --- src/plugins/scriptedwizard/wiz.cpp (revision 3562) +++ src/plugins/scriptedwizard/wiz.cpp (working copy) @@ -1001,8 +1001,12 @@ wxWizardPageSimple::Chain(m_Pages[i - 1], m_Pages[i]); // allow the wizard to size itself around the pages +#if wxCHECK_VERSION(2, 8, 0) + m_pWizard->GetPageAreaSizer()->Add(m_Pages[0]); +#else for (size_t i = 1; i < m_Pages.GetCount(); ++i) m_pWizard->GetPageAreaSizer()->Add(m_Pages[i]); +#endif m_pWizard->Fit(); } Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/codeblocks/FC-6/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 26 Jan 2007 13:29:37 -0000 1.13 +++ .cvsignore 13 Feb 2007 16:01:49 -0000 1.14 @@ -1 +1 @@ -codeblocks-svn3540.tar.bz2 +codeblocks-svn3592.tar.bz2 codeblocks-autorev.patch: Index: codeblocks-autorev.patch =================================================================== RCS file: /cvs/extras/rpms/codeblocks/FC-6/codeblocks-autorev.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- codeblocks-autorev.patch 30 Oct 2006 08:39:39 -0000 1.2 +++ codeblocks-autorev.patch 13 Feb 2007 16:01:49 -0000 1.3 @@ -1,19 +1,21 @@ ---- bootstrap.orig 2006-09-13 18:01:54.000000000 +0200 -+++ bootstrap 2006-09-13 18:02:04.000000000 +0200 -@@ -8,13 +8,6 @@ - # - automake 1.7+ +--- bootstrap (revision 3562) ++++ bootstrap (working copy) +@@ -6,15 +6,6 @@ + # - automake 1.7+, 1.9+ for make dist # - libtool 1.4+ -# Touch revision.m4 -if [ -f ./update_revision.sh ]; then - ./update_revision.sh; -elif [ ! -f ./revision.m4 ]; then -- echo "m4_define([SVN_REVISION], trunk-r0)" > ./revision.m4; +- echo "m4_define([SVN_REV], 0)" > ./revision.m4; +- echo "m4_define([SVN_REVISION], trunk-r0)" >> ./revision.m4; +- echo "m4_define([SVN_DATE], )" >> ./revision.m4; -fi - # Deal with some gentoo-specific issues - export WANT_AUTOMAKE='1.7' - export WANT_AUTOCONF='2.5' + WANT_AUTOMAKE='1.9 1.8 1.7' #latest of these is chosen or default if none hits + export WANT_AUTOMAKE --- src/Makefile.am.orig 2006-10-15 10:11:04.000000000 +0200 +++ src/Makefile.am 2006-10-15 10:11:09.000000000 +0200 @@ -1,4 +1,4 @@ Index: codeblocks.spec =================================================================== RCS file: /cvs/extras/rpms/codeblocks/FC-6/codeblocks.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- codeblocks.spec 26 Jan 2007 13:42:24 -0000 1.13 +++ codeblocks.spec 13 Feb 2007 16:01:49 -0000 1.14 @@ -1,9 +1,9 @@ -%define rev 3540 -%define date 20070125 +%define rev 3592 +%define date 20070211 Name: codeblocks Version: 1.0 -Release: 0.21.%{date}svn%{rev}%{?dist} +Release: 0.23.%{date}svn%{rev}%{?dist} Summary: An open source, cross platform, free C++ IDE Group: Development/Tools License: GPL @@ -15,12 +15,14 @@ BuildRequires: dos2unix BuildRequires: autoconf, automake, libtool BuildRequires: desktop-file-utils +Requires: %{name}-libs = %{version}-%{release} Requires: shared-mime-info Patch1: codeblocks-plugins.patch Patch2: codeblocks-desktop.patch Patch3: codeblocks-autorev.patch Patch100: codeblocks-wx28-listbook.patch Patch101: codeblocks-wx28-wxsmith.patch +Patch102: codeblocks-wx28-wizard.patch Source100: codeblocks-getsvn %description @@ -30,10 +32,17 @@ extended with plugin DLLs. It includes a plugin wizard, so you can compile your own plugins. +%package libs +Summary: Libraries needed to run Code::Blocks and its plugins +Group: System Environment/Libraries + +%description libs +Libraries needed to run Code::Blocks and its plugins. + %package devel Summary: Files needed to build Code::Blocks plugins Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Requires: pkgconfig %description devel @@ -60,6 +69,7 @@ %patch3 %patch100 %patch101 +%patch102 %build find . -type f -and -not -name "*.cpp" -and -not -name "*.h" -and -not -name "*.png" -and -not -name "*.bmp" -and -not -name "*.c" -and -not -name "*.cxx" -and -not -name "*.ico" | sed "s/.*/\"\\0\"/" | xargs dos2unix &> /dev/null @@ -79,7 +89,8 @@ sed -i 's|@libdir@|%{_libdir}|' src/sdk/configmanager.cpp # generate revision.m4 -echo "m4_define([SVN_REVISION], trunk-r%{rev})" > revision.m4 +echo "m4_define([SVN_REV], %{rev})" > revision.m4 +echo "m4_define([SVN_REVISION], trunk-r%{rev})" >> revision.m4 ./bootstrap @@ -134,19 +145,20 @@ rm -rf $RPM_BUILD_ROOT %post -/sbin/ldconfig update-mime-database /usr/share/mime &> /dev/null || : %postun -/sbin/ldconfig update-mime-database /usr/share/mime &> /dev/null || : +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig + %files %defattr(-,root,root) %doc README COPYING AUTHORS BUGS COMPILERS NEWS ChangeLog %{_bindir}/* -%{_libdir}/*.so.* %{_mandir}/man1/*.gz %dir %{pkglibdir} @@ -192,6 +204,10 @@ %{pkgdatadir}/todo.zip %{pkgdatadir}/tips.txt +%files libs +%defattr(-,root,root) +%{_libdir}/*.so.* + %files devel %defattr(-,root,root) %{_includedir}/%{name} @@ -234,6 +250,14 @@ %changelog +* Tue Feb 13 2007 Dan Horak 1.0-0.23.20070211svn3592 +- update the autorev.patch + +* Tue Feb 13 2007 Dan Horak 1.0-0.22.20070211svn3592 +- update to revision 3592 +- added patch for New Project wizard with wxGTK 2.8 (#225058) +- created -libs subpackage to make package multilib-aware (#228356) + * Fri Jan 26 2007 Dan Horak 1.0-0.21.20070125svn3540 - update the listbook.patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/codeblocks/FC-6/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 26 Jan 2007 13:29:37 -0000 1.13 +++ sources 13 Feb 2007 16:01:49 -0000 1.14 @@ -1 +1 @@ -cd2382b6c0f932f5d46f03c935979504 codeblocks-svn3540.tar.bz2 +7c3e8b377cb4df9817b55a609e853a0c codeblocks-svn3592.tar.bz2 From fedora-extras-commits at redhat.com Tue Feb 13 16:05:14 2007 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Tue, 13 Feb 2007 11:05:14 -0500 Subject: rpms/codeblocks/FC-5 codeblocks-wx28-wizard.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 codeblocks-autorev.patch, 1.2, 1.3 codeblocks.spec, 1.13, 1.14 sources, 1.13, 1.14 Message-ID: <200702131605.l1DG5EHJ009496@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/codeblocks/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9467 Modified Files: .cvsignore codeblocks-autorev.patch codeblocks.spec sources Added Files: codeblocks-wx28-wizard.patch Log Message: - update the autorev.patch - update to revision 3592 - added patch for New Project wizard with wxGTK 2.8 (#225058) - created -libs subpackage to make package multilib-aware (#228356) codeblocks-wx28-wizard.patch: --- NEW FILE codeblocks-wx28-wizard.patch --- Index: src/plugins/scriptedwizard/wiz.cpp =================================================================== --- src/plugins/scriptedwizard/wiz.cpp (revision 3562) +++ src/plugins/scriptedwizard/wiz.cpp (working copy) @@ -1001,8 +1001,12 @@ wxWizardPageSimple::Chain(m_Pages[i - 1], m_Pages[i]); // allow the wizard to size itself around the pages +#if wxCHECK_VERSION(2, 8, 0) + m_pWizard->GetPageAreaSizer()->Add(m_Pages[0]); +#else for (size_t i = 1; i < m_Pages.GetCount(); ++i) m_pWizard->GetPageAreaSizer()->Add(m_Pages[i]); +#endif m_pWizard->Fit(); } Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/codeblocks/FC-5/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 26 Jan 2007 13:37:42 -0000 1.13 +++ .cvsignore 13 Feb 2007 16:04:41 -0000 1.14 @@ -1 +1 @@ -codeblocks-svn3540.tar.bz2 +codeblocks-svn3592.tar.bz2 codeblocks-autorev.patch: Index: codeblocks-autorev.patch =================================================================== RCS file: /cvs/extras/rpms/codeblocks/FC-5/codeblocks-autorev.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- codeblocks-autorev.patch 30 Oct 2006 08:46:37 -0000 1.2 +++ codeblocks-autorev.patch 13 Feb 2007 16:04:41 -0000 1.3 @@ -1,19 +1,21 @@ ---- bootstrap.orig 2006-09-13 18:01:54.000000000 +0200 -+++ bootstrap 2006-09-13 18:02:04.000000000 +0200 -@@ -8,13 +8,6 @@ - # - automake 1.7+ +--- bootstrap (revision 3562) ++++ bootstrap (working copy) +@@ -6,15 +6,6 @@ + # - automake 1.7+, 1.9+ for make dist # - libtool 1.4+ -# Touch revision.m4 -if [ -f ./update_revision.sh ]; then - ./update_revision.sh; -elif [ ! -f ./revision.m4 ]; then -- echo "m4_define([SVN_REVISION], trunk-r0)" > ./revision.m4; +- echo "m4_define([SVN_REV], 0)" > ./revision.m4; +- echo "m4_define([SVN_REVISION], trunk-r0)" >> ./revision.m4; +- echo "m4_define([SVN_DATE], )" >> ./revision.m4; -fi - # Deal with some gentoo-specific issues - export WANT_AUTOMAKE='1.7' - export WANT_AUTOCONF='2.5' + WANT_AUTOMAKE='1.9 1.8 1.7' #latest of these is chosen or default if none hits + export WANT_AUTOMAKE --- src/Makefile.am.orig 2006-10-15 10:11:04.000000000 +0200 +++ src/Makefile.am 2006-10-15 10:11:09.000000000 +0200 @@ -1,4 +1,4 @@ Index: codeblocks.spec =================================================================== RCS file: /cvs/extras/rpms/codeblocks/FC-5/codeblocks.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- codeblocks.spec 26 Jan 2007 13:39:38 -0000 1.13 +++ codeblocks.spec 13 Feb 2007 16:04:41 -0000 1.14 @@ -1,9 +1,9 @@ -%define rev 3540 -%define date 20070125 +%define rev 3592 +%define date 20070211 Name: codeblocks Version: 1.0 -Release: 0.21.%{date}svn%{rev}%{?dist} +Release: 0.23.%{date}svn%{rev}%{?dist} Summary: An open source, cross platform, free C++ IDE Group: Development/Tools License: GPL @@ -15,12 +15,14 @@ BuildRequires: dos2unix BuildRequires: autoconf, automake, libtool BuildRequires: desktop-file-utils +Requires: %{name}-libs = %{version}-%{release} Requires: shared-mime-info Patch1: codeblocks-plugins.patch Patch2: codeblocks-desktop.patch Patch3: codeblocks-autorev.patch Patch100: codeblocks-wx28-listbook.patch Patch101: codeblocks-wx28-wxsmith.patch +Patch102: codeblocks-wx28-wizard.patch Source100: codeblocks-getsvn %description @@ -30,10 +32,17 @@ extended with plugin DLLs. It includes a plugin wizard, so you can compile your own plugins. +%package libs +Summary: Libraries needed to run Code::Blocks and its plugins +Group: System Environment/Libraries + +%description libs +Libraries needed to run Code::Blocks and its plugins. + %package devel Summary: Files needed to build Code::Blocks plugins Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Requires: pkgconfig %description devel @@ -60,6 +69,7 @@ %patch3 %patch100 %patch101 +%patch102 %build find . -type f -and -not -name "*.cpp" -and -not -name "*.h" -and -not -name "*.png" -and -not -name "*.bmp" -and -not -name "*.c" -and -not -name "*.cxx" -and -not -name "*.ico" | sed "s/.*/\"\\0\"/" | xargs dos2unix &> /dev/null @@ -79,7 +89,8 @@ sed -i 's|@libdir@|%{_libdir}|' src/sdk/configmanager.cpp # generate revision.m4 -echo "m4_define([SVN_REVISION], trunk-r%{rev})" > revision.m4 +echo "m4_define([SVN_REV], %{rev})" > revision.m4 +echo "m4_define([SVN_REVISION], trunk-r%{rev})" >> revision.m4 ./bootstrap @@ -134,19 +145,20 @@ rm -rf $RPM_BUILD_ROOT %post -/sbin/ldconfig update-mime-database /usr/share/mime &> /dev/null || : %postun -/sbin/ldconfig update-mime-database /usr/share/mime &> /dev/null || : +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig + %files %defattr(-,root,root) %doc README COPYING AUTHORS BUGS COMPILERS NEWS ChangeLog %{_bindir}/* -%{_libdir}/*.so.* %{_mandir}/man1/*.gz %dir %{pkglibdir} @@ -192,6 +204,10 @@ %{pkgdatadir}/todo.zip %{pkgdatadir}/tips.txt +%files libs +%defattr(-,root,root) +%{_libdir}/*.so.* + %files devel %defattr(-,root,root) %{_includedir}/%{name} @@ -234,6 +250,14 @@ %changelog +* Tue Feb 13 2007 Dan Horak 1.0-0.23.20070211svn3592 +- update the autorev.patch + +* Tue Feb 13 2007 Dan Horak 1.0-0.22.20070211svn3592 +- update to revision 3592 +- added patch for New Project wizard with wxGTK 2.8 (#225058) +- created -libs subpackage to make package multilib-aware (#228356) + * Fri Jan 26 2007 Dan Horak 1.0-0.21.20070125svn3540 - update the listbook.patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/codeblocks/FC-5/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 26 Jan 2007 13:37:42 -0000 1.13 +++ sources 13 Feb 2007 16:04:41 -0000 1.14 @@ -1 +1 @@ -cd2382b6c0f932f5d46f03c935979504 codeblocks-svn3540.tar.bz2 +7c3e8b377cb4df9817b55a609e853a0c codeblocks-svn3592.tar.bz2 From fedora-extras-commits at redhat.com Tue Feb 13 16:09:48 2007 From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin)) Date: Tue, 13 Feb 2007 11:09:48 -0500 Subject: rpms/oddjob/devel oddjob.spec,1.12,1.13 Message-ID: <200702131609.l1DG9m67009633@cvs-int.fedora.redhat.com> Author: nalin Update of /cvs/extras/rpms/oddjob/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9614 Modified Files: oddjob.spec Log Message: - make -devel depend on -libs, which supplies the libraries to which it symlinks (#228377) Index: oddjob.spec =================================================================== RCS file: /cvs/extras/rpms/oddjob/devel/oddjob.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- oddjob.spec 11 Dec 2006 03:12:31 -0000 1.12 +++ oddjob.spec 13 Feb 2007 16:09:16 -0000 1.13 @@ -2,7 +2,7 @@ Name: oddjob Version: 0.27 -Release: 9 +Release: 10 Source: http://people.redhat.com/nalin/oddjob/oddjob-%{version}-1.tar.gz Summary: A D-BUS service which runs odd jobs on behalf of client applications License: BSD @@ -26,7 +26,7 @@ %package devel Group: Development/Libraries Summary: Files for developing oddjob clients -Requires: %{name} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Requires: pkgconfig %description devel @@ -145,6 +145,10 @@ %postun libs -p /sbin/ldconfig %changelog +* Tue Feb 13 2006 Nalin Dahyabhai 0.27-10 +- make -devel depend on -libs, which supplies the libraries to which it + symlinks (#228377) + * Sun Dec 10 2006 Nalin Dahyabhai 0.27-9 - add BuildRequires: on python-devel From fedora-extras-commits at redhat.com Tue Feb 13 16:46:25 2007 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Tue, 13 Feb 2007 11:46:25 -0500 Subject: rpms/gpsim/devel gpsim.spec,1.13,1.14 Message-ID: <200702131646.l1DGkP8o010134@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/gpsim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10117 Modified Files: gpsim.spec Log Message: Remove Makefiles that are in conflict between i386 and x86_64 arch. Fix #228362 Index: gpsim.spec =================================================================== RCS file: /cvs/extras/rpms/gpsim/devel/gpsim.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gpsim.spec 5 Feb 2007 10:32:19 -0000 1.13 +++ gpsim.spec 13 Feb 2007 16:45:53 -0000 1.14 @@ -1,6 +1,6 @@ Name: gpsim Version: 0.22.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A simulator for Microchip (TM) PIC (TM) microcontrollers Summary(fr): Un simulateur pour les microcontr??leurs PIC (TM) Microchip (TM) @@ -51,6 +51,9 @@ %install %{__rm} -rf %{buildroot} %{__make} install DESTDIR=%{buildroot} +%{__rm} -f examples/Makefile +%{__rm} -f examples/modules/Makefile +%{__rm} -f examples/projects/Makefile %clean %{__rm} -rf %{buildroot} @@ -77,6 +80,10 @@ %{_includedir}/* %changelog +* Tue Feb 13 2007 Alain Portal 0.22.0-3 + - Remove Makefiles that are in conflict between i386 and x86_64 arch + Fix #228362 + * Mon Feb 5 2007 Alain Portal 0.22.0-2 - FE7 rebuild From fedora-extras-commits at redhat.com Tue Feb 13 16:47:57 2007 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Tue, 13 Feb 2007 11:47:57 -0500 Subject: rpms/gpsim/FC-6 gpsim.spec,1.12,1.13 Message-ID: <200702131647.l1DGlv6S010199@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/gpsim/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10180 Modified Files: gpsim.spec Log Message: Remove Makefiles that are in conflict between i386 and x86_64 arch. Fix #228362 Index: gpsim.spec =================================================================== RCS file: /cvs/extras/rpms/gpsim/FC-6/gpsim.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gpsim.spec 14 Nov 2006 15:26:14 -0000 1.12 +++ gpsim.spec 13 Feb 2007 16:47:25 -0000 1.13 @@ -1,6 +1,6 @@ Name: gpsim Version: 0.22.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A simulator for Microchip (TM) PIC (TM) microcontrollers Summary(fr): Un simulateur pour les microcontr??leurs PIC (TM) Microchip (TM) @@ -51,6 +51,9 @@ %install %{__rm} -rf %{buildroot} %{__make} install DESTDIR=%{buildroot} +%{__rm} -f examples/Makefile +%{__rm} -f examples/modules/Makefile +%{__rm} -f examples/projects/Makefile %clean %{__rm} -rf %{buildroot} @@ -77,6 +80,10 @@ %{_includedir}/* %changelog +* Tue Feb 13 2007 Alain Portal 0.22.0-2 + - Remove Makefiles that are in conflict between i386 and x86_64 arch + Fix #228362 + * Tue Nov 14 2006 Alain Portal 0.22.0-1 - New upstream version - Remove patches that are no more needed (applied by upstream) From fedora-extras-commits at redhat.com Tue Feb 13 16:48:53 2007 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Tue, 13 Feb 2007 11:48:53 -0500 Subject: rpms/gpsim/FC-5 gpsim.spec,1.10,1.11 Message-ID: <200702131648.l1DGmrlu010270@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/gpsim/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10243 Modified Files: gpsim.spec Log Message: Remove Makefiles that are in conflict between i386 and x86_64 arch. Fix #228362 Index: gpsim.spec =================================================================== RCS file: /cvs/extras/rpms/gpsim/FC-5/gpsim.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gpsim.spec 14 Nov 2006 15:28:23 -0000 1.10 +++ gpsim.spec 13 Feb 2007 16:48:21 -0000 1.11 @@ -1,6 +1,6 @@ Name: gpsim Version: 0.22.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A simulator for Microchip (TM) PIC (TM) microcontrollers Summary(fr): Un simulateur pour les microcontr??leurs PIC (TM) Microchip (TM) @@ -51,6 +51,9 @@ %install %{__rm} -rf %{buildroot} %{__make} install DESTDIR=%{buildroot} +%{__rm} -f examples/Makefile +%{__rm} -f examples/modules/Makefile +%{__rm} -f examples/projects/Makefile %clean %{__rm} -rf %{buildroot} @@ -77,6 +80,10 @@ %{_includedir}/* %changelog +* Tue Feb 13 2007 Alain Portal 0.22.0-3 + - Remove Makefiles that are in conflict between i386 and x86_64 arch + Fix #228362 + * Tue Nov 14 2006 Alain Portal 0.22.0-1 - New upstream version - Remove patches that are no more needed (applied by upstream) From fedora-extras-commits at redhat.com Tue Feb 13 16:51:20 2007 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 13 Feb 2007 11:51:20 -0500 Subject: rpms/supertux/devel supertux.spec,1.12,1.13 Message-ID: <200702131651.l1DGpKwC010384@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/supertux/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10360 Modified Files: supertux.spec Log Message: This is a work-in-progress. It builds, but won't install. - Update to 0.3.0. - Update URL. - Drop compile fix patch. - BR: physfs-devel, openal-devel. - Build uses jam instead of make now. Index: supertux.spec =================================================================== RCS file: /cvs/extras/rpms/supertux/devel/supertux.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- supertux.spec 28 Aug 2006 19:39:10 -0000 1.12 +++ supertux.spec 13 Feb 2007 16:50:48 -0000 1.13 @@ -1,18 +1,15 @@ Name: supertux -Version: 0.1.3 -Release: 5%{?dist} - +Version: 0.3.0 +Release: 1%{?dist} Summary: Jump'n run like game similar to Mario Bros - Group: Amusements/Games License: GPL -URL: http://supertux.berlios.de/ +URL: http://supertux.lethargik.org/ Source0: http://download.berlios.de/supertux/supertux-%{version}.tar.bz2 -Patch0: supertux-0.1.3-compile.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel >= 1.2.4, SDL_image-devel, SDL_mixer-devel BuildRequires: zlib-devel, desktop-file-utils, libGLU-devel +BuildRequires: physfs-devel, openal-devel, jam %description SuperTux is a jump'n run like game, with strong inspiration from the @@ -24,28 +21,24 @@ %prep %setup -q -%patch0 -p0 %build %configure --disable-debug -make %{?_smp_mflags} - +jam %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +jam install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_datadir}/applications/supertux.desktop desktop-file-install \ --vendor fedora \ --add-category X-Fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications supertux.desktop - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README TODO LEVELDESIGN @@ -55,6 +48,13 @@ %{_datadir}/pixmaps/* %changelog +* Mon Jan 22 2007 Steven Pritchard 0.3.0-1 +- Update to 0.3.0. +- Update URL. +- Drop compile fix patch. +- BR: physfs-devel, openal-devel. +- Build uses jam instead of make now. + * Mon Aug 28 2006 Steven Pritchard 0.1.3-5 - Rebuild From fedora-extras-commits at redhat.com Tue Feb 13 17:01:34 2007 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 13 Feb 2007 12:01:34 -0500 Subject: rpms/perl-RRD-Simple/FC-5 perl-RRD-Simple.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200702131701.l1DH1Y5X013848@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-RRD-Simple/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10408/FC-5 Modified Files: perl-RRD-Simple.spec sources Log Message: update to 1.41 switch to using Build.PL directly Index: perl-RRD-Simple.spec =================================================================== RCS file: /cvs/extras/rpms/perl-RRD-Simple/FC-5/perl-RRD-Simple.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-RRD-Simple.spec 25 Aug 2006 15:19:30 -0000 1.3 +++ perl-RRD-Simple.spec 13 Feb 2007 17:01:00 -0000 1.4 @@ -1,10 +1,10 @@ Name: perl-RRD-Simple -Version: 1.40 +Version: 1.41 Release: 1%{?dist} Summary: Simple interface to create and store data in RRD files Group: Development/Libraries -License: Apache Software License, Version 2.0 +License: Apache Software License URL: http://search.cpan.org/dist/RRD-Simple Source0: http://search.cpan.org/CPAN/authors/id/N/NI/NICOLAW/RRD-Simple-%{version}.tar.gz @@ -30,22 +30,22 @@ %build -echo n | %{__perl} Makefile.PL INSTALLDIRS=vendor -make %{?_smp_mflags} +# prevent call-home query/timeout. not strictly necessary +AUTOMATED_TESTING=1 %{__perl} Build.PL installdirs=vendor +./Build %install rm -rf %{buildroot} -make pure_install PERL_INSTALL_ROOT=%{buildroot} +./Build install destdir=%{buildroot} create_packlist=0 +find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' -find %{buildroot} -type f -name .packlist -exec rm -f {} ';' -find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check -make test +./Build test %clean @@ -60,6 +60,13 @@ %changelog +* Tue Feb 13 2007 Chris Weyl 1.41-1 +- update to 1.41 +- use Build.PL directly + +* Thu Aug 31 2006 Chris Weyl 1.40-2 +- bump for mass rebuild + * Fri Aug 25 2006 Chris Weyl 1.40-1 - update to 1.40 - minor spec cleanups Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-RRD-Simple/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 25 Aug 2006 15:19:30 -0000 1.3 +++ sources 13 Feb 2007 17:01:00 -0000 1.4 @@ -1 +1 @@ -3995bfff426755539667c549e4ae280a RRD-Simple-1.40.tar.gz +61656a91e8a424305ceab3e850c05d9e RRD-Simple-1.41.tar.gz From fedora-extras-commits at redhat.com Tue Feb 13 17:01:30 2007 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 13 Feb 2007 12:01:30 -0500 Subject: rpms/perl-RRD-Simple Makefile,1.1,1.2 Message-ID: <200702131701.l1DH1U05013843@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-RRD-Simple In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10408 Modified Files: Makefile Log Message: update to 1.41 switch to using Build.PL directly Index: Makefile =================================================================== RCS file: /cvs/extras/rpms/perl-RRD-Simple/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile 28 Jun 2006 06:07:18 -0000 1.1 +++ Makefile 13 Feb 2007 17:00:58 -0000 1.2 @@ -2,6 +2,15 @@ all : CVS/Root common-update @cvs update +# for target build-all +BRANCHES := $(shell cat ~/fedora-extras/current-branches | sed -e 's/:.*//') + +# tag & build all non-legacy branches... +build-all : + @echo NOTICE: building for ${BRANCHES} + @sleep 5s + @for br in ${BRANCHES} ; do echo Building $$br ; cd $$br && test -f dead.package || make tag plague ; cd .. ; done + common-update : common @cd common && cvs update From fedora-extras-commits at redhat.com Tue Feb 13 17:01:38 2007 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 13 Feb 2007 12:01:38 -0500 Subject: rpms/perl-RRD-Simple/FC-6 perl-RRD-Simple.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200702131701.l1DH1cG3013852@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-RRD-Simple/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10408/FC-6 Modified Files: perl-RRD-Simple.spec sources Log Message: update to 1.41 switch to using Build.PL directly Index: perl-RRD-Simple.spec =================================================================== RCS file: /cvs/extras/rpms/perl-RRD-Simple/FC-6/perl-RRD-Simple.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-RRD-Simple.spec 1 Sep 2006 04:22:10 -0000 1.4 +++ perl-RRD-Simple.spec 13 Feb 2007 17:01:04 -0000 1.5 @@ -1,10 +1,10 @@ Name: perl-RRD-Simple -Version: 1.40 -Release: 2%{?dist} +Version: 1.41 +Release: 1%{?dist} Summary: Simple interface to create and store data in RRD files Group: Development/Libraries -License: Apache Software License, Version 2.0 +License: Apache Software License URL: http://search.cpan.org/dist/RRD-Simple Source0: http://search.cpan.org/CPAN/authors/id/N/NI/NICOLAW/RRD-Simple-%{version}.tar.gz @@ -30,22 +30,22 @@ %build -echo n | %{__perl} Makefile.PL INSTALLDIRS=vendor -make %{?_smp_mflags} +# prevent call-home query/timeout. not strictly necessary +AUTOMATED_TESTING=1 %{__perl} Build.PL installdirs=vendor +./Build %install rm -rf %{buildroot} -make pure_install PERL_INSTALL_ROOT=%{buildroot} +./Build install destdir=%{buildroot} create_packlist=0 +find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' -find %{buildroot} -type f -name .packlist -exec rm -f {} ';' -find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check -make test +./Build test %clean @@ -60,6 +60,10 @@ %changelog +* Tue Feb 13 2007 Chris Weyl 1.41-1 +- update to 1.41 +- use Build.PL directly + * Thu Aug 31 2006 Chris Weyl 1.40-2 - bump for mass rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-RRD-Simple/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 25 Aug 2006 15:19:30 -0000 1.3 +++ sources 13 Feb 2007 17:01:04 -0000 1.4 @@ -1 +1 @@ -3995bfff426755539667c549e4ae280a RRD-Simple-1.40.tar.gz +61656a91e8a424305ceab3e850c05d9e RRD-Simple-1.41.tar.gz From fedora-extras-commits at redhat.com Tue Feb 13 17:01:41 2007 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 13 Feb 2007 12:01:41 -0500 Subject: rpms/perl-RRD-Simple/devel .cvsignore, 1.3, 1.4 perl-RRD-Simple.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200702131701.l1DH1fUi013859@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-RRD-Simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10408/devel Modified Files: .cvsignore perl-RRD-Simple.spec sources Log Message: update to 1.41 switch to using Build.PL directly Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-RRD-Simple/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 25 Aug 2006 15:19:30 -0000 1.3 +++ .cvsignore 13 Feb 2007 17:01:08 -0000 1.4 @@ -1 +1 @@ -RRD-Simple-1.40.tar.gz +RRD-Simple-1.41.tar.gz Index: perl-RRD-Simple.spec =================================================================== RCS file: /cvs/extras/rpms/perl-RRD-Simple/devel/perl-RRD-Simple.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-RRD-Simple.spec 1 Sep 2006 04:22:10 -0000 1.4 +++ perl-RRD-Simple.spec 13 Feb 2007 17:01:08 -0000 1.5 @@ -1,10 +1,10 @@ Name: perl-RRD-Simple -Version: 1.40 -Release: 2%{?dist} +Version: 1.41 +Release: 1%{?dist} Summary: Simple interface to create and store data in RRD files Group: Development/Libraries -License: Apache Software License, Version 2.0 +License: Apache Software License URL: http://search.cpan.org/dist/RRD-Simple Source0: http://search.cpan.org/CPAN/authors/id/N/NI/NICOLAW/RRD-Simple-%{version}.tar.gz @@ -30,22 +30,22 @@ %build -echo n | %{__perl} Makefile.PL INSTALLDIRS=vendor -make %{?_smp_mflags} +# prevent call-home query/timeout. not strictly necessary +AUTOMATED_TESTING=1 %{__perl} Build.PL installdirs=vendor +./Build %install rm -rf %{buildroot} -make pure_install PERL_INSTALL_ROOT=%{buildroot} +./Build install destdir=%{buildroot} create_packlist=0 +find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' -find %{buildroot} -type f -name .packlist -exec rm -f {} ';' -find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check -make test +./Build test %clean @@ -60,6 +60,10 @@ %changelog +* Tue Feb 13 2007 Chris Weyl 1.41-1 +- update to 1.41 +- use Build.PL directly + * Thu Aug 31 2006 Chris Weyl 1.40-2 - bump for mass rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-RRD-Simple/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 25 Aug 2006 15:19:30 -0000 1.3 +++ sources 13 Feb 2007 17:01:08 -0000 1.4 @@ -1 +1 @@ -3995bfff426755539667c549e4ae280a RRD-Simple-1.40.tar.gz +61656a91e8a424305ceab3e850c05d9e RRD-Simple-1.41.tar.gz From fedora-extras-commits at redhat.com Tue Feb 13 17:06:41 2007 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Tue, 13 Feb 2007 12:06:41 -0500 Subject: rpms/perl-Proc-Daemon/FC-6 perl-Proc-Daemon.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702131706.l1DH6fZF014002@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/perl-Proc-Daemon/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13981 Modified Files: .cvsignore sources Added Files: perl-Proc-Daemon.spec Log Message: initial build for FC6 --- NEW FILE perl-Proc-Daemon.spec --- %define perlname Proc-Daemon Name: perl-Proc-Daemon Version: 0.03 Release: 1%{?dist} Summary: Run Perl program as a daemon process Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Proc-Daemon/ Source: http://search.cpan.org/CPAN/authors/id/E/EH/EHOOD/%{perlname}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This is version %{version} of Proc::Daemon This module contains the routine Init which can be called by a Perl program to initialize itself as a daemon. A daemon is a process that runs in the background with no controlling terminal. Generally servers (like FTP and HTTP servers) run as daemon processes. %prep %setup -q -n %{perlname}-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' -print find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' -print chmod -R u+rwX,go+rX,go-w %{buildroot}/* %clean rm -rf %{buildroot} %check make test %files %defattr(-, root, root, -) %doc Changes README %{_mandir}/man3/Proc* %{perl_vendorlib}/Proc %changelog * Sun Feb 11 2006 Remi Collet 0.03-1 - initial spec for Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Proc-Daemon/FC-6/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Feb 2007 19:04:16 -0000 1.1 +++ .cvsignore 13 Feb 2007 17:06:08 -0000 1.2 @@ -0,0 +1 @@ +Proc-Daemon-0.03.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Proc-Daemon/FC-6/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Feb 2007 19:04:16 -0000 1.1 +++ sources 13 Feb 2007 17:06:08 -0000 1.2 @@ -0,0 +1 @@ +6e1b83ac0f0add22f63597733f38c973 Proc-Daemon-0.03.tar.gz From fedora-extras-commits at redhat.com Tue Feb 13 17:12:58 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Tue, 13 Feb 2007 12:12:58 -0500 Subject: rpms/jd/devel .cvsignore, 1.68, 1.69 jd.spec, 1.79, 1.80 sources, 1.68, 1.69 Message-ID: <200702131712.l1DHCwTv014140@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14117 Modified Files: .cvsignore jd.spec sources Log Message: * Tue Feb 13 2007 Mamoru Tasaka - 1.8.5-2.cvs070213 - cvs 070213 (23:20 JST) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- .cvsignore 12 Feb 2007 16:23:26 -0000 1.68 +++ .cvsignore 13 Feb 2007 17:12:25 -0000 1.69 @@ -1 +1 @@ -jd-1.8.5-cvs070212.tgz +jd-1.8.5-cvs070213.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- jd.spec 12 Feb 2007 16:23:26 -0000 1.79 +++ jd.spec 13 Feb 2007 17:12:25 -0000 1.80 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 1.8.5 -%define strtag cvs070212 +%define strtag cvs070213 %define repoid 23816 @@ -106,8 +106,8 @@ %{icondir}/%{name}.png %changelog -* Mon Feb 12 2007 Mamoru Tasaka - 1.8.5-2.cvs070212 -- cvs 070212 (23:00 JST) +* Tue Feb 13 2007 Mamoru Tasaka - 1.8.5-2.cvs070213 +- cvs 070213 (23:20 JST) * Fri Feb 2 2007 Mamoru Tasaka - 1.8.5-1 - 1.8.5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- sources 12 Feb 2007 16:23:26 -0000 1.68 +++ sources 13 Feb 2007 17:12:25 -0000 1.69 @@ -1 +1 @@ -ec063d0d4c65d4fc004d180d2ae0a88a jd-1.8.5-cvs070212.tgz +1b5b64d8cfe15ec18c6f790aae1048aa jd-1.8.5-cvs070213.tgz From fedora-extras-commits at redhat.com Tue Feb 13 17:19:39 2007 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Tue, 13 Feb 2007 12:19:39 -0500 Subject: rpms/perl-Proc-Daemon/FC-5 .cvsignore,1.1,1.2 sources,1.1,1.2 Message-ID: <200702131719.l1DHJdEl014311@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/perl-Proc-Daemon/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14283 Modified Files: .cvsignore sources Log Message: FC-5 creation Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Proc-Daemon/FC-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Feb 2007 19:04:16 -0000 1.1 +++ .cvsignore 13 Feb 2007 17:19:06 -0000 1.2 @@ -0,0 +1 @@ +Proc-Daemon-0.03.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Proc-Daemon/FC-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Feb 2007 19:04:16 -0000 1.1 +++ sources 13 Feb 2007 17:19:06 -0000 1.2 @@ -0,0 +1 @@ +6e1b83ac0f0add22f63597733f38c973 Proc-Daemon-0.03.tar.gz From fedora-extras-commits at redhat.com Tue Feb 13 17:21:51 2007 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Tue, 13 Feb 2007 12:21:51 -0500 Subject: rpms/perl-Proc-Daemon/FC-5 perl-Proc-Daemon.spec,NONE,1.1 Message-ID: <200702131721.l1DHLp3N014375@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/perl-Proc-Daemon/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14365 Added Files: perl-Proc-Daemon.spec Log Message: missing file :( --- NEW FILE perl-Proc-Daemon.spec --- %define perlname Proc-Daemon Name: perl-Proc-Daemon Version: 0.03 Release: 1%{?dist} Summary: Run Perl program as a daemon process Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Proc-Daemon/ Source: http://search.cpan.org/CPAN/authors/id/E/EH/EHOOD/%{perlname}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This is version %{version} of Proc::Daemon This module contains the routine Init which can be called by a Perl program to initialize itself as a daemon. A daemon is a process that runs in the background with no controlling terminal. Generally servers (like FTP and HTTP servers) run as daemon processes. %prep %setup -q -n %{perlname}-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' -print find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' -print chmod -R u+rwX,go+rX,go-w %{buildroot}/* %clean rm -rf %{buildroot} %check make test %files %defattr(-, root, root, -) %doc Changes README %{_mandir}/man3/Proc* %{perl_vendorlib}/Proc %changelog * Sun Feb 11 2006 Remi Collet 0.03-1 - initial spec for Extras From fedora-extras-commits at redhat.com Tue Feb 13 17:26:10 2007 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Tue, 13 Feb 2007 12:26:10 -0500 Subject: rpms/perl-Proc-Daemon/FC-5 perl-Proc-Daemon.spec,1.1,1.2 Message-ID: <200702131726.l1DHQAST014448@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/perl-Proc-Daemon/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14426 Modified Files: perl-Proc-Daemon.spec Log Message: Damned , bump release Index: perl-Proc-Daemon.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Proc-Daemon/FC-5/perl-Proc-Daemon.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Proc-Daemon.spec 13 Feb 2007 17:21:49 -0000 1.1 +++ perl-Proc-Daemon.spec 13 Feb 2007 17:25:38 -0000 1.2 @@ -2,7 +2,7 @@ Name: perl-Proc-Daemon Version: 0.03 -Release: 1%{?dist} +Release: 1%{?dist}.1 Summary: Run Perl program as a daemon process Group: Development/Libraries From fedora-extras-commits at redhat.com Tue Feb 13 17:32:14 2007 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 13 Feb 2007 12:32:14 -0500 Subject: rpms/supertux/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 supertux.spec, 1.13, 1.14 Message-ID: <200702131732.l1DHWEPW014588@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/supertux/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14513 Modified Files: .cvsignore sources supertux.spec Log Message: BR: libvorbis-devel, gettext, flex, bison. Update doc list. Minor spec cleanup. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/supertux/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 1 Sep 2005 20:29:45 -0000 1.4 +++ .cvsignore 13 Feb 2007 17:31:42 -0000 1.5 @@ -1 +1 @@ -supertux-0.1.3.tar.bz2 +supertux-0.3.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/supertux/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 Sep 2005 20:29:45 -0000 1.4 +++ sources 13 Feb 2007 17:31:42 -0000 1.5 @@ -1 +1 @@ -f2fc288459f33d5cd8f645fbca737a63 supertux-0.1.3.tar.bz2 +454760a0a1d3f8ea6e54829e838cd94d supertux-0.3.0.tar.bz2 Index: supertux.spec =================================================================== RCS file: /cvs/extras/rpms/supertux/devel/supertux.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- supertux.spec 13 Feb 2007 16:50:48 -0000 1.13 +++ supertux.spec 13 Feb 2007 17:31:42 -0000 1.14 @@ -9,7 +9,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel >= 1.2.4, SDL_image-devel, SDL_mixer-devel BuildRequires: zlib-devel, desktop-file-utils, libGLU-devel -BuildRequires: physfs-devel, openal-devel, jam +BuildRequires: physfs-devel, openal-devel, libvorbis-devel +BuildRequires: gettext, flex, bison, jam %description SuperTux is a jump'n run like game, with strong inspiration from the @@ -28,32 +29,35 @@ %install rm -rf $RPM_BUILD_ROOT -jam install DESTDIR=$RPM_BUILD_ROOT +jam -sDESTDIR=$RPM_BUILD_ROOT install rm -f $RPM_BUILD_ROOT%{_datadir}/applications/supertux.desktop desktop-file-install \ - --vendor fedora \ - --add-category X-Fedora \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications supertux.desktop + --vendor fedora \ + --add-category X-Fedora \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications supertux.desktop %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog NEWS README TODO LEVELDESIGN +%doc COPYING README WHATSNEW.txt %{_bindir}/* %{_datadir}/%{name} %{_datadir}/applications/* %{_datadir}/pixmaps/* %changelog -* Mon Jan 22 2007 Steven Pritchard 0.3.0-1 +* Tue Feb 13 2007 Steven Pritchard 0.3.0-1 - Update to 0.3.0. - Update URL. - Drop compile fix patch. -- BR: physfs-devel, openal-devel. +- BR: physfs-devel, openal-devel, libvorbis-devel. +- BR: gettext, flex, bison, jam. - Build uses jam instead of make now. +- Update doc list. +- Minor spec cleanup. * Mon Aug 28 2006 Steven Pritchard 0.1.3-5 - Rebuild From fedora-extras-commits at redhat.com Tue Feb 13 17:32:37 2007 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Tue, 13 Feb 2007 12:32:37 -0500 Subject: rpms/aplus-fsf/devel aplus-fsf.spec,1.6,1.7 Message-ID: <200702131732.l1DHWbdo014633@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/aplus-fsf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14569 Modified Files: aplus-fsf.spec Log Message: Solve multilib issue Index: aplus-fsf.spec =================================================================== RCS file: /cvs/extras/rpms/aplus-fsf/devel/aplus-fsf.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- aplus-fsf.spec 11 Dec 2006 17:10:19 -0000 1.6 +++ aplus-fsf.spec 13 Feb 2007 17:32:04 -0000 1.7 @@ -15,7 +15,7 @@ Name: %name Version: 4.20.2 -Release: 12%{?dist} +Release: 13%{?dist} License: GPL Summary: Advanced APL interpreter with s interface @@ -61,7 +61,7 @@ this packages contans the fonts in the PCF format. -They are not requires to run a A+ program. +They are not require to run a A+ program. %package -n fonts-truetype-apl Summary: TreuType fonts for the Advanced APL Interpreter @@ -142,6 +142,8 @@ cp -R src/scripts samples +mv samples/Makefile samples/Makefile-%{_arch} + pushd $RPM_BUILD_ROOT/%{_x11fonts}/ cp Kapl.alias fonts.alias @@ -256,6 +258,9 @@ %ghost %verify(not md5 size mtime) %{_ttffonts}/fonts.cache-* %Changelog +* Tue Feb 13 2007 Jochen Schmitt 4.20.2-13 +- Solve multilib issue (#228353) + * Mon Dec 11 2006 Jochen Schmitt 4.20.2-12 - Change version schema for dynamic libs From fedora-extras-commits at redhat.com Tue Feb 13 18:21:34 2007 From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak)) Date: Tue, 13 Feb 2007 13:21:34 -0500 Subject: fedora-security/audit fc5,1.449,1.450 fc6,1.203,1.204 Message-ID: <200702131821.l1DILYKa020737@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20716 Modified Files: fc5 fc6 Log Message: ImageMagick Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.449 retrieving revision 1.450 diff -u -r1.449 -r1.450 --- fc5 12 Feb 2007 09:54:27 -0000 1.449 +++ fc5 13 Feb 2007 18:21:32 -0000 1.450 @@ -5,6 +5,7 @@ CVE-2007-0823 ignore (xterm) feature, not a bug CVE-2007-0822 ignore (util-linux) NULL dereference +CVE-2007-0770 ignore (ImageMagick) only if incomplete CVE-2006-5456 CVE-2007-0650 ignore (tetex) needs user's assistance CVE-2007-0494 version (bind, fixed 9.3.4) #225268 [since FEDORA-2007-164] CVE-2007-0493 version (bind, fixed 9.3.4) #224443 [since FEDORA-2007-164] Index: fc6 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc6,v retrieving revision 1.203 retrieving revision 1.204 diff -u -r1.203 -r1.204 --- fc6 12 Feb 2007 09:54:27 -0000 1.203 +++ fc6 13 Feb 2007 18:21:32 -0000 1.204 @@ -5,6 +5,7 @@ CVE-2007-0823 ignore (xterm) feature, not a bug CVE-2007-0822 ignore (util-linux) NULL dereference +CVE-2007-0770 ignore (ImageMagick) only if incomplete CVE-2006-5456 CVE-2007-0650 ignore (tetex) needs user's assistance CVE-2007-0537 VULNERABLE (kdebase) #225420 CVE-2007-0494 version (bind, fixed 9.3.4) #225268 [since FEDORA-2007-147] From fedora-extras-commits at redhat.com Tue Feb 13 18:23:42 2007 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Tue, 13 Feb 2007 13:23:42 -0500 Subject: rpms/aplus-fsf/FC-6 aplus-fsf.spec,1.6,1.7 Message-ID: <200702131823.l1DINgbD020786@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/aplus-fsf/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20760 Modified Files: aplus-fsf.spec Log Message: Solve multilib issue Index: aplus-fsf.spec =================================================================== RCS file: /cvs/extras/rpms/aplus-fsf/FC-6/aplus-fsf.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- aplus-fsf.spec 11 Dec 2006 18:59:14 -0000 1.6 +++ aplus-fsf.spec 13 Feb 2007 18:23:09 -0000 1.7 @@ -15,7 +15,7 @@ Name: %name Version: 4.20.2 -Release: 12%{?dist} +Release: 13%{?dist} License: GPL Summary: Advanced APL interpreter with s interface @@ -61,7 +61,7 @@ this packages contans the fonts in the PCF format. -They are not requires to run a A+ program. +They are not require to run a A+ program. %package -n fonts-truetype-apl Summary: TreuType fonts for the Advanced APL Interpreter @@ -142,6 +142,8 @@ cp -R src/scripts samples +mv samples/Makefile samples/Makefile-%{_arch} + pushd $RPM_BUILD_ROOT/%{_x11fonts}/ cp Kapl.alias fonts.alias @@ -256,6 +258,9 @@ %ghost %verify(not md5 size mtime) %{_ttffonts}/fonts.cache-* %Changelog +* Tue Feb 13 2007 Jochen Schmitt 4.20.2-13 +- Solve multilib issue (#228353) + * Mon Dec 11 2006 Jochen Schmitt 4.20.2-12 - Change version schema for dynamic libs From fedora-extras-commits at redhat.com Tue Feb 13 18:25:19 2007 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Tue, 13 Feb 2007 13:25:19 -0500 Subject: rpms/aplus-fsf/FC-5 aplus-fsf.spec,1.6,1.7 Message-ID: <200702131825.l1DIPJCS020862@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/aplus-fsf/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20836 Modified Files: aplus-fsf.spec Log Message: Solve multilib issue Index: aplus-fsf.spec =================================================================== RCS file: /cvs/extras/rpms/aplus-fsf/FC-5/aplus-fsf.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- aplus-fsf.spec 11 Dec 2006 19:00:42 -0000 1.6 +++ aplus-fsf.spec 13 Feb 2007 18:24:47 -0000 1.7 @@ -15,7 +15,7 @@ Name: %name Version: 4.20.2 -Release: 12%{?dist} +Release: 13%{?dist} License: GPL Summary: Advanced APL interpreter with s interface @@ -61,7 +61,7 @@ this packages contans the fonts in the PCF format. -They are not requires to run a A+ program. +They are not require to run a A+ program. %package -n fonts-truetype-apl Summary: TreuType fonts for the Advanced APL Interpreter @@ -142,6 +142,8 @@ cp -R src/scripts samples +mv samples/Makefile samples/Makefile-%{_arch} + pushd $RPM_BUILD_ROOT/%{_x11fonts}/ cp Kapl.alias fonts.alias @@ -256,6 +258,9 @@ %ghost %verify(not md5 size mtime) %{_ttffonts}/fonts.cache-* %Changelog +* Tue Feb 13 2007 Jochen Schmitt 4.20.2-13 +- Solve multilib issue (#228353) + * Mon Dec 11 2006 Jochen Schmitt 4.20.2-12 - Change version schema for dynamic libs From fedora-extras-commits at redhat.com Tue Feb 13 18:37:23 2007 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Tue, 13 Feb 2007 13:37:23 -0500 Subject: rpms/glunarclock/FC-2 .cvsignore, 1.3, NONE Makefile, 1.2, NONE branch, 1.1, NONE glunarclock.spec, 1.2, NONE sources, 1.3, NONE Message-ID: <200702131837.l1DIbNWK021162@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/extras/rpms/glunarclock/FC-2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21147/FC-2 Removed Files: .cvsignore Makefile branch glunarclock.spec sources Log Message: Removing FC-2-3-4. EOLife --- .cvsignore DELETED --- --- Makefile DELETED --- --- branch DELETED --- --- glunarclock.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Tue Feb 13 18:37:26 2007 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Tue, 13 Feb 2007 13:37:26 -0500 Subject: rpms/glunarclock/FC-3 .cvsignore, 1.5, NONE Makefile, 1.2, NONE branch, 1.1, NONE glunarclock-0.32.2-i18n_macro.patch, 1.1, NONE glunarclock-0.32.4-bug149711.patch, 1.1, NONE glunarclock.spec, 1.5, NONE sources, 1.5, NONE Message-ID: <200702131837.l1DIbQ7J021176@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/extras/rpms/glunarclock/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21147/FC-3 Removed Files: .cvsignore Makefile branch glunarclock-0.32.2-i18n_macro.patch glunarclock-0.32.4-bug149711.patch glunarclock.spec sources Log Message: Removing FC-2-3-4. EOLife --- .cvsignore DELETED --- --- Makefile DELETED --- --- branch DELETED --- --- glunarclock-0.32.2-i18n_macro.patch DELETED --- --- glunarclock-0.32.4-bug149711.patch DELETED --- --- glunarclock.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Tue Feb 13 18:37:33 2007 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Tue, 13 Feb 2007 13:37:33 -0500 Subject: rpms/glunarclock/FC-4 .cvsignore, 1.6, NONE Makefile, 1.2, NONE branch, 1.1, NONE glunarclock-0.32.2-i18n_macro.patch, 1.3, NONE glunarclock-0.32.4-bug149711.patch, 1.1, NONE glunarclock.spec, 1.9, NONE sources, 1.6, NONE Message-ID: <200702131837.l1DIbXb0021190@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/extras/rpms/glunarclock/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21147/FC-4 Removed Files: .cvsignore Makefile branch glunarclock-0.32.2-i18n_macro.patch glunarclock-0.32.4-bug149711.patch glunarclock.spec sources Log Message: Removing FC-2-3-4. EOLife --- .cvsignore DELETED --- --- Makefile DELETED --- --- branch DELETED --- --- glunarclock-0.32.2-i18n_macro.patch DELETED --- --- glunarclock-0.32.4-bug149711.patch DELETED --- --- glunarclock.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Tue Feb 13 18:39:31 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:39:31 -0500 Subject: rpms/hunspell-af - New directory Message-ID: <200702131839.l1DIdVbE021289@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-af In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21284/hunspell-af Log Message: Directory /cvs/extras/rpms/hunspell-af added to the repository From fedora-extras-commits at redhat.com Tue Feb 13 18:39:39 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:39:39 -0500 Subject: rpms/hunspell-af/devel - New directory Message-ID: <200702131839.l1DIddVF021303@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-af/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21284/hunspell-af/devel Log Message: Directory /cvs/extras/rpms/hunspell-af/devel added to the repository From fedora-extras-commits at redhat.com Tue Feb 13 18:39:52 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:39:52 -0500 Subject: rpms/hunspell-af Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702131839.l1DIdqum021347@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-af In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21337 Added Files: Makefile import.log pkg.acl Log Message: Setup of module hunspell-af --- NEW FILE Makefile --- # Top level Makefile for module hunspell-af all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Tue Feb 13 18:40:00 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:40:00 -0500 Subject: rpms/hunspell-af/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702131840.l1DIe0HJ021366@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-af/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21337/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module hunspell-af --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Feb 13 18:40:21 2007 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Tue, 13 Feb 2007 13:40:21 -0500 Subject: rpms/gnubg/FC-4 .cvsignore, 1.2, NONE Makefile, 1.1, NONE branch, 1.1, NONE gnubg.desktop, 1.1, NONE gnubg.png, 1.1, NONE gnubg.spec, 1.1, NONE gnubg.weights, 1.1, NONE sources, 1.2, NONE Message-ID: <200702131840.l1DIeL6b021422@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/extras/rpms/gnubg/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21377/FC-4 Removed Files: .cvsignore Makefile branch gnubg.desktop gnubg.png gnubg.spec gnubg.weights sources Log Message: Deprecating FC-4, EOLife. --- .cvsignore DELETED --- --- Makefile DELETED --- --- branch DELETED --- --- gnubg.desktop DELETED --- --- gnubg.spec DELETED --- --- gnubg.weights DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Tue Feb 13 18:40:56 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:40:56 -0500 Subject: rpms/hunspell-ca - New directory Message-ID: <200702131840.l1DIeuxL021453@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-ca In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21448/hunspell-ca Log Message: Directory /cvs/extras/rpms/hunspell-ca added to the repository From fedora-extras-commits at redhat.com Tue Feb 13 18:41:03 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:41:03 -0500 Subject: rpms/hunspell-ca/devel - New directory Message-ID: <200702131841.l1DIf3to021469@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-ca/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21448/hunspell-ca/devel Log Message: Directory /cvs/extras/rpms/hunspell-ca/devel added to the repository From fedora-extras-commits at redhat.com Tue Feb 13 18:41:16 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:41:16 -0500 Subject: rpms/hunspell-ca Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702131841.l1DIfGa6021506@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-ca In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21495 Added Files: Makefile import.log pkg.acl Log Message: Setup of module hunspell-ca --- NEW FILE Makefile --- # Top level Makefile for module hunspell-ca all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Tue Feb 13 18:41:24 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:41:24 -0500 Subject: rpms/hunspell-ca/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702131841.l1DIfO5a021523@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-ca/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21495/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module hunspell-ca --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Feb 13 18:42:21 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:42:21 -0500 Subject: rpms/hunspell-bg - New directory Message-ID: <200702131842.l1DIgLC0021621@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-bg In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21616/hunspell-bg Log Message: Directory /cvs/extras/rpms/hunspell-bg added to the repository From fedora-extras-commits at redhat.com Tue Feb 13 18:42:29 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:42:29 -0500 Subject: rpms/hunspell-bg/devel - New directory Message-ID: <200702131842.l1DIgT24021635@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-bg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21616/hunspell-bg/devel Log Message: Directory /cvs/extras/rpms/hunspell-bg/devel added to the repository From fedora-extras-commits at redhat.com Tue Feb 13 18:42:45 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:42:45 -0500 Subject: rpms/hunspell-bg/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702131842.l1DIgjg7021689@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-bg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21659/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module hunspell-bg --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Feb 13 18:42:42 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:42:42 -0500 Subject: rpms/hunspell-bg Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702131842.l1DIggAF021671@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-bg In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21659 Added Files: Makefile import.log pkg.acl Log Message: Setup of module hunspell-bg --- NEW FILE Makefile --- # Top level Makefile for module hunspell-bg all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Tue Feb 13 18:43:41 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:43:41 -0500 Subject: rpms/hunspell-cy - New directory Message-ID: <200702131843.l1DIhfSZ021765@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-cy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21760/hunspell-cy Log Message: Directory /cvs/extras/rpms/hunspell-cy added to the repository From fedora-extras-commits at redhat.com Tue Feb 13 18:43:53 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:43:53 -0500 Subject: rpms/hunspell-cy/devel - New directory Message-ID: <200702131843.l1DIhrFI021782@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-cy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21760/hunspell-cy/devel Log Message: Directory /cvs/extras/rpms/hunspell-cy/devel added to the repository From fedora-extras-commits at redhat.com Tue Feb 13 18:44:07 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:44:07 -0500 Subject: rpms/hunspell-cy Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702131844.l1DIi7Or021816@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-cy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21806 Added Files: Makefile import.log pkg.acl Log Message: Setup of module hunspell-cy --- NEW FILE Makefile --- # Top level Makefile for module hunspell-cy all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Tue Feb 13 18:44:15 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:44:15 -0500 Subject: rpms/hunspell-cy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702131844.l1DIiFlb021834@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-cy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21806/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module hunspell-cy --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Feb 13 18:45:12 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:45:12 -0500 Subject: rpms/hunspell-da - New directory Message-ID: <200702131845.l1DIjCoW021908@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-da In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21903/hunspell-da Log Message: Directory /cvs/extras/rpms/hunspell-da added to the repository From fedora-extras-commits at redhat.com Tue Feb 13 18:45:20 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:45:20 -0500 Subject: rpms/hunspell-da/devel - New directory Message-ID: <200702131845.l1DIjKoI021924@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-da/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21903/hunspell-da/devel Log Message: Directory /cvs/extras/rpms/hunspell-da/devel added to the repository From fedora-extras-commits at redhat.com Tue Feb 13 18:45:30 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:45:30 -0500 Subject: rpms/hunspell-da Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702131845.l1DIjUrE021958@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-da In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21948 Added Files: Makefile import.log pkg.acl Log Message: Setup of module hunspell-da --- NEW FILE Makefile --- # Top level Makefile for module hunspell-da all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Tue Feb 13 18:45:37 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:45:37 -0500 Subject: rpms/hunspell-da/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702131845.l1DIjbJw021978@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-da/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21948/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module hunspell-da --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Feb 13 18:46:33 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:46:33 -0500 Subject: rpms/hunspell-de - New directory Message-ID: <200702131846.l1DIkXkW022077@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-de In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22072/hunspell-de Log Message: Directory /cvs/extras/rpms/hunspell-de added to the repository From fedora-extras-commits at redhat.com Tue Feb 13 18:46:41 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:46:41 -0500 Subject: rpms/hunspell-de/devel - New directory Message-ID: <200702131846.l1DIkffC022093@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-de/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22072/hunspell-de/devel Log Message: Directory /cvs/extras/rpms/hunspell-de/devel added to the repository From fedora-extras-commits at redhat.com Tue Feb 13 18:46:56 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:46:56 -0500 Subject: rpms/hunspell-de Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702131846.l1DIkuQb022268@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-de In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22251 Added Files: Makefile import.log pkg.acl Log Message: Setup of module hunspell-de --- NEW FILE Makefile --- # Top level Makefile for module hunspell-de all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Tue Feb 13 18:47:04 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:47:04 -0500 Subject: rpms/hunspell-de/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702131847.l1DIl4iB022286@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-de/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22251/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module hunspell-de --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Feb 13 18:49:03 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:49:03 -0500 Subject: rpms/hunspell-ga - New directory Message-ID: <200702131849.l1DIn3IS022998@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-ga In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22993/hunspell-ga Log Message: Directory /cvs/extras/rpms/hunspell-ga added to the repository From fedora-extras-commits at redhat.com Tue Feb 13 18:49:10 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:49:10 -0500 Subject: rpms/hunspell-ga/devel - New directory Message-ID: <200702131849.l1DInAVY023012@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-ga/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22993/hunspell-ga/devel Log Message: Directory /cvs/extras/rpms/hunspell-ga/devel added to the repository From fedora-extras-commits at redhat.com Tue Feb 13 18:49:24 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:49:24 -0500 Subject: rpms/hunspell-ga Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702131849.l1DInOI8023046@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-ga In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23036 Added Files: Makefile import.log pkg.acl Log Message: Setup of module hunspell-ga --- NEW FILE Makefile --- # Top level Makefile for module hunspell-ga all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Tue Feb 13 18:49:32 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:49:32 -0500 Subject: rpms/hunspell-ga/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702131849.l1DInWqI023064@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-ga/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23036/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module hunspell-ga --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Feb 13 18:50:32 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:50:32 -0500 Subject: rpms/hunspell-gl - New directory Message-ID: <200702131850.l1DIoWna023144@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-gl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23138/hunspell-gl Log Message: Directory /cvs/extras/rpms/hunspell-gl added to the repository From fedora-extras-commits at redhat.com Tue Feb 13 18:50:40 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:50:40 -0500 Subject: rpms/hunspell-gl/devel - New directory Message-ID: <200702131850.l1DIoeTY023158@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-gl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23138/hunspell-gl/devel Log Message: Directory /cvs/extras/rpms/hunspell-gl/devel added to the repository From fedora-extras-commits at redhat.com Tue Feb 13 18:50:52 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:50:52 -0500 Subject: rpms/hunspell-gl Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702131850.l1DIoqTV023201@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-gl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23188 Added Files: Makefile import.log pkg.acl Log Message: Setup of module hunspell-gl --- NEW FILE Makefile --- # Top level Makefile for module hunspell-gl all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Tue Feb 13 18:51:00 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:51:00 -0500 Subject: rpms/hunspell-gl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702131851.l1DIp033023223@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-gl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23188/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module hunspell-gl --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Feb 13 18:52:06 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:52:06 -0500 Subject: rpms/hunspell-he/devel - New directory Message-ID: <200702131852.l1DIq6nf023329@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-he/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23307/hunspell-he/devel Log Message: Directory /cvs/extras/rpms/hunspell-he/devel added to the repository From fedora-extras-commits at redhat.com Tue Feb 13 18:51:58 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:51:58 -0500 Subject: rpms/hunspell-he - New directory Message-ID: <200702131851.l1DIpwS4023312@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-he In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23307/hunspell-he Log Message: Directory /cvs/extras/rpms/hunspell-he added to the repository From fedora-extras-commits at redhat.com Tue Feb 13 18:52:04 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Tue, 13 Feb 2007 13:52:04 -0500 Subject: rpms/Inventor/devel Inventor.spec,1.35,1.36 Message-ID: <200702131852.l1DIq4lh023325@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Inventor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23274 Modified Files: Inventor.spec Log Message: * Tue Feb 13 2007 Ralf Cors??pius - 2.1.5-25 - Specfile fixes. Index: Inventor.spec =================================================================== RCS file: /cvs/extras/rpms/Inventor/devel/Inventor.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- Inventor.spec 3 Oct 2006 11:39:41 -0000 1.35 +++ Inventor.spec 13 Feb 2007 18:51:31 -0000 1.36 @@ -6,7 +6,7 @@ Name: Inventor Version: 2.1.5 -Release: 24%{?dist} +Release: 25%{?dist} Summary: SGI Open Inventor (TM) @@ -213,12 +213,12 @@ install -m644 libInventor.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig install -m644 libInventorXt.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig -install -d m755 ${RPM_BUILD_ROOT}%{_libdir}/Inventor +install -d -m755 ${RPM_BUILD_ROOT}%{_libdir}/Inventor mv devel-docs ${RPM_BUILD_ROOT}%{_libdir}/Inventor/examples -install -d m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/data/materials -install -d m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/data/textures -install -d m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/fonts +install -d -m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/data/materials +install -d -m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/data/textures +install -d -m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/fonts %clean rm -rf $RPM_BUILD_ROOT @@ -308,6 +308,9 @@ %{_libdir}/Inventor/examples %changelog +* Tue Feb 13 2007 Ralf Cors??pius - 2.1.5-25 +- Specfile fixes. + * Tue Oct 03 2006 Ralf Cors??pius - 2.1.5-24 - Specfile cosmetics. - Use %%{_datadir}/Inventor instead of %%{_datadir}/%{name} From fedora-extras-commits at redhat.com Tue Feb 13 18:52:20 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:52:20 -0500 Subject: rpms/hunspell-he Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702131852.l1DIqK8v023363@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-he In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23353 Added Files: Makefile import.log pkg.acl Log Message: Setup of module hunspell-he --- NEW FILE Makefile --- # Top level Makefile for module hunspell-he all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Tue Feb 13 18:52:27 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:52:27 -0500 Subject: rpms/hunspell-he/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702131852.l1DIqRbO023381@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-he/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23353/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module hunspell-he --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Feb 13 18:53:37 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:53:37 -0500 Subject: rpms/hunspell-ee - New directory Message-ID: <200702131853.l1DIrbn6023517@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-ee In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23512/hunspell-ee Log Message: Directory /cvs/extras/rpms/hunspell-ee added to the repository From fedora-extras-commits at redhat.com Tue Feb 13 18:53:44 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:53:44 -0500 Subject: rpms/hunspell-ee/devel - New directory Message-ID: <200702131853.l1DIrixg023531@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-ee/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23512/hunspell-ee/devel Log Message: Directory /cvs/extras/rpms/hunspell-ee/devel added to the repository From fedora-extras-commits at redhat.com Tue Feb 13 18:53:57 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Tue, 13 Feb 2007 13:53:57 -0500 Subject: rpms/Inventor/FC-6 Inventor.spec,1.35,1.36 Message-ID: <200702131853.l1DIrvPG023557@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Inventor/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23479 Modified Files: Inventor.spec Log Message: * Tue Feb 13 2007 Ralf Cors??pius - 2.1.5-25 - Specfile fixes. Index: Inventor.spec =================================================================== RCS file: /cvs/extras/rpms/Inventor/FC-6/Inventor.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- Inventor.spec 3 Oct 2006 11:39:41 -0000 1.35 +++ Inventor.spec 13 Feb 2007 18:53:24 -0000 1.36 @@ -6,7 +6,7 @@ Name: Inventor Version: 2.1.5 -Release: 24%{?dist} +Release: 25%{?dist} Summary: SGI Open Inventor (TM) @@ -213,12 +213,12 @@ install -m644 libInventor.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig install -m644 libInventorXt.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig -install -d m755 ${RPM_BUILD_ROOT}%{_libdir}/Inventor +install -d -m755 ${RPM_BUILD_ROOT}%{_libdir}/Inventor mv devel-docs ${RPM_BUILD_ROOT}%{_libdir}/Inventor/examples -install -d m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/data/materials -install -d m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/data/textures -install -d m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/fonts +install -d -m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/data/materials +install -d -m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/data/textures +install -d -m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/fonts %clean rm -rf $RPM_BUILD_ROOT @@ -308,6 +308,9 @@ %{_libdir}/Inventor/examples %changelog +* Tue Feb 13 2007 Ralf Cors??pius - 2.1.5-25 +- Specfile fixes. + * Tue Oct 03 2006 Ralf Cors??pius - 2.1.5-24 - Specfile cosmetics. - Use %%{_datadir}/Inventor instead of %%{_datadir}/%{name} From fedora-extras-commits at redhat.com Tue Feb 13 18:54:04 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:54:04 -0500 Subject: rpms/hunspell-ee/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702131854.l1DIs4EK023591@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-ee/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23563/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module hunspell-ee --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Feb 13 18:54:01 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:54:01 -0500 Subject: rpms/hunspell-ee Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702131854.l1DIs1dH023573@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-ee In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23563 Added Files: Makefile import.log pkg.acl Log Message: Setup of module hunspell-ee --- NEW FILE Makefile --- # Top level Makefile for module hunspell-ee all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Tue Feb 13 18:54:58 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Tue, 13 Feb 2007 13:54:58 -0500 Subject: rpms/Inventor/FC-5 Inventor.spec,1.34,1.35 Message-ID: <200702131854.l1DIswZe023673@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Inventor/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23644 Modified Files: Inventor.spec Log Message: * Tue Feb 13 2007 Ralf Cors??pius - 2.1.5-25 - Specfile fixes. Index: Inventor.spec =================================================================== RCS file: /cvs/extras/rpms/Inventor/FC-5/Inventor.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- Inventor.spec 3 Oct 2006 11:40:35 -0000 1.34 +++ Inventor.spec 13 Feb 2007 18:54:25 -0000 1.35 @@ -6,7 +6,7 @@ Name: Inventor Version: 2.1.5 -Release: 24%{?dist} +Release: 25%{?dist} Summary: SGI Open Inventor (TM) @@ -213,12 +213,12 @@ install -m644 libInventor.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig install -m644 libInventorXt.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig -install -d m755 ${RPM_BUILD_ROOT}%{_libdir}/Inventor +install -d -m755 ${RPM_BUILD_ROOT}%{_libdir}/Inventor mv devel-docs ${RPM_BUILD_ROOT}%{_libdir}/Inventor/examples -install -d m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/data/materials -install -d m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/data/textures -install -d m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/fonts +install -d -m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/data/materials +install -d -m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/data/textures +install -d -m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/fonts %clean rm -rf $RPM_BUILD_ROOT @@ -308,6 +308,9 @@ %{_libdir}/Inventor/examples %changelog +* Tue Feb 13 2007 Ralf Cors??pius - 2.1.5-25 +- Specfile fixes. + * Tue Oct 03 2006 Ralf Cors??pius - 2.1.5-24 - Specfile cosmetics. - Use %%{_datadir}/Inventor instead of %%{_datadir}/%{name} From fedora-extras-commits at redhat.com Tue Feb 13 18:55:00 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:55:00 -0500 Subject: rpms/hunspell-el - New directory Message-ID: <200702131855.l1DIt0dG023680@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-el In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23672/hunspell-el Log Message: Directory /cvs/extras/rpms/hunspell-el added to the repository From fedora-extras-commits at redhat.com Tue Feb 13 18:55:08 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:55:08 -0500 Subject: rpms/hunspell-el/devel - New directory Message-ID: <200702131855.l1DIt8fe023694@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-el/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23672/hunspell-el/devel Log Message: Directory /cvs/extras/rpms/hunspell-el/devel added to the repository From fedora-extras-commits at redhat.com Tue Feb 13 18:55:23 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:55:23 -0500 Subject: rpms/hunspell-el Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702131855.l1DItNlO023731@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-el In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23721 Added Files: Makefile import.log pkg.acl Log Message: Setup of module hunspell-el --- NEW FILE Makefile --- # Top level Makefile for module hunspell-el all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Tue Feb 13 18:55:30 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:55:30 -0500 Subject: rpms/hunspell-el/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702131855.l1DItU8G023749@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-el/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23721/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module hunspell-el --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Feb 13 18:56:26 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:56:26 -0500 Subject: rpms/hunspell-es - New directory Message-ID: <200702131856.l1DIuQgv023823@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-es In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23816/hunspell-es Log Message: Directory /cvs/extras/rpms/hunspell-es added to the repository From fedora-extras-commits at redhat.com Tue Feb 13 18:56:34 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:56:34 -0500 Subject: rpms/hunspell-es/devel - New directory Message-ID: <200702131856.l1DIuY8D023839@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-es/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23816/hunspell-es/devel Log Message: Directory /cvs/extras/rpms/hunspell-es/devel added to the repository From fedora-extras-commits at redhat.com Tue Feb 13 18:56:51 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:56:51 -0500 Subject: rpms/hunspell-es Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702131856.l1DIupkt023878@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-es In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23866 Added Files: Makefile import.log pkg.acl Log Message: Setup of module hunspell-es --- NEW FILE Makefile --- # Top level Makefile for module hunspell-es all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Tue Feb 13 18:56:58 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 13:56:58 -0500 Subject: rpms/hunspell-es/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702131856.l1DIuwBc023896@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/hunspell-es/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23866/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module hunspell-es --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Feb 13 19:03:23 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 14:03:23 -0500 Subject: rpms/ack - New directory Message-ID: <200702131903.l1DJ3Ncv027603@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/ack In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27598/ack Log Message: Directory /cvs/extras/rpms/ack added to the repository From fedora-extras-commits at redhat.com Tue Feb 13 19:03:30 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 14:03:30 -0500 Subject: rpms/ack/devel - New directory Message-ID: <200702131903.l1DJ3UMC027619@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/ack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27598/ack/devel Log Message: Directory /cvs/extras/rpms/ack/devel added to the repository From fedora-extras-commits at redhat.com Tue Feb 13 19:03:44 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 14:03:44 -0500 Subject: rpms/ack Makefile,NONE,1.1 import.log,NONE,1.1 pkg.acl,NONE,1.1 Message-ID: <200702131903.l1DJ3ip2027653@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/ack In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27643 Added Files: Makefile import.log pkg.acl Log Message: Setup of module ack --- NEW FILE Makefile --- # Top level Makefile for module ack all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Tue Feb 13 19:03:52 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 14:03:52 -0500 Subject: rpms/ack/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702131903.l1DJ3qj7027674@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/ack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27643/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ack --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Feb 13 19:22:31 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 14:22:31 -0500 Subject: rpms/etherape - New directory Message-ID: <200702131922.l1DJMVlg027898@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/etherape In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27893/etherape Log Message: Directory /cvs/extras/rpms/etherape added to the repository From fedora-extras-commits at redhat.com Tue Feb 13 19:22:34 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 14:22:34 -0500 Subject: rpms/etherape/devel - New directory Message-ID: <200702131922.l1DJMYk0027912@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/etherape/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27893/etherape/devel Log Message: Directory /cvs/extras/rpms/etherape/devel added to the repository From fedora-extras-commits at redhat.com Tue Feb 13 19:22:47 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 14:22:47 -0500 Subject: rpms/etherape Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702131922.l1DJMlGP027946@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/etherape In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27936 Added Files: Makefile import.log pkg.acl Log Message: Setup of module etherape --- NEW FILE Makefile --- # Top level Makefile for module etherape all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Tue Feb 13 19:22:54 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 14:22:54 -0500 Subject: rpms/etherape/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702131922.l1DJMsS6027966@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/etherape/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27936/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module etherape --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Feb 13 19:24:02 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 14:24:02 -0500 Subject: rpms/classpathx-jaxp Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702131924.l1DJO2E5028217@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/classpathx-jaxp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28208 Added Files: Makefile import.log pkg.acl Log Message: Setup of module classpathx-jaxp --- NEW FILE Makefile --- # Top level Makefile for module classpathx-jaxp all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Tue Feb 13 19:24:10 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 14:24:10 -0500 Subject: rpms/classpathx-jaxp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702131924.l1DJOAc8028234@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/classpathx-jaxp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28208/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module classpathx-jaxp --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Feb 13 19:30:33 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 14:30:33 -0500 Subject: rpms/eb Makefile,NONE,1.1 import.log,NONE,1.1 pkg.acl,NONE,1.1 Message-ID: <200702131930.l1DJUXip028382@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/eb In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28372 Added Files: Makefile import.log pkg.acl Log Message: Setup of module eb --- NEW FILE Makefile --- # Top level Makefile for module eb all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Tue Feb 13 19:30:41 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 14:30:41 -0500 Subject: rpms/eb/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702131930.l1DJUfSW028400@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/eb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28372/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module eb --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Feb 13 19:31:46 2007 From: fedora-extras-commits at redhat.com (Michael Rice (errr)) Date: Tue, 13 Feb 2007 14:31:46 -0500 Subject: rpms/etherape import.log,1.1,1.2 Message-ID: <200702131931.l1DJVkUb028721@cvs-int.fedora.redhat.com> Author: errr Update of /cvs/extras/rpms/etherape In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28665 Modified Files: import.log Log Message: auto-import etherape-0.9.7-4 on branch devel from etherape-0.9.7-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/etherape/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Feb 2007 19:22:44 -0000 1.1 +++ import.log 13 Feb 2007 19:31:13 -0000 1.2 @@ -0,0 +1 @@ +etherape-0_9_7-4:HEAD:etherape-0.9.7-4.src.rpm:1171395070 From fedora-extras-commits at redhat.com Tue Feb 13 19:31:53 2007 From: fedora-extras-commits at redhat.com (Michael Rice (errr)) Date: Tue, 13 Feb 2007 14:31:53 -0500 Subject: rpms/etherape/devel etherape.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702131931.l1DJVr8T028728@cvs-int.fedora.redhat.com> Author: errr Update of /cvs/extras/rpms/etherape/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28665/devel Modified Files: .cvsignore sources Added Files: etherape.spec Log Message: auto-import etherape-0.9.7-4 on branch devel from etherape-0.9.7-4.src.rpm --- NEW FILE etherape.spec --- Name: etherape Version: 0.9.7 Release: 4%{?dist} Summary: Graphical network monitor for Unix Group: Applications/System License: GPL URL: http://etherape.sourceforge.net/ Source0: http://umn.dl.sourceforge.net/sourceforge/etherape/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libpcap-devel, libglade2-devel BuildRequires: gettext, desktop-file-utils, libgnomeui-devel BuildRequires: scrollkeeper Requires(post): scrollkeeper Requires(postun): scrollkeeper %description EtherApe is a graphical network monitor modeled after etherman. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} desktop-file-install --vendor "fedora" --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ ${RPM_BUILD_ROOT}%{_datadir}/applications/etherape.desktop rm $RPM_BUILD_ROOT/%{_datadir}/applications/etherape.desktop %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc ABOUT-NLS AUTHORS ChangeLog COPYING FAQ NEWS OVERVIEW README README.bugs README.help README.thanks TODO %{_bindir}/etherape %dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/services %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/doc %dir %{_datadir}/%{name}/doc/%{name} %dir %{_datadir}/%{name}/doc/%{name}/C %{_datadir}/%{name}/doc/%{name}/C/etherape.xml %dir %{_datadir}/%{name}/doc/%{name}/C/figures %{_datadir}/%{name}/doc/%{name}/C/figures/appmain.png %{_datadir}/%{name}/doc/%{name}/C/figures/capture_file_dlg.png %{_datadir}/%{name}/doc/%{name}/C/figures/color_select_dlg.png %{_datadir}/%{name}/doc/%{name}/C/figures/eth_toolbar.png %{_datadir}/%{name}/doc/%{name}/C/figures/link_info.png %{_datadir}/%{name}/doc/%{name}/C/figures/node_info.png %{_datadir}/%{name}/doc/%{name}/C/figures/pref_colors_dlg.png %{_datadir}/%{name}/doc/%{name}/C/figures/pref_diagram_dlg.png %{_datadir}/%{name}/doc/%{name}/C/figures/pref_timings_dlg.png %{_datadir}/%{name}/doc/%{name}/C/figures/proto_info.png %{_datadir}/%{name}/doc/%{name}/C/figures/protocol_edit_dlg.png %dir %{_datadir}/%{name}/glade %{_datadir}/%{name}/glade/etherape.glade2 %{_datadir}/%{name}/glade/etherape.png %{_datadir}/%{name}/glade/pause.xpm %{_datadir}/%{name}/glade/play.xpm %{_datadir}/%{name}/glade/stop.xpm %{_datadir}/applications/fedora-etherape.desktop %{_datadir}/pixmaps/etherape.png %dir %{_datadir}/omf/etherape %{_datadir}/omf/etherape/etherape-C.omf %{_mandir}/man1/* %post scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : %postun scrollkeeper-update -q || : %changelog * Mon Feb 12 2007 Michael Rice - 0.9.7-4 - Fix desktop file install * Sat Feb 10 2007 Michael Rice - 0.9.7-3 - Add scrollkeeper post and postun script snips - Fix dir ownership or pixmaps and omf - Fix .desktop X category * Wed Jan 31 2007 Michael Rice - 0.9.7-2 - Fix dup BR's - add missing BR for libgnomeui-devel scrollkeeper - removed %%{buildroot}. in choice of other * Wed Jan 24 2007 Michael Rice - 0.9.7-1 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/etherape/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Feb 2007 19:22:52 -0000 1.1 +++ .cvsignore 13 Feb 2007 19:31:21 -0000 1.2 @@ -0,0 +1 @@ +etherape-0.9.7.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/etherape/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Feb 2007 19:22:52 -0000 1.1 +++ sources 13 Feb 2007 19:31:21 -0000 1.2 @@ -0,0 +1 @@ +7b5783090d92abe79634da4b582c6b48 etherape-0.9.7.tar.gz From fedora-extras-commits at redhat.com Tue Feb 13 19:36:00 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 14:36:00 -0500 Subject: rpms/icewm Makefile,NONE,1.1 import.log,NONE,1.1 pkg.acl,NONE,1.1 Message-ID: <200702131936.l1DJa0Et028915@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/icewm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28905 Added Files: Makefile import.log pkg.acl Log Message: Setup of module icewm --- NEW FILE Makefile --- # Top level Makefile for module icewm all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Tue Feb 13 19:36:08 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 14:36:08 -0500 Subject: rpms/icewm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702131936.l1DJa8WX028933@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/icewm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28905/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module icewm --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Feb 13 19:37:03 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 14:37:03 -0500 Subject: rpms/gmrun - New directory Message-ID: <200702131937.l1DJb37R029002@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/gmrun In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28997/gmrun Log Message: Directory /cvs/extras/rpms/gmrun added to the repository From fedora-extras-commits at redhat.com Tue Feb 13 19:37:11 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 14:37:11 -0500 Subject: rpms/gmrun/devel - New directory Message-ID: <200702131937.l1DJbB5f029075@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/gmrun/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28997/gmrun/devel Log Message: Directory /cvs/extras/rpms/gmrun/devel added to the repository From fedora-extras-commits at redhat.com Tue Feb 13 19:37:27 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 14:37:27 -0500 Subject: rpms/gmrun Makefile,NONE,1.1 import.log,NONE,1.1 pkg.acl,NONE,1.1 Message-ID: <200702131937.l1DJbRgE029190@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/gmrun In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29180 Added Files: Makefile import.log pkg.acl Log Message: Setup of module gmrun --- NEW FILE Makefile --- # Top level Makefile for module gmrun all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Tue Feb 13 19:37:35 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 14:37:35 -0500 Subject: rpms/gmrun/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702131937.l1DJbZSC029226@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/gmrun/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29180/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gmrun --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Feb 13 19:38:29 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 14:38:29 -0500 Subject: rpms/dwdiff Makefile,NONE,1.1 import.log,NONE,1.1 pkg.acl,NONE,1.1 Message-ID: <200702131938.l1DJcTnD029439@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/dwdiff In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29429 Added Files: Makefile import.log pkg.acl Log Message: Setup of module dwdiff --- NEW FILE Makefile --- # Top level Makefile for module dwdiff all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Tue Feb 13 19:38:37 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 14:38:37 -0500 Subject: rpms/dwdiff/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702131938.l1DJcbLk029457@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/dwdiff/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29429/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module dwdiff --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Feb 13 19:43:17 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 14:43:17 -0500 Subject: rpms/methane - New directory Message-ID: <200702131943.l1DJhHN8029725@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/methane In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29720/methane Log Message: Directory /cvs/extras/rpms/methane added to the repository From fedora-extras-commits at redhat.com Tue Feb 13 19:43:20 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 14:43:20 -0500 Subject: rpms/methane/devel - New directory Message-ID: <200702131943.l1DJhKCS029739@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/methane/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29720/methane/devel Log Message: Directory /cvs/extras/rpms/methane/devel added to the repository From fedora-extras-commits at redhat.com Tue Feb 13 19:43:36 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 14:43:36 -0500 Subject: rpms/methane Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702131943.l1DJhagn029775@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/methane In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29765 Added Files: Makefile import.log pkg.acl Log Message: Setup of module methane --- NEW FILE Makefile --- # Top level Makefile for module methane all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Tue Feb 13 19:43:44 2007 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 13 Feb 2007 14:43:44 -0500 Subject: rpms/methane/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702131943.l1DJhiTd029793@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/methane/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29765/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module methane --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Feb 13 20:09:31 2007 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Tue, 13 Feb 2007 15:09:31 -0500 Subject: rpms/tracker/devel tracker.spec,1.9,1.10 Message-ID: <200702132009.l1DK9V34001623@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/tracker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1603 Modified Files: tracker.spec Log Message: * Tue Feb 13 2007 Deji Akingunola - 0.5.4-3 - Package the deskbar plugin properly Index: tracker.spec =================================================================== RCS file: /cvs/extras/rpms/tracker/devel/tracker.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- tracker.spec 29 Jan 2007 23:22:08 -0000 1.9 +++ tracker.spec 13 Feb 2007 20:08:59 -0000 1.10 @@ -1,9 +1,7 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} - Summary: An object database, tag/metadata database, search tool and indexer Name: tracker Version: 0.5.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/System URL: http://www.gnome.org/~jamiemcc/tracker/ @@ -12,7 +10,7 @@ BuildRequires: gmime-devel, poppler-devel, gettext, file-devel BuildRequires: gnome-desktop-devel, gamin-devel BuildRequires: libexif-devel, libgsf-devel, gstreamer-devel -BuildRequires: desktop-file-utils, intltool +BuildRequires: desktop-file-utils, intltool, deskbar-applet %if "%fedora" >= "6" BuildRequires: sqlite-devel %else @@ -75,7 +73,7 @@ %install rm -rf %{buildroot} -make DESTDIR=%{buildroot} DESKBAR_HANDLER_DIR=%{python_sitelib}/deskbar install +make DESTDIR=%{buildroot} install # Add an autostart for trackerd (for KDE) mkdir -p %{buildroot}%{_datadir}/autostart @@ -125,9 +123,12 @@ %{_datadir}/pixmaps/tracker/ %{_datadir}/applications/*.desktop %{_datadir}/autostart/*.desktop -%{python_sitelib}/deskbar/*.py* +%{_libdir}/deskbar-applet/handlers/*.py* %changelog +* Tue Feb 13 2007 Deji Akingunola - 0.5.4-3 +- Package the deskbar plugin properly + * Mon Jan 29 2007 Deji Akingunola - 0.5.4-2 - Split out tracker-search-tool sub-packages, for the GUI facility - Add proper requires for the -devel subpackage From fedora-extras-commits at redhat.com Tue Feb 13 20:13:28 2007 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Tue, 13 Feb 2007 15:13:28 -0500 Subject: rpms/tracker/FC-6 tracker.spec,1.8,1.9 Message-ID: <200702132013.l1DKDSis001717@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/tracker/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1698 Modified Files: tracker.spec Log Message: * Tue Feb 13 2007 Deji Akingunola - 0.5.4-3 - Package the deskbar plugin properly Index: tracker.spec =================================================================== RCS file: /cvs/extras/rpms/tracker/FC-6/tracker.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- tracker.spec 29 Jan 2007 23:25:13 -0000 1.8 +++ tracker.spec 13 Feb 2007 20:12:56 -0000 1.9 @@ -1,9 +1,7 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} - Summary: An object database, tag/metadata database, search tool and indexer Name: tracker Version: 0.5.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/System URL: http://www.gnome.org/~jamiemcc/tracker/ @@ -12,7 +10,7 @@ BuildRequires: gmime-devel, poppler-devel, gettext, file BuildRequires: gnome-desktop-devel, gamin-devel BuildRequires: libexif-devel, libgsf-devel, gstreamer-devel -BuildRequires: desktop-file-utils, intltool +BuildRequires: desktop-file-utils, intltool, deskbar-applet %if "%fedora" >= "6" BuildRequires: sqlite-devel %else @@ -75,7 +73,7 @@ %install rm -rf %{buildroot} -make DESTDIR=%{buildroot} DESKBAR_HANDLER_DIR=%{python_sitelib}/deskbar install +make DESTDIR=%{buildroot} install # Add an autostart for trackerd (for KDE) mkdir -p %{buildroot}%{_datadir}/autostart @@ -125,9 +123,12 @@ %{_datadir}/pixmaps/tracker/ %{_datadir}/applications/*.desktop %{_datadir}/autostart/*.desktop -%{python_sitelib}/deskbar/*.py* +%{_libdir}/deskbar-applet/handlers/*.py* %changelog +* Tue Feb 13 2007 Deji Akingunola - 0.5.4-3 +- Package the deskbar plugin properly + * Mon Jan 29 2007 Deji Akingunola - 0.5.4-2 - Split out tracker-search-tool sub-packages, for the GUI facility - Add proper requires for the -devel subpackage From fedora-extras-commits at redhat.com Tue Feb 13 20:14:18 2007 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Tue, 13 Feb 2007 15:14:18 -0500 Subject: rpms/gnubg/devel .cvsignore, 1.3, 1.4 gnubg.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200702132014.l1DKEIDp001792@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/extras/rpms/gnubg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1694 Modified Files: .cvsignore gnubg.spec sources Log Message: Upgrade to current upstream stable. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnubg/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 30 Aug 2006 18:40:52 -0000 1.3 +++ .cvsignore 13 Feb 2007 20:13:45 -0000 1.4 @@ -1 +1 @@ -gnubg-20060629.tar.gz +gnubg-source-MAIN-20061119.tar.gz Index: gnubg.spec =================================================================== RCS file: /cvs/extras/rpms/gnubg/devel/gnubg.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gnubg.spec 30 Aug 2006 18:40:52 -0000 1.3 +++ gnubg.spec 13 Feb 2007 20:13:45 -0000 1.4 @@ -2,9 +2,9 @@ License: GPL Group: Amusements/Games Summary: A backgammon game and analyser -Version: 20060629 +Version: 20061119 Release: 1%{?dist} -Source0: http://www.acepoint.de/GnuBG/sources/%{name}-%{version}.tar.gz +Source0: http://www.gnubg.org/media/sources/%{name}-source-MAIN-%{version}.tar.gz Source1: gnubg.weights Source2: gnubg.desktop Source3: gnubg.png @@ -35,7 +35,7 @@ play GNU Backgammon using the command line or a graphical interface %prep -%setup -n %{name} +%setup -qn %{name} # convert man page from ISO-8859-1 to UTF8 /usr/bin/iconv -f ISO-8859-1 -t UTF8 gnubg.6 > gnubg.6.tmp /bin/mv gnubg.6.tmp gnubg.6 @@ -120,8 +120,17 @@ %{_datadir}/gnubg/scripts/*.py %{_datadir}/gnubg/scripts/*.pyc %ghost %{_datadir}/gnubg/scripts/*.pyo +/usr/share/gnubg/flags/czech.png +%{_datadir}/gnubg/flags/*.png +%dir %{_datadir}/gnubg/fonts +%{_datadir}/gnubg/fonts/* +%{_datadir}/gnubg/gnubg.gtkrc +%{_datadir}/gnubg/gnubg.wd + %changelog +* Tue Feb 13 2007 Jon Ciesla - 20061119-1 +- Bumped to upstream verion 20061119; Updated URL * Wed Aug 30 2006 Joost Soeterbroek - 20060629-1 - Rebuild for Fedora Extras 6; bumped to upstream version 20060629 * Mon Jun 26 2006 - Joost Soeterbroek - 20060626-1 @@ -137,12 +146,12 @@ - remove /usr/share/info/dir - removed subpackages database- and sound- - removed configure option without-board3d -- sanitised %files section +- sanitised %%files section - ghost the .pyo files /usr/share/gnubg/scripts/ - added desktop file and icon * Thu Jun 1 2006 - Joost Soeterbroek - 20060530-2 -- moved autogen.sh from %build to %setup -- changed ./configure to %configure macro +- moved autogen.sh from %%build to %%setup +- changed ./configure to %%configure macro - removed install-strip - added directories to files sections - removed BuildReqs glib2 and autoconf Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnubg/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Aug 2006 18:40:52 -0000 1.3 +++ sources 13 Feb 2007 20:13:45 -0000 1.4 @@ -1 +1 @@ -cd74f95712368e9d1edba25f5ad94996 gnubg-20060629.tar.gz +e326528df95bdb68345c435d8df141a2 gnubg-source-MAIN-20061119.tar.gz From fedora-extras-commits at redhat.com Tue Feb 13 21:03:02 2007 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Tue, 13 Feb 2007 16:03:02 -0500 Subject: rpms/tracker/devel tracker.spec,1.10,1.11 Message-ID: <200702132103.l1DL32wQ005611@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/tracker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5549 Modified Files: tracker.spec Log Message: Manually stipulate the deskbar-applet directory Index: tracker.spec =================================================================== RCS file: /cvs/extras/rpms/tracker/devel/tracker.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- tracker.spec 13 Feb 2007 20:08:59 -0000 1.10 +++ tracker.spec 13 Feb 2007 21:02:30 -0000 1.11 @@ -1,7 +1,7 @@ Summary: An object database, tag/metadata database, search tool and indexer Name: tracker Version: 0.5.4 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/System URL: http://www.gnome.org/~jamiemcc/tracker/ @@ -73,7 +73,8 @@ %install rm -rf %{buildroot} -make DESTDIR=%{buildroot} install +make DESTDIR=%{buildroot} \ + DESKBAR_HANDLER_DIR=%{buildroot}%{_libdir}/deskbar-applet/handlers install # Add an autostart for trackerd (for KDE) mkdir -p %{buildroot}%{_datadir}/autostart From fedora-extras-commits at redhat.com Tue Feb 13 21:03:46 2007 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 13 Feb 2007 16:03:46 -0500 Subject: rpms/freeciv/devel .cvsignore, 1.11, 1.12 freeciv.spec, 1.24, 1.25 sources, 1.11, 1.12 freeciv-button-style.patch, 1.1, NONE freeciv-security.patch, 1.2, NONE Message-ID: <200702132103.l1DL3kaZ005638@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/freeciv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5617 Modified Files: .cvsignore freeciv.spec sources Removed Files: freeciv-button-style.patch freeciv-security.patch Log Message: * Tue Feb 13 2007 Brian Pepple - 2.0.9-1 - Update to 2.0.9. - Drop button patch, fixed upstream. - Drop security patch, fixed upstream. - Drop X-Fedora category from desktop files. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 6 Mar 2006 16:04:20 -0000 1.11 +++ .cvsignore 13 Feb 2007 21:03:13 -0000 1.12 @@ -1,2 +1,2 @@ -freeciv-2.0.8.tar.bz2 +freeciv-2.0.9.tar.bz2 stdsounds3.tar.gz Index: freeciv.spec =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/freeciv.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- freeciv.spec 7 Sep 2006 21:16:44 -0000 1.24 +++ freeciv.spec 13 Feb 2007 21:03:13 -0000 1.25 @@ -1,6 +1,6 @@ Name: freeciv -Version: 2.0.8 -Release: 7%{?dist} +Version: 2.0.9 +Release: 1%{?dist} Summary: The Freeciv multi-player strategy game Group: Amusements/Games @@ -12,8 +12,6 @@ Source3: %{name}.xpm Patch1: %{name}-desktop.patch Patch2: %{name}-aifill.patch -Patch3: %{name}-security.patch -Patch4: %{name}-button-style.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel @@ -39,8 +37,6 @@ %setup -q -n %{name}-%{version} %patch1 -p1 -b .desktop %patch2 -p0 -b .aifill -%patch3 -p1 -b .security -%patch4 -p1 -b .button %build @@ -57,14 +53,12 @@ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --remove-category=Strategy \ --add-category=StrategyGame \ - --add-category X-Fedora \ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --remove-category=Strategy \ --add-category=StrategyGame \ - --add-category X-Fedora \ %{SOURCE2} # Remove civmanual @@ -101,6 +95,12 @@ %changelog +* Tue Feb 13 2007 Brian Pepple - 2.0.9-1 +- Update to 2.0.9. +- Drop button patch, fixed upstream. +- Drop security patch, fixed upstream. +- Drop X-Fedora category from desktop files. + * Thu Sep 7 2006 Brian Pepple - 2.0.8-7 - Rebuild for FC6. Index: sources =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 6 Mar 2006 16:04:20 -0000 1.11 +++ sources 13 Feb 2007 21:03:13 -0000 1.12 @@ -1,2 +1,2 @@ -9ebd5899c2c78362e0e2c68791673a88 freeciv-2.0.8.tar.bz2 +7bfa40220bd8e19a263ca247202682ce freeciv-2.0.9.tar.bz2 77215914712f2f351092918f5e41e39e stdsounds3.tar.gz --- freeciv-button-style.patch DELETED --- --- freeciv-security.patch DELETED --- From fedora-extras-commits at redhat.com Tue Feb 13 21:14:15 2007 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Tue, 13 Feb 2007 16:14:15 -0500 Subject: rpms/gpixpod import.log,1.1,1.2 Message-ID: <200702132114.l1DLEFPp006022@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/gpixpod In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5980 Modified Files: import.log Log Message: auto-import gpixpod-0.6.2-1 on branch devel from gpixpod-0.6.2-1.src.rpm Initial import Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gpixpod/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 12 Feb 2007 18:39:51 -0000 1.1 +++ import.log 13 Feb 2007 21:13:43 -0000 1.2 @@ -0,0 +1 @@ +gpixpod-0_6_2-1:HEAD:gpixpod-0.6.2-1.src.rpm:1171401204 From fedora-extras-commits at redhat.com Tue Feb 13 21:14:18 2007 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Tue, 13 Feb 2007 16:14:18 -0500 Subject: rpms/gpixpod/devel gpixpod-exec.patch, NONE, 1.1 gpixpod-setup.patch, NONE, 1.1 gpixpod.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702132114.l1DLEIPA006026@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/gpixpod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5980/devel Modified Files: .cvsignore sources Added Files: gpixpod-exec.patch gpixpod-setup.patch gpixpod.spec Log Message: auto-import gpixpod-0.6.2-1 on branch devel from gpixpod-0.6.2-1.src.rpm Initial import gpixpod-exec.patch: --- NEW FILE gpixpod-exec.patch --- --- gpixpod 2006-09-29 16:29:50.000000000 -0400 +++ gpixpod.new 2006-12-28 20:12:55.000000000 -0500 @@ -1,2 +1,5 @@ #!/bin/bash -exec python2.4 /usr/lib/gpixpod/gpixpod.py "$@" + +PYTHON_DIR=`python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(1)'` + +exec python ${PYTHON_DIR}/gpixpod/gpixpod.py "$@" gpixpod-setup.patch: --- NEW FILE gpixpod-setup.patch --- --- setup.py 2006-10-11 10:48:39.000000000 -0400 +++ setup.py 2006-12-28 19:15:29.000000000 -0500 @@ -47,11 +47,10 @@ py_modules=['mh', 'gpixpod', 'gpixpod_cli', 'utils', 'ipodhal'], scripts = ['gpixpod'], ext_modules = [imgconvert], - data_files = [('lib/gpixpod', ['gpixpod.glade']), - ('lib/gpixpod/po/it/LC_MESSAGES', ['po/it/LC_MESSAGES/gpixpod.mo']), - ('lib/gpixpod/po/es/LC_MESSAGES', ['po/es/LC_MESSAGES/gpixpod.mo']), + data_files = [('share/gpixpod', ['gpixpod.glade']), + ('share/locale/it/LC_MESSAGES', ['po/it/LC_MESSAGES/gpixpod.mo']), + ('share/locale/es/LC_MESSAGES', ['po/es/LC_MESSAGES/gpixpod.mo']), ('share/applications', ['GPixPod.desktop']), ('share/man/man1', ['gpixpod.1.gz']), - ('share/doc/gpixpod', ['README', 'CHANGELOG', 'TODO', 'KNOWNBUGS']), ('share/gpixpod', ['GPixPod.png', 'GPixPod_icon.png', 'ipod.png', 'photoalbum.png'])] ) --- gpixpod.py 2006-10-11 10:38:05.000000000 -0400 +++ gpixpod.py.new 2006-12-28 21:06:31.000000000 -0500 @@ -109,7 +109,11 @@ 'on_progresspausebutton_clicked':self.PauseProgress, 'on_progressstopbutton_clicked':self.StopProgress, 'on_toolbar2_activate':self.ToggleToolbar, 'on_list_previews1_activate':self.TogglePreviews, 'on_details_pane1_activate':self.ToggleDetails} - self.win = gtk.glade.XML('gpixpod.glade', 'window1', 'gpixpod') + if os.path.isfile('gpixpod.glade'): + self.glade = 'gpixpod.glade' + else: + self.glade = '/usr/share/gpixpod/gpixpod.glade' + self.win = gtk.glade.XML(self.glade, 'window1', 'gpixpod') self.win.signal_autoconnect(self.win_callbacks) self.window = self.win.get_widget('window1') self.treeview = self.win.get_widget('treeview1') @@ -905,7 +909,7 @@ try: photoid = self.GetCurrentTVPhotoID() self.slideshow_current_photoid = photoid - self.slideshow = gtk.glade.XML('gpixpod.glade', 'slideshowwindow', 'gpixpod') + self.slideshow = gtk.glade.XML(self.glade, 'slideshowwindow', 'gpixpod') self.slideshow_callbacks = {'on_slideshowclosebutton_clicked':self.SlideShowQuit, 'on_slideshowbackbutton_clicked':self.SlideShowBack, 'on_slideshowforwardbutton_clicked':self.SlideShowForward} @@ -1102,7 +1106,7 @@ def ShowGetLine(self, widget, ok_function, title=None, message=None, entrytext=None): """ Show a dialog to let enter a new line (e.g. to add a new album, or to renaming an existing one) """ - self.getline = gtk.glade.XML('gpixpod.glade', 'dialog2', 'gpixpod') + self.getline = gtk.glade.XML(self.glade, 'dialog2', 'gpixpod') self.getlineinput = self.getline.get_widget('dialog2') if self.icon: self.getlineinput.set_icon_from_file(self.icon) @@ -1133,7 +1137,7 @@ def ShowChooser(self, widget, ok_function, filter_name=None, pattern=None, multiple=False, path=None, preview=False, chooser_type=None, title=None, savefilename=None): """ Show file chooser, to select and open file based on the pattern specified, passing to the specified function """ self.chooser_callbacks = {'on_button1_clicked':self.DestroyChooser, 'on_button2_clicked':ok_function} - self.chooser = gtk.glade.XML('gpixpod.glade', 'filechooserdialog1', 'gpixpod') + self.chooser = gtk.glade.XML(self.glade, 'filechooserdialog1', 'gpixpod') self.chooser.signal_autoconnect(self.chooser_callbacks) self.filechooser = self.chooser.get_widget('filechooserdialog1') if self.icon: @@ -1556,7 +1560,7 @@ def ShowIpodInfo(self, widget): """ Show the iPod info dialog """ - self.ipodinfo = gtk.glade.XML('gpixpod.glade', 'ipodinfodialog', 'gpixpod') + self.ipodinfo = gtk.glade.XML(self.glade, 'ipodinfodialog', 'gpixpod') self.ipodinfodlg = self.ipodinfo.get_widget('ipodinfodialog') self.ipodinfo.signal_connect('on_ipodinfookbutton_clicked', self.DestroyIpodInfo) if self.ipodicon: @@ -1591,7 +1595,7 @@ def ShowAbout(self, widget): """ Show the about dialog """ gtk.about_dialog_set_url_hook(self.LaunchBrowser) - self.about = gtk.glade.XML('gpixpod.glade', 'aboutdialog1', 'gpixpod') + self.about = gtk.glade.XML(self.glade, 'aboutdialog1', 'gpixpod') self.aboutdlg = self.about.get_widget('aboutdialog1') if self.icon: self.aboutdlg.set_icon_from_file(self.icon) @@ -1600,7 +1604,7 @@ def ShowPreferences(self, widget): """ Show the preferences dialog """ - self.preferences = gtk.glade.XML('gpixpod.glade', 'preferencesdialog', 'gpixpod') + self.preferences = gtk.glade.XML(self.glade, 'preferencesdialog', 'gpixpod') self.preferencesdlg = self.preferences.get_widget('preferencesdialog') if self.icon: self.preferencesdlg.set_icon_from_file(self.icon) --- NEW FILE gpixpod.spec --- %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: An ipod photo organizer Name: gpixpod Version: 0.6.2 Release: 1%{?dist} Group: Applications/Multimedia License: GPL URL: http://www.gpixpod.org Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz Patch0: gpixpod-setup.patch Patch1: gpixpod-exec.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel BuildRequires: gtk2-devel BuildRequires: desktop-file-utils %description GPixPod let you manage your collection of photos uploading them to your iPod, organizing them in photo albums. Instead of the iTunes synchronization approach, GPixPod let you choose your manual operations on your photos and photo albums, such as adding/deleting individual photos and photo albums, and renaming photo albums %prep %setup -q %patch0 -p0 -b .setup %patch1 -p0 -b .exec # Silence rpmlint sed -e '/^#!\//,1 d' -i {mh,gpixpod,gpixpod_cli}.py %build %{__python} setup.py build %install rm -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot} mkdir -p %{buildroot}%{python_sitearch}/gpixpod mv %{buildroot}%{python_sitearch}/*.* %{buildroot}%{python_sitearch}/gpixpod/ desktop-file-install --delete-original \ --vendor fedora \ --remove-category Application \ --dir %{buildroot}%{_datadir}/applications \ --mode 0644 \ %{buildroot}%{_datadir}/applications/GPixPod.desktop %find_lang %{name} %clean rm -rf %{buildroot} %files -f %{name}.lang %defattr(-,root,root,-) %doc CHANGELOG COPYING KNOWNBUGS README TODO %{_bindir}/gpixpod %{python_sitearch}/gpixpod/ %{_datadir}/applications/fedora-GPixPod.desktop %{_datadir}/gpixpod/ %{_mandir}/man1/gpixpod.1.gz %changelog * Thu Dec 28 2006 Deji Akingunola - 0.6.2-1 - Initial Fedora Package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gpixpod/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Feb 2007 18:39:58 -0000 1.1 +++ .cvsignore 13 Feb 2007 21:13:45 -0000 1.2 @@ -0,0 +1 @@ +gpixpod-0.6.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gpixpod/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Feb 2007 18:39:58 -0000 1.1 +++ sources 13 Feb 2007 21:13:45 -0000 1.2 @@ -0,0 +1 @@ +2136a65e7b72ba5f5cd7ae5ebdc2205c gpixpod-0.6.2.tar.gz From fedora-extras-commits at redhat.com Tue Feb 13 21:17:25 2007 From: fedora-extras-commits at redhat.com (Ian Burrell (iburrell)) Date: Tue, 13 Feb 2007 16:17:25 -0500 Subject: rpms/ack import.log,1.1,1.2 Message-ID: <200702132117.l1DLHPkZ006432@cvs-int.fedora.redhat.com> Author: iburrell Update of /cvs/extras/rpms/ack In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6354 Modified Files: import.log Log Message: auto-import ack-1.56-4 on branch devel from ack-1.56-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ack/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Feb 2007 19:03:42 -0000 1.1 +++ import.log 13 Feb 2007 21:16:53 -0000 1.2 @@ -0,0 +1 @@ +ack-1_56-4:HEAD:ack-1.56-4.src.rpm:1171401410 From fedora-extras-commits at redhat.com Tue Feb 13 21:17:28 2007 From: fedora-extras-commits at redhat.com (Ian Burrell (iburrell)) Date: Tue, 13 Feb 2007 16:17:28 -0500 Subject: rpms/ack/devel ack.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702132117.l1DLHS78006439@cvs-int.fedora.redhat.com> Author: iburrell Update of /cvs/extras/rpms/ack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6354/devel Modified Files: .cvsignore sources Added Files: ack.spec Log Message: auto-import ack-1.56-4 on branch devel from ack-1.56-4.src.rpm --- NEW FILE ack.spec --- Name: ack Version: 1.56 Release: 4%{?dist} Summary: Grep-like text finder License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/ack/ Source0: http://www.cpan.org/modules/by-module/App/ack-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(File::Next) >= 0.38 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Ack is designed as a replacement for grep. %prep %setup -q %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check # Disabled because tests fail when run without terminal # See http://rt.cpan.org/Public/Bug/Display.html?id=24670 #make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ack-help.txt ack-help-types.txt Changes README %{perl_vendorlib}/* %{_bindir}/ack %{_mandir}/man1/* %{_mandir}/man3/* %changelog * Mon Feb 12 2007 Ian M. Burrell - 1.56-4 - Fix minor issues * Tue Jan 30 2007 Ian M. Burrell - 1.56-3 - Fix source URL * Mon Jan 29 2007 - 1.56-2 - Rename to ack * Mon Jan 29 2007 Ian Burrell 1.56-1 - Specfile autogenerated by cpanspec 1.69.1. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ack/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Feb 2007 19:03:49 -0000 1.1 +++ .cvsignore 13 Feb 2007 21:16:56 -0000 1.2 @@ -0,0 +1 @@ +ack-1.56.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/ack/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Feb 2007 19:03:49 -0000 1.1 +++ sources 13 Feb 2007 21:16:56 -0000 1.2 @@ -0,0 +1 @@ +d2c8750f35ae8be79956958e2b653e32 ack-1.56.tar.gz From fedora-extras-commits at redhat.com Tue Feb 13 21:18:53 2007 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Tue, 13 Feb 2007 16:18:53 -0500 Subject: rpms/gpixpod import.log,1.2,1.3 Message-ID: <200702132118.l1DLIrVd006622@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/gpixpod In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6579 Modified Files: import.log Log Message: auto-import gpixpod-0.6.2-1 on branch FC-6 from gpixpod-0.6.2-1.src.rpm Initial import Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gpixpod/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 13 Feb 2007 21:13:43 -0000 1.2 +++ import.log 13 Feb 2007 21:18:21 -0000 1.3 @@ -1 +1,2 @@ gpixpod-0_6_2-1:HEAD:gpixpod-0.6.2-1.src.rpm:1171401204 +gpixpod-0_6_2-1:FC-6:gpixpod-0.6.2-1.src.rpm:1171401482 From fedora-extras-commits at redhat.com Tue Feb 13 21:18:56 2007 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Tue, 13 Feb 2007 16:18:56 -0500 Subject: rpms/gpixpod/FC-6 gpixpod-exec.patch, NONE, 1.1 gpixpod-setup.patch, NONE, 1.1 gpixpod.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702132118.l1DLIuG5006626@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/gpixpod/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6579/FC-6 Modified Files: .cvsignore sources Added Files: gpixpod-exec.patch gpixpod-setup.patch gpixpod.spec Log Message: auto-import gpixpod-0.6.2-1 on branch FC-6 from gpixpod-0.6.2-1.src.rpm Initial import gpixpod-exec.patch: --- NEW FILE gpixpod-exec.patch --- --- gpixpod 2006-09-29 16:29:50.000000000 -0400 +++ gpixpod.new 2006-12-28 20:12:55.000000000 -0500 @@ -1,2 +1,5 @@ #!/bin/bash -exec python2.4 /usr/lib/gpixpod/gpixpod.py "$@" + +PYTHON_DIR=`python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(1)'` + +exec python ${PYTHON_DIR}/gpixpod/gpixpod.py "$@" gpixpod-setup.patch: --- NEW FILE gpixpod-setup.patch --- --- setup.py 2006-10-11 10:48:39.000000000 -0400 +++ setup.py 2006-12-28 19:15:29.000000000 -0500 @@ -47,11 +47,10 @@ py_modules=['mh', 'gpixpod', 'gpixpod_cli', 'utils', 'ipodhal'], scripts = ['gpixpod'], ext_modules = [imgconvert], - data_files = [('lib/gpixpod', ['gpixpod.glade']), - ('lib/gpixpod/po/it/LC_MESSAGES', ['po/it/LC_MESSAGES/gpixpod.mo']), - ('lib/gpixpod/po/es/LC_MESSAGES', ['po/es/LC_MESSAGES/gpixpod.mo']), + data_files = [('share/gpixpod', ['gpixpod.glade']), + ('share/locale/it/LC_MESSAGES', ['po/it/LC_MESSAGES/gpixpod.mo']), + ('share/locale/es/LC_MESSAGES', ['po/es/LC_MESSAGES/gpixpod.mo']), ('share/applications', ['GPixPod.desktop']), ('share/man/man1', ['gpixpod.1.gz']), - ('share/doc/gpixpod', ['README', 'CHANGELOG', 'TODO', 'KNOWNBUGS']), ('share/gpixpod', ['GPixPod.png', 'GPixPod_icon.png', 'ipod.png', 'photoalbum.png'])] ) --- gpixpod.py 2006-10-11 10:38:05.000000000 -0400 +++ gpixpod.py.new 2006-12-28 21:06:31.000000000 -0500 @@ -109,7 +109,11 @@ 'on_progresspausebutton_clicked':self.PauseProgress, 'on_progressstopbutton_clicked':self.StopProgress, 'on_toolbar2_activate':self.ToggleToolbar, 'on_list_previews1_activate':self.TogglePreviews, 'on_details_pane1_activate':self.ToggleDetails} - self.win = gtk.glade.XML('gpixpod.glade', 'window1', 'gpixpod') + if os.path.isfile('gpixpod.glade'): + self.glade = 'gpixpod.glade' + else: + self.glade = '/usr/share/gpixpod/gpixpod.glade' + self.win = gtk.glade.XML(self.glade, 'window1', 'gpixpod') self.win.signal_autoconnect(self.win_callbacks) self.window = self.win.get_widget('window1') self.treeview = self.win.get_widget('treeview1') @@ -905,7 +909,7 @@ try: photoid = self.GetCurrentTVPhotoID() self.slideshow_current_photoid = photoid - self.slideshow = gtk.glade.XML('gpixpod.glade', 'slideshowwindow', 'gpixpod') + self.slideshow = gtk.glade.XML(self.glade, 'slideshowwindow', 'gpixpod') self.slideshow_callbacks = {'on_slideshowclosebutton_clicked':self.SlideShowQuit, 'on_slideshowbackbutton_clicked':self.SlideShowBack, 'on_slideshowforwardbutton_clicked':self.SlideShowForward} @@ -1102,7 +1106,7 @@ def ShowGetLine(self, widget, ok_function, title=None, message=None, entrytext=None): """ Show a dialog to let enter a new line (e.g. to add a new album, or to renaming an existing one) """ - self.getline = gtk.glade.XML('gpixpod.glade', 'dialog2', 'gpixpod') + self.getline = gtk.glade.XML(self.glade, 'dialog2', 'gpixpod') self.getlineinput = self.getline.get_widget('dialog2') if self.icon: self.getlineinput.set_icon_from_file(self.icon) @@ -1133,7 +1137,7 @@ def ShowChooser(self, widget, ok_function, filter_name=None, pattern=None, multiple=False, path=None, preview=False, chooser_type=None, title=None, savefilename=None): """ Show file chooser, to select and open file based on the pattern specified, passing to the specified function """ self.chooser_callbacks = {'on_button1_clicked':self.DestroyChooser, 'on_button2_clicked':ok_function} - self.chooser = gtk.glade.XML('gpixpod.glade', 'filechooserdialog1', 'gpixpod') + self.chooser = gtk.glade.XML(self.glade, 'filechooserdialog1', 'gpixpod') self.chooser.signal_autoconnect(self.chooser_callbacks) self.filechooser = self.chooser.get_widget('filechooserdialog1') if self.icon: @@ -1556,7 +1560,7 @@ def ShowIpodInfo(self, widget): """ Show the iPod info dialog """ - self.ipodinfo = gtk.glade.XML('gpixpod.glade', 'ipodinfodialog', 'gpixpod') + self.ipodinfo = gtk.glade.XML(self.glade, 'ipodinfodialog', 'gpixpod') self.ipodinfodlg = self.ipodinfo.get_widget('ipodinfodialog') self.ipodinfo.signal_connect('on_ipodinfookbutton_clicked', self.DestroyIpodInfo) if self.ipodicon: @@ -1591,7 +1595,7 @@ def ShowAbout(self, widget): """ Show the about dialog """ gtk.about_dialog_set_url_hook(self.LaunchBrowser) - self.about = gtk.glade.XML('gpixpod.glade', 'aboutdialog1', 'gpixpod') + self.about = gtk.glade.XML(self.glade, 'aboutdialog1', 'gpixpod') self.aboutdlg = self.about.get_widget('aboutdialog1') if self.icon: self.aboutdlg.set_icon_from_file(self.icon) @@ -1600,7 +1604,7 @@ def ShowPreferences(self, widget): """ Show the preferences dialog """ - self.preferences = gtk.glade.XML('gpixpod.glade', 'preferencesdialog', 'gpixpod') + self.preferences = gtk.glade.XML(self.glade, 'preferencesdialog', 'gpixpod') self.preferencesdlg = self.preferences.get_widget('preferencesdialog') if self.icon: self.preferencesdlg.set_icon_from_file(self.icon) --- NEW FILE gpixpod.spec --- %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: An ipod photo organizer Name: gpixpod Version: 0.6.2 Release: 1%{?dist} Group: Applications/Multimedia License: GPL URL: http://www.gpixpod.org Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz Patch0: gpixpod-setup.patch Patch1: gpixpod-exec.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel BuildRequires: gtk2-devel BuildRequires: desktop-file-utils %description GPixPod let you manage your collection of photos uploading them to your iPod, organizing them in photo albums. Instead of the iTunes synchronization approach, GPixPod let you choose your manual operations on your photos and photo albums, such as adding/deleting individual photos and photo albums, and renaming photo albums %prep %setup -q %patch0 -p0 -b .setup %patch1 -p0 -b .exec # Silence rpmlint sed -e '/^#!\//,1 d' -i {mh,gpixpod,gpixpod_cli}.py %build %{__python} setup.py build %install rm -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot} mkdir -p %{buildroot}%{python_sitearch}/gpixpod mv %{buildroot}%{python_sitearch}/*.* %{buildroot}%{python_sitearch}/gpixpod/ desktop-file-install --delete-original \ --vendor fedora \ --remove-category Application \ --dir %{buildroot}%{_datadir}/applications \ --mode 0644 \ %{buildroot}%{_datadir}/applications/GPixPod.desktop %find_lang %{name} %clean rm -rf %{buildroot} %files -f %{name}.lang %defattr(-,root,root,-) %doc CHANGELOG COPYING KNOWNBUGS README TODO %{_bindir}/gpixpod %{python_sitearch}/gpixpod/ %{_datadir}/applications/fedora-GPixPod.desktop %{_datadir}/gpixpod/ %{_mandir}/man1/gpixpod.1.gz %changelog * Thu Dec 28 2006 Deji Akingunola - 0.6.2-1 - Initial Fedora Package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gpixpod/FC-6/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Feb 2007 18:39:58 -0000 1.1 +++ .cvsignore 13 Feb 2007 21:18:23 -0000 1.2 @@ -0,0 +1 @@ +gpixpod-0.6.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gpixpod/FC-6/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Feb 2007 18:39:58 -0000 1.1 +++ sources 13 Feb 2007 21:18:23 -0000 1.2 @@ -0,0 +1 @@ +2136a65e7b72ba5f5cd7ae5ebdc2205c gpixpod-0.6.2.tar.gz From fedora-extras-commits at redhat.com Tue Feb 13 21:21:37 2007 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Tue, 13 Feb 2007 16:21:37 -0500 Subject: rpms/tracker/devel tracker.spec,1.11,1.12 Message-ID: <200702132121.l1DLLbAh006743@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/tracker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6712 Modified Files: tracker.spec Log Message: Fix the deskbar-applet handlers directory Index: tracker.spec =================================================================== RCS file: /cvs/extras/rpms/tracker/devel/tracker.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- tracker.spec 13 Feb 2007 21:02:30 -0000 1.11 +++ tracker.spec 13 Feb 2007 21:21:04 -0000 1.12 @@ -1,7 +1,7 @@ Summary: An object database, tag/metadata database, search tool and indexer Name: tracker Version: 0.5.4 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/System URL: http://www.gnome.org/~jamiemcc/tracker/ @@ -73,8 +73,8 @@ %install rm -rf %{buildroot} -make DESTDIR=%{buildroot} \ - DESKBAR_HANDLER_DIR=%{buildroot}%{_libdir}/deskbar-applet/handlers install +make DESTDIR=%{buildroot} \ + DESKBAR_HANDLER_DIR=%{_libdir}/deskbar-applet/handlers install # Add an autostart for trackerd (for KDE) mkdir -p %{buildroot}%{_datadir}/autostart @@ -128,7 +128,7 @@ %changelog * Tue Feb 13 2007 Deji Akingunola - 0.5.4-3 -- Package the deskbar plugin properly +- Package the deskbar plugin properly (BZ #228308) * Mon Jan 29 2007 Deji Akingunola - 0.5.4-2 - Split out tracker-search-tool sub-packages, for the GUI facility From fedora-extras-commits at redhat.com Tue Feb 13 21:39:20 2007 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Tue, 13 Feb 2007 16:39:20 -0500 Subject: fedora-release eula.py, 1.3, 1.4 fedora-release.spec, 1.36, 1.37 README-Accessibility, 1.1.1.1, NONE Message-ID: <200702132139.l1DLdKZL006947@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/fedora/fedora-release In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6928 Modified Files: eula.py fedora-release.spec Removed Files: README-Accessibility Log Message: Changes needed for package review Index: eula.py =================================================================== RCS file: /cvs/fedora/fedora-release/eula.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- eula.py 27 Jul 2006 16:45:40 -0000 1.3 +++ eula.py 13 Feb 2007 21:39:18 -0000 1.4 @@ -1,3 +1,17 @@ +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + from gtk import * import string import gtk Index: fedora-release.spec =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- fedora-release.spec 6 Feb 2007 00:06:08 -0000 1.36 +++ fedora-release.spec 13 Feb 2007 21:39:18 -0000 1.37 @@ -3,11 +3,11 @@ Summary: Fedora release files Name: fedora-release Version: 6.90 -Release: 3 +Release: 4 License: GFDL Group: System Environment/Base URL: http://fedoraproject.org -Source: fedora-release-6.tar.gz +Source: %{name}-%{version}.tar.gz Obsoletes: redhat-release Provides: redhat-release Requires: fedora-release-notes >= 6 @@ -15,32 +15,34 @@ BuildArch: noarch %description -Fedora release files +Fedora release files such as yum configs, eula, and various /etc/ files that +define the release. %prep -%setup -q -n fedora-release-6 +%setup -q %build %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/etc +install -d $RPM_BUILD_ROOT/etc echo "Fedora release %{version} (%{release_name})" > $RPM_BUILD_ROOT/etc/fedora-release -cp $RPM_BUILD_ROOT/etc/fedora-release $RPM_BUILD_ROOT/etc/issue +cp -p $RPM_BUILD_ROOT/etc/fedora-release $RPM_BUILD_ROOT/etc/issue echo "Kernel \r on an \m" >> $RPM_BUILD_ROOT/etc/issue -cp $RPM_BUILD_ROOT/etc/issue $RPM_BUILD_ROOT/etc/issue.net +cp -p $RPM_BUILD_ROOT/etc/issue $RPM_BUILD_ROOT/etc/issue.net echo >> $RPM_BUILD_ROOT/etc/issue ln -s fedora-release $RPM_BUILD_ROOT/etc/redhat-release -mkdir -p $RPM_BUILD_ROOT/usr/share/eula $RPM_BUILD_ROOT/usr/share/firstboot/modules -cp -f eula.txt $RPM_BUILD_ROOT/usr/share/eula/eula.en_US -cp -f eula.py $RPM_BUILD_ROOT/usr/share/firstboot/modules/eula.py +install -d $RPM_BUILD_ROOT/usr/share/eula +install -d $RPM_BUILD_ROOT/usr/share/firstboot/modules +cp -p eula.txt $RPM_BUILD_ROOT/usr/share/eula/eula.en_US +cp -p eula.py $RPM_BUILD_ROOT/usr/share/firstboot/modules/eula.py -mkdir -p -m 755 $RPM_BUILD_ROOT/etc/pki/rpm-gpg +install -d -m 755 $RPM_BUILD_ROOT/etc/pki/rpm-gpg for file in RPM-GPG-KEY* ; do install -m 644 $file $RPM_BUILD_ROOT/etc/pki/rpm-gpg done -mkdir -p -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d +install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d for file in fedora*repo ; do install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d done @@ -49,7 +51,7 @@ rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root) +%defattr(-,root,root,-) %attr(0644,root,root) /etc/fedora-release /etc/redhat-release %dir /etc/yum.repos.d @@ -63,6 +65,9 @@ /etc/pki/rpm-gpg/* %changelog +* Tue Feb 13 2007 Jesse Keating - 6.90-4 +- Specfile cleanups + * Mon Feb 05 2007 Jesse Keating - 6.90-3 - Drop the legacy repo file. --- README-Accessibility DELETED --- From fedora-extras-commits at redhat.com Tue Feb 13 21:41:13 2007 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Tue, 13 Feb 2007 16:41:13 -0500 Subject: rpms/tracker/FC-6 tracker.spec,1.9,1.10 Message-ID: <200702132141.l1DLfDWk006974@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/tracker/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6953 Modified Files: tracker.spec Log Message: Fix the deskbar plugin install directory Index: tracker.spec =================================================================== RCS file: /cvs/extras/rpms/tracker/FC-6/tracker.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- tracker.spec 13 Feb 2007 20:12:56 -0000 1.9 +++ tracker.spec 13 Feb 2007 21:40:41 -0000 1.10 @@ -1,7 +1,7 @@ Summary: An object database, tag/metadata database, search tool and indexer Name: tracker Version: 0.5.4 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/System URL: http://www.gnome.org/~jamiemcc/tracker/ @@ -73,7 +73,8 @@ %install rm -rf %{buildroot} -make DESTDIR=%{buildroot} install +make DESTDIR=%{buildroot} \ + DESKBAR_HANDLER_DIR=%{_libdir}/deskbar-applet/handlers install # Add an autostart for trackerd (for KDE) mkdir -p %{buildroot}%{_datadir}/autostart @@ -127,7 +128,7 @@ %changelog * Tue Feb 13 2007 Deji Akingunola - 0.5.4-3 -- Package the deskbar plugin properly +- Package the deskbar plugin properly (BZ #228308) * Mon Jan 29 2007 Deji Akingunola - 0.5.4-2 - Split out tracker-search-tool sub-packages, for the GUI facility From fedora-extras-commits at redhat.com Tue Feb 13 21:43:36 2007 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Tue, 13 Feb 2007 16:43:36 -0500 Subject: fedora-release fedora-release.spec,1.37,1.38 Message-ID: <200702132143.l1DLhadD007035@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/fedora/fedora-release In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7018 Modified Files: fedora-release.spec Log Message: add info about why release-notes are required Index: fedora-release.spec =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- fedora-release.spec 13 Feb 2007 21:39:18 -0000 1.37 +++ fedora-release.spec 13 Feb 2007 21:43:33 -0000 1.38 @@ -11,6 +11,9 @@ Obsoletes: redhat-release Provides: redhat-release Requires: fedora-release-notes >= 6 +# We require release notes to make sure that thoe don't get dropped during +# upgrades, and just because we always want the release notes available +# instead of explicitly asked for BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch From fedora-extras-commits at redhat.com Tue Feb 13 22:04:15 2007 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Tue, 13 Feb 2007 17:04:15 -0500 Subject: rpms/gimmie import.log,1.1,1.2 Message-ID: <200702132204.l1DM4F8Z011121@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/gimmie In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11085 Modified Files: import.log Log Message: auto-import gimmie-0.2.3-2 on branch devel from gimmie-0.2.3-2.src.rpm Initial import Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gimmie/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 12 Feb 2007 19:01:51 -0000 1.1 +++ import.log 13 Feb 2007 22:03:43 -0000 1.2 @@ -0,0 +1 @@ +gimmie-0_2_3-2:HEAD:gimmie-0.2.3-2.src.rpm:1171404203 From fedora-extras-commits at redhat.com Tue Feb 13 22:04:18 2007 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Tue, 13 Feb 2007 17:04:18 -0500 Subject: rpms/gimmie/devel gimmie.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702132204.l1DM4Ilr011125@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/gimmie/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11085/devel Modified Files: .cvsignore sources Added Files: gimmie.spec Log Message: auto-import gimmie-0.2.3-2 on branch devel from gimmie-0.2.3-2.src.rpm Initial import --- NEW FILE gimmie.spec --- %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: Gnome panel revisited Name: gimmie Version: 0.2.3 Release: 2%{?dist} License: LGPL Group: Applications/Engineering URL: http://beatnik.infogami.com/Gimmie Source: http://www.beatniksoftware.com/gimmie/releases/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pygtk2-devel, libgnomecups-devel, gtk2-devel BuildRequires: gettext, perl(XML::Parser), intltool BuildRequires: gnome-python2-gconf, libsexy-devel Requires: gnome-python2-gconf Requires: gnome-python2-gnomedesktop, gnome-python2-libwnck Requires: gnome-python2-applet, gnome-python2-libegg Requires: gnome-python2-gnomekeyring, python-sexy, PyXML %description Gimmie is an elegant way to think about how you use your desktop computer. %prep %setup -q # remove shebangs from the non-executable python files sed -e '/^#!\//,1 d' -i gimmie/gimmie_bar.py %build %configure make %{?_smp_mflags} %install rm -rf %{buildroot} make DESTDIR=%{buildroot} install %find_lang gimmie %clean rm -rf %{buildroot} %post touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %postun touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %files -f gimmie.lang %defattr(-, root, root, -) %doc AUTHORS ChangeLog COPYING NEWS README TODO %{_bindir}/gimmie %{_datadir}/icons/hicolor/*/apps/gimmie.* %{_datadir}/pixmaps/gimmie.png %{_libdir}/bonobo/servers/GNOME_GimmieApplet.server %{_libexecdir}/gimmie_applet %{python_sitearch}/gimmie/ %changelog * Tue Feb 13 2007 Deji Akingunola - 0.2.3-2 - Add more BRs * Tue Feb 07 2007 Deji Akingunola - 0.2.3-1 - First build for Fedora Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gimmie/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Feb 2007 19:01:58 -0000 1.1 +++ .cvsignore 13 Feb 2007 22:03:45 -0000 1.2 @@ -0,0 +1 @@ +gimmie-0.2.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gimmie/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Feb 2007 19:01:58 -0000 1.1 +++ sources 13 Feb 2007 22:03:46 -0000 1.2 @@ -0,0 +1 @@ +294b9aa65247dc1f467424d15b1c247c gimmie-0.2.3.tar.gz From fedora-extras-commits at redhat.com Tue Feb 13 22:06:26 2007 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Tue, 13 Feb 2007 17:06:26 -0500 Subject: rpms/gimmie import.log,1.2,1.3 Message-ID: <200702132206.l1DM6Q5I011267@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/gimmie In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11231 Modified Files: import.log Log Message: auto-import gimmie-0.2.3-2 on branch FC-6 from gimmie-0.2.3-2.src.rpm Initial import Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gimmie/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 13 Feb 2007 22:03:43 -0000 1.2 +++ import.log 13 Feb 2007 22:05:53 -0000 1.3 @@ -1 +1,2 @@ gimmie-0_2_3-2:HEAD:gimmie-0.2.3-2.src.rpm:1171404203 +gimmie-0_2_3-2:FC-6:gimmie-0.2.3-2.src.rpm:1171404332 From fedora-extras-commits at redhat.com Tue Feb 13 22:06:28 2007 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Tue, 13 Feb 2007 17:06:28 -0500 Subject: rpms/gimmie/FC-6 gimmie.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702132206.l1DM6ShH011271@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/gimmie/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11231/FC-6 Modified Files: .cvsignore sources Added Files: gimmie.spec Log Message: auto-import gimmie-0.2.3-2 on branch FC-6 from gimmie-0.2.3-2.src.rpm Initial import --- NEW FILE gimmie.spec --- %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: Gnome panel revisited Name: gimmie Version: 0.2.3 Release: 2%{?dist} License: LGPL Group: Applications/Engineering URL: http://beatnik.infogami.com/Gimmie Source: http://www.beatniksoftware.com/gimmie/releases/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pygtk2-devel, libgnomecups-devel, gtk2-devel BuildRequires: gettext, perl(XML::Parser), intltool BuildRequires: gnome-python2-gconf, libsexy-devel Requires: gnome-python2-gconf Requires: gnome-python2-gnomedesktop, gnome-python2-libwnck Requires: gnome-python2-applet, gnome-python2-libegg Requires: gnome-python2-gnomekeyring, python-sexy, PyXML %description Gimmie is an elegant way to think about how you use your desktop computer. %prep %setup -q # remove shebangs from the non-executable python files sed -e '/^#!\//,1 d' -i gimmie/gimmie_bar.py %build %configure make %{?_smp_mflags} %install rm -rf %{buildroot} make DESTDIR=%{buildroot} install %find_lang gimmie %clean rm -rf %{buildroot} %post touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %postun touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %files -f gimmie.lang %defattr(-, root, root, -) %doc AUTHORS ChangeLog COPYING NEWS README TODO %{_bindir}/gimmie %{_datadir}/icons/hicolor/*/apps/gimmie.* %{_datadir}/pixmaps/gimmie.png %{_libdir}/bonobo/servers/GNOME_GimmieApplet.server %{_libexecdir}/gimmie_applet %{python_sitearch}/gimmie/ %changelog * Tue Feb 13 2007 Deji Akingunola - 0.2.3-2 - Add more BRs * Tue Feb 07 2007 Deji Akingunola - 0.2.3-1 - First build for Fedora Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gimmie/FC-6/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Feb 2007 19:01:58 -0000 1.1 +++ .cvsignore 13 Feb 2007 22:05:56 -0000 1.2 @@ -0,0 +1 @@ +gimmie-0.2.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gimmie/FC-6/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Feb 2007 19:01:58 -0000 1.1 +++ sources 13 Feb 2007 22:05:56 -0000 1.2 @@ -0,0 +1 @@ +294b9aa65247dc1f467424d15b1c247c gimmie-0.2.3.tar.gz From fedora-extras-commits at redhat.com Tue Feb 13 22:50:12 2007 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 13 Feb 2007 17:50:12 -0500 Subject: rpms/poker-engine/FC-5 .cvsignore, 1.9, 1.10 poker-engine.spec, 1.15, 1.16 sources, 1.9, 1.10 Message-ID: <200702132250.l1DMoCUM011627@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/poker-engine/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11569/FC-5 Modified Files: .cvsignore poker-engine.spec sources Log Message: upstream sync Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/poker-engine/FC-5/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 24 Jan 2007 16:17:44 -0000 1.9 +++ .cvsignore 13 Feb 2007 22:49:40 -0000 1.10 @@ -1 +1 @@ -poker-engine-1.0.22.tar.gz +poker-engine-1.0.23.tar.gz Index: poker-engine.spec =================================================================== RCS file: /cvs/extras/rpms/poker-engine/FC-5/poker-engine.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- poker-engine.spec 24 Jan 2007 16:17:44 -0000 1.15 +++ poker-engine.spec 13 Feb 2007 22:49:40 -0000 1.16 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: poker-engine -Version: 1.0.22 +Version: 1.0.23 Release: 1%{?dist} Summary: Python library that implements poker rules @@ -70,6 +70,9 @@ %changelog +* Tue Feb 13 2007 Christopher Stone 1.0.23-1 +- Upstream sync + * Wed Jan 24 2007 Christopher Stone 1.0.22-1 - Upstream sync - Minor whitespace cleanups Index: sources =================================================================== RCS file: /cvs/extras/rpms/poker-engine/FC-5/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 24 Jan 2007 16:17:44 -0000 1.9 +++ sources 13 Feb 2007 22:49:40 -0000 1.10 @@ -1 +1 @@ -f6a42bf9c896cb6f1ea3054a8e51cc8f poker-engine-1.0.22.tar.gz +73c0bed64c13b0681b80c264b1cbdad2 poker-engine-1.0.23.tar.gz From fedora-extras-commits at redhat.com Tue Feb 13 22:50:15 2007 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 13 Feb 2007 17:50:15 -0500 Subject: rpms/poker-engine/FC-6 .cvsignore, 1.9, 1.10 poker-engine.spec, 1.16, 1.17 sources, 1.9, 1.10 Message-ID: <200702132250.l1DMoFip011632@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/poker-engine/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11569/FC-6 Modified Files: .cvsignore poker-engine.spec sources Log Message: upstream sync Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/poker-engine/FC-6/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 24 Jan 2007 16:17:44 -0000 1.9 +++ .cvsignore 13 Feb 2007 22:49:42 -0000 1.10 @@ -1 +1 @@ -poker-engine-1.0.22.tar.gz +poker-engine-1.0.23.tar.gz Index: poker-engine.spec =================================================================== RCS file: /cvs/extras/rpms/poker-engine/FC-6/poker-engine.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- poker-engine.spec 24 Jan 2007 16:17:44 -0000 1.16 +++ poker-engine.spec 13 Feb 2007 22:49:42 -0000 1.17 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: poker-engine -Version: 1.0.22 +Version: 1.0.23 Release: 1%{?dist} Summary: Python library that implements poker rules @@ -70,6 +70,9 @@ %changelog +* Tue Feb 13 2007 Christopher Stone 1.0.23-1 +- Upstream sync + * Wed Jan 24 2007 Christopher Stone 1.0.22-1 - Upstream sync - Minor whitespace cleanups Index: sources =================================================================== RCS file: /cvs/extras/rpms/poker-engine/FC-6/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 24 Jan 2007 16:17:44 -0000 1.9 +++ sources 13 Feb 2007 22:49:42 -0000 1.10 @@ -1 +1 @@ -f6a42bf9c896cb6f1ea3054a8e51cc8f poker-engine-1.0.22.tar.gz +73c0bed64c13b0681b80c264b1cbdad2 poker-engine-1.0.23.tar.gz From fedora-extras-commits at redhat.com Tue Feb 13 22:50:17 2007 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 13 Feb 2007 17:50:17 -0500 Subject: rpms/poker-engine/devel .cvsignore, 1.9, 1.10 poker-engine.spec, 1.17, 1.18 sources, 1.9, 1.10 Message-ID: <200702132250.l1DMoHPq011637@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/poker-engine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11569/devel Modified Files: .cvsignore poker-engine.spec sources Log Message: upstream sync Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/poker-engine/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 24 Jan 2007 16:17:45 -0000 1.9 +++ .cvsignore 13 Feb 2007 22:49:45 -0000 1.10 @@ -1 +1 @@ -poker-engine-1.0.22.tar.gz +poker-engine-1.0.23.tar.gz Index: poker-engine.spec =================================================================== RCS file: /cvs/extras/rpms/poker-engine/devel/poker-engine.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- poker-engine.spec 24 Jan 2007 16:17:45 -0000 1.17 +++ poker-engine.spec 13 Feb 2007 22:49:45 -0000 1.18 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: poker-engine -Version: 1.0.22 +Version: 1.0.23 Release: 1%{?dist} Summary: Python library that implements poker rules @@ -70,6 +70,9 @@ %changelog +* Tue Feb 13 2007 Christopher Stone 1.0.23-1 +- Upstream sync + * Wed Jan 24 2007 Christopher Stone 1.0.22-1 - Upstream sync - Minor whitespace cleanups Index: sources =================================================================== RCS file: /cvs/extras/rpms/poker-engine/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 24 Jan 2007 16:17:45 -0000 1.9 +++ sources 13 Feb 2007 22:49:45 -0000 1.10 @@ -1 +1 @@ -f6a42bf9c896cb6f1ea3054a8e51cc8f poker-engine-1.0.22.tar.gz +73c0bed64c13b0681b80c264b1cbdad2 poker-engine-1.0.23.tar.gz From fedora-extras-commits at redhat.com Tue Feb 13 23:39:44 2007 From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin)) Date: Tue, 13 Feb 2007 18:39:44 -0500 Subject: rpms/oddjob/devel oddjob.spec,1.13,1.14 Message-ID: <200702132339.l1DNdim4015656@cvs-int.fedora.redhat.com> Author: nalin Update of /cvs/extras/rpms/oddjob/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15638 Modified Files: oddjob.spec Log Message: wow, is it that late, already? Index: oddjob.spec =================================================================== RCS file: /cvs/extras/rpms/oddjob/devel/oddjob.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- oddjob.spec 13 Feb 2007 16:09:16 -0000 1.13 +++ oddjob.spec 13 Feb 2007 23:39:12 -0000 1.14 @@ -145,7 +145,7 @@ %postun libs -p /sbin/ldconfig %changelog -* Tue Feb 13 2006 Nalin Dahyabhai 0.27-10 +* Tue Feb 13 2007 Nalin Dahyabhai 0.27-10 - make -devel depend on -libs, which supplies the libraries to which it symlinks (#228377) From fedora-extras-commits at redhat.com Wed Feb 14 00:21:18 2007 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 13 Feb 2007 19:21:18 -0500 Subject: rpms/eb import.log,1.1,1.2 Message-ID: <200702140021.l1E0LI91019414@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/eb In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19369 Modified Files: import.log Log Message: auto-import eb-4.3-1 on branch devel from eb-4.3-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/eb/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Feb 2007 19:30:31 -0000 1.1 +++ import.log 14 Feb 2007 00:20:46 -0000 1.2 @@ -0,0 +1 @@ +eb-4_3-1:HEAD:eb-4.3-1.src.rpm:1171412430 From fedora-extras-commits at redhat.com Wed Feb 14 00:21:21 2007 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 13 Feb 2007 19:21:21 -0500 Subject: rpms/eb/devel eb.spec,NONE,1.1 .cvsignore,1.1,1.2 sources,1.1,1.2 Message-ID: <200702140021.l1E0LLBg019426@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/eb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19369/devel Modified Files: .cvsignore sources Added Files: eb.spec Log Message: auto-import eb-4.3-1 on branch devel from eb-4.3-1.src.rpm --- NEW FILE eb.spec --- Name: eb Version: 4.3 Release: 1%{?dist} Summary: Library for accessing Japanese CD-ROM electronic books Summary(ja): CD-ROM ??????????????????????????????????????????????????? Group: System Environment/Libraries License: BSD URL: http://www.sra.co.jp/people/m-kasahr/eb/ Source0: ftp://ftp.sra.co.jp/pub/misc/eb/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig %description EB Library is a C library for accessing CD-ROM books. EB Library supports to access CD-ROM books of EB, EBG, EBXA, EBXA-C, S-EBXA and EPWING formats. %description -l ja EB ?????????????????? CD-ROM ???????????????????????????????????? C ??????????????????????????? EB, EBG, EBXA, EBXA-C, S-EBXA ????????? EPWING ????????? CD-ROM ????????????????????????????????? %package devel Summary: Development files for eb Group: Development/Libraries Requires: eb = %{version} %description devel This package contains development files needs to use eb in programs. %prep %setup -q %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT%{_libdir}/libeb.la rm -rf tmp mkdir -p tmp mv $RPM_BUILD_ROOT%{_datadir}/eb/doc tmp/html %find_lang %{name} %find_lang %{name}utils cat %{name}utils.lang >> %{name}.lang %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README %config(noreplace) %{_sysconfdir}/eb.conf %{_bindir}/* %{_libdir}/libeb.so.* %{_datadir}/eb %files devel %defattr(-,root,root,-) %doc tmp/html %{_includedir}/eb %{_libdir}/libeb.so %{_datadir}/aclocal/* %changelog * Mon Feb 12 2007 Jens Petersen - 4.3-1 - initial packaging for Fedora Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/eb/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Feb 2007 19:30:39 -0000 1.1 +++ .cvsignore 14 Feb 2007 00:20:48 -0000 1.2 @@ -0,0 +1 @@ +eb-4.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/eb/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Feb 2007 19:30:39 -0000 1.1 +++ sources 14 Feb 2007 00:20:48 -0000 1.2 @@ -0,0 +1 @@ +f7aee92355cae7e4c81cf26df4345b07 eb-4.3.tar.bz2 From fedora-extras-commits at redhat.com Tue Feb 13 23:22:16 2007 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 13 Feb 2007 18:22:16 -0500 Subject: rpms/poker-engine/FC-5 poker-engine.spec,1.16,1.17 Message-ID: <200702132322.l1DNMGZ5015346@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/poker-engine/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15265/FC-5 Modified Files: poker-engine.spec Log Message: fix build Index: poker-engine.spec =================================================================== RCS file: /cvs/extras/rpms/poker-engine/FC-5/poker-engine.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- poker-engine.spec 13 Feb 2007 22:49:40 -0000 1.16 +++ poker-engine.spec 13 Feb 2007 23:21:44 -0000 1.17 @@ -2,7 +2,7 @@ Name: poker-engine Version: 1.0.23 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python library that implements poker rules Group: Development/Libraries @@ -12,6 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +BuildRequires: gettext BuildRequires: rsync libxml2-python libxslt-python pypoker-eval-devel >= 128.0 Requires: rsync libxml2-python libxslt-python pypoker-eval >= 128.0 @@ -44,6 +45,7 @@ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +%find_lang %{name} %check @@ -54,7 +56,7 @@ rm -rf $RPM_BUILD_ROOT -%files +%files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %doc %{_mandir}/man8/*.8.gz @@ -70,6 +72,10 @@ %changelog +* Tue Feb 13 2007 Christopher Stone 1.0.23-2 +- Add new BR gettext for make check +- Add find_lang macro for new locales + * Tue Feb 13 2007 Christopher Stone 1.0.23-1 - Upstream sync From fedora-extras-commits at redhat.com Tue Feb 13 23:22:21 2007 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 13 Feb 2007 18:22:21 -0500 Subject: rpms/poker-engine/devel poker-engine.spec,1.18,1.19 Message-ID: <200702132322.l1DNMLjW015360@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/poker-engine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15265/devel Modified Files: poker-engine.spec Log Message: fix build Index: poker-engine.spec =================================================================== RCS file: /cvs/extras/rpms/poker-engine/devel/poker-engine.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- poker-engine.spec 13 Feb 2007 22:49:45 -0000 1.18 +++ poker-engine.spec 13 Feb 2007 23:21:49 -0000 1.19 @@ -2,7 +2,7 @@ Name: poker-engine Version: 1.0.23 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python library that implements poker rules Group: Development/Libraries @@ -12,6 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +BuildRequires: gettext BuildRequires: rsync libxml2-python libxslt-python pypoker-eval-devel >= 128.0 Requires: rsync libxml2-python libxslt-python pypoker-eval >= 128.0 @@ -44,6 +45,7 @@ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +%find_lang %{name} %check @@ -54,7 +56,7 @@ rm -rf $RPM_BUILD_ROOT -%files +%files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %doc %{_mandir}/man8/*.8.gz @@ -70,6 +72,10 @@ %changelog +* Tue Feb 13 2007 Christopher Stone 1.0.23-2 +- Add new BR gettext for make check +- Add find_lang macro for new locales + * Tue Feb 13 2007 Christopher Stone 1.0.23-1 - Upstream sync From fedora-extras-commits at redhat.com Tue Feb 13 23:22:19 2007 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 13 Feb 2007 18:22:19 -0500 Subject: rpms/poker-engine/FC-6 poker-engine.spec,1.17,1.18 Message-ID: <200702132322.l1DNMJ6a015352@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/poker-engine/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15265/FC-6 Modified Files: poker-engine.spec Log Message: fix build Index: poker-engine.spec =================================================================== RCS file: /cvs/extras/rpms/poker-engine/FC-6/poker-engine.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- poker-engine.spec 13 Feb 2007 22:49:42 -0000 1.17 +++ poker-engine.spec 13 Feb 2007 23:21:46 -0000 1.18 @@ -2,7 +2,7 @@ Name: poker-engine Version: 1.0.23 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python library that implements poker rules Group: Development/Libraries @@ -12,6 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +BuildRequires: gettext BuildRequires: rsync libxml2-python libxslt-python pypoker-eval-devel >= 128.0 Requires: rsync libxml2-python libxslt-python pypoker-eval >= 128.0 @@ -44,6 +45,7 @@ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +%find_lang %{name} %check @@ -54,7 +56,7 @@ rm -rf $RPM_BUILD_ROOT -%files +%files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %doc %{_mandir}/man8/*.8.gz @@ -70,6 +72,10 @@ %changelog +* Tue Feb 13 2007 Christopher Stone 1.0.23-2 +- Add new BR gettext for make check +- Add find_lang macro for new locales + * Tue Feb 13 2007 Christopher Stone 1.0.23-1 - Upstream sync From fedora-extras-commits at redhat.com Wed Feb 14 01:02:02 2007 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 13 Feb 2007 20:02:02 -0500 Subject: rpms/eb/FC-6 sources,1.1,1.2 Message-ID: <200702140102.l1E122vD023240@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/eb/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23220 Modified Files: sources Log Message: initial import Index: sources =================================================================== RCS file: /cvs/extras/rpms/eb/FC-6/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Feb 2007 19:30:39 -0000 1.1 +++ sources 14 Feb 2007 01:01:29 -0000 1.2 @@ -0,0 +1 @@ +f7aee92355cae7e4c81cf26df4345b07 eb-4.3.tar.bz2 From fedora-extras-commits at redhat.com Wed Feb 14 01:04:47 2007 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 13 Feb 2007 20:04:47 -0500 Subject: rpms/eb/FC-6 eb.spec,NONE,1.1 Message-ID: <200702140104.l1E14lEt023301@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/eb/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23293 Added Files: eb.spec Log Message: add spec file --- NEW FILE eb.spec --- Name: eb Version: 4.3 Release: 1%{?dist} Summary: Library for accessing Japanese CD-ROM electronic books Summary(ja): CD-ROM ??????????????????????????????????????????????????? Group: System Environment/Libraries License: BSD URL: http://www.sra.co.jp/people/m-kasahr/eb/ Source0: ftp://ftp.sra.co.jp/pub/misc/eb/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig %description EB Library is a C library for accessing CD-ROM books. EB Library supports to access CD-ROM books of EB, EBG, EBXA, EBXA-C, S-EBXA and EPWING formats. %description -l ja EB ?????????????????? CD-ROM ???????????????????????????????????? C ??????????????????????????? EB, EBG, EBXA, EBXA-C, S-EBXA ????????? EPWING ????????? CD-ROM ????????????????????????????????? %package devel Summary: Development files for eb Group: Development/Libraries Requires: eb = %{version} %description devel This package contains development files needs to use eb in programs. %prep %setup -q %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT%{_libdir}/libeb.la rm -rf tmp mkdir -p tmp mv $RPM_BUILD_ROOT%{_datadir}/eb/doc tmp/html %find_lang %{name} %find_lang %{name}utils cat %{name}utils.lang >> %{name}.lang %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README %config(noreplace) %{_sysconfdir}/eb.conf %{_bindir}/* %{_libdir}/libeb.so.* %{_datadir}/eb %files devel %defattr(-,root,root,-) %doc tmp/html %{_includedir}/eb %{_libdir}/libeb.so %{_datadir}/aclocal/* %changelog * Mon Feb 12 2007 Jens Petersen - 4.3-1 - initial packaging for Fedora From fedora-extras-commits at redhat.com Wed Feb 14 04:00:24 2007 From: fedora-extras-commits at redhat.com (Michael Rice (errr)) Date: Tue, 13 Feb 2007 23:00:24 -0500 Subject: rpms/etherape import.log,1.2,1.3 Message-ID: <200702140400.l1E40OkP031780@cvs-int.fedora.redhat.com> Author: errr Update of /cvs/extras/rpms/etherape In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31655 Modified Files: import.log Log Message: auto-import etherape-0.9.7-4 on branch FC-5 from etherape-0.9.7-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/etherape/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 13 Feb 2007 19:31:13 -0000 1.2 +++ import.log 14 Feb 2007 03:59:52 -0000 1.3 @@ -1 +1,2 @@ etherape-0_9_7-4:HEAD:etherape-0.9.7-4.src.rpm:1171395070 +etherape-0_9_7-4:FC-5:etherape-0.9.7-4.src.rpm:1171425588 From fedora-extras-commits at redhat.com Wed Feb 14 04:00:27 2007 From: fedora-extras-commits at redhat.com (Michael Rice (errr)) Date: Tue, 13 Feb 2007 23:00:27 -0500 Subject: rpms/etherape/FC-5 etherape.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702140400.l1E40RxK031792@cvs-int.fedora.redhat.com> Author: errr Update of /cvs/extras/rpms/etherape/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31655/FC-5 Modified Files: .cvsignore sources Added Files: etherape.spec Log Message: auto-import etherape-0.9.7-4 on branch FC-5 from etherape-0.9.7-4.src.rpm --- NEW FILE etherape.spec --- Name: etherape Version: 0.9.7 Release: 4%{?dist} Summary: Graphical network monitor for Unix Group: Applications/System License: GPL URL: http://etherape.sourceforge.net/ Source0: http://umn.dl.sourceforge.net/sourceforge/etherape/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libpcap-devel, libglade2-devel BuildRequires: gettext, desktop-file-utils, libgnomeui-devel BuildRequires: scrollkeeper Requires(post): scrollkeeper Requires(postun): scrollkeeper %description EtherApe is a graphical network monitor modeled after etherman. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} desktop-file-install --vendor "fedora" --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ ${RPM_BUILD_ROOT}%{_datadir}/applications/etherape.desktop rm $RPM_BUILD_ROOT/%{_datadir}/applications/etherape.desktop %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc ABOUT-NLS AUTHORS ChangeLog COPYING FAQ NEWS OVERVIEW README README.bugs README.help README.thanks TODO %{_bindir}/etherape %dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/services %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/doc %dir %{_datadir}/%{name}/doc/%{name} %dir %{_datadir}/%{name}/doc/%{name}/C %{_datadir}/%{name}/doc/%{name}/C/etherape.xml %dir %{_datadir}/%{name}/doc/%{name}/C/figures %{_datadir}/%{name}/doc/%{name}/C/figures/appmain.png %{_datadir}/%{name}/doc/%{name}/C/figures/capture_file_dlg.png %{_datadir}/%{name}/doc/%{name}/C/figures/color_select_dlg.png %{_datadir}/%{name}/doc/%{name}/C/figures/eth_toolbar.png %{_datadir}/%{name}/doc/%{name}/C/figures/link_info.png %{_datadir}/%{name}/doc/%{name}/C/figures/node_info.png %{_datadir}/%{name}/doc/%{name}/C/figures/pref_colors_dlg.png %{_datadir}/%{name}/doc/%{name}/C/figures/pref_diagram_dlg.png %{_datadir}/%{name}/doc/%{name}/C/figures/pref_timings_dlg.png %{_datadir}/%{name}/doc/%{name}/C/figures/proto_info.png %{_datadir}/%{name}/doc/%{name}/C/figures/protocol_edit_dlg.png %dir %{_datadir}/%{name}/glade %{_datadir}/%{name}/glade/etherape.glade2 %{_datadir}/%{name}/glade/etherape.png %{_datadir}/%{name}/glade/pause.xpm %{_datadir}/%{name}/glade/play.xpm %{_datadir}/%{name}/glade/stop.xpm %{_datadir}/applications/fedora-etherape.desktop %{_datadir}/pixmaps/etherape.png %dir %{_datadir}/omf/etherape %{_datadir}/omf/etherape/etherape-C.omf %{_mandir}/man1/* %post scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : %postun scrollkeeper-update -q || : %changelog * Mon Feb 12 2007 Michael Rice - 0.9.7-4 - Fix desktop file install * Sat Feb 10 2007 Michael Rice - 0.9.7-3 - Add scrollkeeper post and postun script snips - Fix dir ownership or pixmaps and omf - Fix .desktop X category * Wed Jan 31 2007 Michael Rice - 0.9.7-2 - Fix dup BR's - add missing BR for libgnomeui-devel scrollkeeper - removed %%{buildroot}. in choice of other * Wed Jan 24 2007 Michael Rice - 0.9.7-1 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/etherape/FC-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Feb 2007 19:22:52 -0000 1.1 +++ .cvsignore 14 Feb 2007 03:59:55 -0000 1.2 @@ -0,0 +1 @@ +etherape-0.9.7.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/etherape/FC-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Feb 2007 19:22:52 -0000 1.1 +++ sources 14 Feb 2007 03:59:55 -0000 1.2 @@ -0,0 +1 @@ +7b5783090d92abe79634da4b582c6b48 etherape-0.9.7.tar.gz From fedora-extras-commits at redhat.com Wed Feb 14 04:01:53 2007 From: fedora-extras-commits at redhat.com (Michael Rice (errr)) Date: Tue, 13 Feb 2007 23:01:53 -0500 Subject: rpms/etherape import.log,1.3,1.4 Message-ID: <200702140401.l1E41rIh003077@cvs-int.fedora.redhat.com> Author: errr Update of /cvs/extras/rpms/etherape In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2955 Modified Files: import.log Log Message: auto-import etherape-0.9.7-4 on branch FC-6 from etherape-0.9.7-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/etherape/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 14 Feb 2007 03:59:52 -0000 1.3 +++ import.log 14 Feb 2007 04:01:20 -0000 1.4 @@ -1,2 +1,3 @@ etherape-0_9_7-4:HEAD:etherape-0.9.7-4.src.rpm:1171395070 etherape-0_9_7-4:FC-5:etherape-0.9.7-4.src.rpm:1171425588 +etherape-0_9_7-4:FC-6:etherape-0.9.7-4.src.rpm:1171425676 From fedora-extras-commits at redhat.com Wed Feb 14 04:01:56 2007 From: fedora-extras-commits at redhat.com (Michael Rice (errr)) Date: Tue, 13 Feb 2007 23:01:56 -0500 Subject: rpms/etherape/FC-6 etherape.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702140401.l1E41uVM003089@cvs-int.fedora.redhat.com> Author: errr Update of /cvs/extras/rpms/etherape/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2955/FC-6 Modified Files: .cvsignore sources Added Files: etherape.spec Log Message: auto-import etherape-0.9.7-4 on branch FC-6 from etherape-0.9.7-4.src.rpm --- NEW FILE etherape.spec --- Name: etherape Version: 0.9.7 Release: 4%{?dist} Summary: Graphical network monitor for Unix Group: Applications/System License: GPL URL: http://etherape.sourceforge.net/ Source0: http://umn.dl.sourceforge.net/sourceforge/etherape/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libpcap-devel, libglade2-devel BuildRequires: gettext, desktop-file-utils, libgnomeui-devel BuildRequires: scrollkeeper Requires(post): scrollkeeper Requires(postun): scrollkeeper %description EtherApe is a graphical network monitor modeled after etherman. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} desktop-file-install --vendor "fedora" --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ ${RPM_BUILD_ROOT}%{_datadir}/applications/etherape.desktop rm $RPM_BUILD_ROOT/%{_datadir}/applications/etherape.desktop %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc ABOUT-NLS AUTHORS ChangeLog COPYING FAQ NEWS OVERVIEW README README.bugs README.help README.thanks TODO %{_bindir}/etherape %dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/services %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/doc %dir %{_datadir}/%{name}/doc/%{name} %dir %{_datadir}/%{name}/doc/%{name}/C %{_datadir}/%{name}/doc/%{name}/C/etherape.xml %dir %{_datadir}/%{name}/doc/%{name}/C/figures %{_datadir}/%{name}/doc/%{name}/C/figures/appmain.png %{_datadir}/%{name}/doc/%{name}/C/figures/capture_file_dlg.png %{_datadir}/%{name}/doc/%{name}/C/figures/color_select_dlg.png %{_datadir}/%{name}/doc/%{name}/C/figures/eth_toolbar.png %{_datadir}/%{name}/doc/%{name}/C/figures/link_info.png %{_datadir}/%{name}/doc/%{name}/C/figures/node_info.png %{_datadir}/%{name}/doc/%{name}/C/figures/pref_colors_dlg.png %{_datadir}/%{name}/doc/%{name}/C/figures/pref_diagram_dlg.png %{_datadir}/%{name}/doc/%{name}/C/figures/pref_timings_dlg.png %{_datadir}/%{name}/doc/%{name}/C/figures/proto_info.png %{_datadir}/%{name}/doc/%{name}/C/figures/protocol_edit_dlg.png %dir %{_datadir}/%{name}/glade %{_datadir}/%{name}/glade/etherape.glade2 %{_datadir}/%{name}/glade/etherape.png %{_datadir}/%{name}/glade/pause.xpm %{_datadir}/%{name}/glade/play.xpm %{_datadir}/%{name}/glade/stop.xpm %{_datadir}/applications/fedora-etherape.desktop %{_datadir}/pixmaps/etherape.png %dir %{_datadir}/omf/etherape %{_datadir}/omf/etherape/etherape-C.omf %{_mandir}/man1/* %post scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : %postun scrollkeeper-update -q || : %changelog * Mon Feb 12 2007 Michael Rice - 0.9.7-4 - Fix desktop file install * Sat Feb 10 2007 Michael Rice - 0.9.7-3 - Add scrollkeeper post and postun script snips - Fix dir ownership or pixmaps and omf - Fix .desktop X category * Wed Jan 31 2007 Michael Rice - 0.9.7-2 - Fix dup BR's - add missing BR for libgnomeui-devel scrollkeeper - removed %%{buildroot}. in choice of other * Wed Jan 24 2007 Michael Rice - 0.9.7-1 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/etherape/FC-6/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Feb 2007 19:22:52 -0000 1.1 +++ .cvsignore 14 Feb 2007 04:01:23 -0000 1.2 @@ -0,0 +1 @@ +etherape-0.9.7.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/etherape/FC-6/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Feb 2007 19:22:52 -0000 1.1 +++ sources 14 Feb 2007 04:01:23 -0000 1.2 @@ -0,0 +1 @@ +7b5783090d92abe79634da4b582c6b48 etherape-0.9.7.tar.gz From fedora-extras-commits at redhat.com Wed Feb 14 04:42:39 2007 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Tue, 13 Feb 2007 23:42:39 -0500 Subject: rpms/gnubg/devel gnubg.spec,1.4,1.5 Message-ID: <200702140442.l1E4gdNp005291@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/extras/rpms/gnubg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5273 Modified Files: gnubg.spec Log Message: Fixed some files issues. Index: gnubg.spec =================================================================== RCS file: /cvs/extras/rpms/gnubg/devel/gnubg.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gnubg.spec 13 Feb 2007 20:13:45 -0000 1.4 +++ gnubg.spec 14 Feb 2007 04:42:06 -0000 1.5 @@ -3,7 +3,7 @@ Group: Amusements/Games Summary: A backgammon game and analyser Version: 20061119 -Release: 1%{?dist} +Release: 2%{?dist} Source0: http://www.gnubg.org/media/sources/%{name}-source-MAIN-%{version}.tar.gz Source1: gnubg.weights Source2: gnubg.desktop @@ -119,16 +119,18 @@ %{_datadir}/icons/hicolor/32x32/apps/%{name}.png %{_datadir}/gnubg/scripts/*.py %{_datadir}/gnubg/scripts/*.pyc -%ghost %{_datadir}/gnubg/scripts/*.pyo -/usr/share/gnubg/flags/czech.png +%{_datadir}/gnubg/scripts/*.py* %{_datadir}/gnubg/flags/*.png %dir %{_datadir}/gnubg/fonts %{_datadir}/gnubg/fonts/* %{_datadir}/gnubg/gnubg.gtkrc %{_datadir}/gnubg/gnubg.wd - +%{_datadir}/gnubg/scripts +%{_datadir}/gnubg/flags %changelog +* Tue Feb 13 2007 Jon Ciesla - 20061119-2 +- Removed czech.png, added scripts, flags dirs. * Tue Feb 13 2007 Jon Ciesla - 20061119-1 - Bumped to upstream verion 20061119; Updated URL * Wed Aug 30 2006 Joost Soeterbroek - 20060629-1 From fedora-extras-commits at redhat.com Wed Feb 14 05:31:37 2007 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 14 Feb 2007 00:31:37 -0500 Subject: rpms/gpredict/FC-5 .cvsignore, 1.5, 1.6 gpredict.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <200702140531.l1E5VbL4009037@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/gpredict/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9007 Modified Files: .cvsignore gpredict.spec sources Log Message: Update to 0.7.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gpredict/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 9 Jan 2007 11:40:12 -0000 1.5 +++ .cvsignore 14 Feb 2007 05:31:05 -0000 1.6 @@ -1 +1 @@ -gpredict-0.7.0.tar.gz +gpredict-0.7.1.tar.gz Index: gpredict.spec =================================================================== RCS file: /cvs/extras/rpms/gpredict/FC-5/gpredict.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gpredict.spec 9 Jan 2007 11:40:12 -0000 1.8 +++ gpredict.spec 14 Feb 2007 05:31:05 -0000 1.9 @@ -1,5 +1,5 @@ Name: gpredict -Version: 0.7.0 +Version: 0.7.1 Release: 1%{?dist} Summary: Real-time satellite tracking and orbit prediction program Group: Applications/Communications @@ -83,6 +83,9 @@ %changelog +* Sun Jan 21 2007 Denis Leroy - 0.7.1-1 +- Update to 0.7.1 + * Tue Jan 9 2007 Denis Leroy - 0.7.0-1 - Update to 0.7.0 - Added curl dependency Index: sources =================================================================== RCS file: /cvs/extras/rpms/gpredict/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Jan 2007 11:40:12 -0000 1.5 +++ sources 14 Feb 2007 05:31:05 -0000 1.6 @@ -1 +1 @@ -171af621bc888d0d7412fd6bd95679f0 gpredict-0.7.0.tar.gz +82bf8d7fb01ed9875b66f3e70bf54702 gpredict-0.7.1.tar.gz From fedora-extras-commits at redhat.com Wed Feb 14 05:49:28 2007 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Wed, 14 Feb 2007 00:49:28 -0500 Subject: fedora-vote README, NONE, 1.1 castvote.cgi, 1.8, 1.9 newelection.py, 1.5, 1.6 vote.cgi, 1.6, 1.7 Message-ID: <200702140549.l1E5nSkg009166@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/fedora/fedora-vote In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9136 Modified Files: castvote.cgi newelection.py vote.cgi Added Files: README Log Message: * README: Explain how to setup a new election. * castvote.cgi, vote.cgi: Set the election for Fedora Documentation. * newelection.cgi: Set the information listed to that needed for the Fedora Documentation Steering Committee. --- NEW FILE README --- Running an Election =================== This is a bit more manual than I'd like it to be but it's not too hard. Information needed ------------------ * Title of election * Number of seats to fill. * Start and end dates (UTC) * FAS Groups that can vote in the election * FAS usernames for the candidates. Steps ----- 1) Checkout the fedora-vote module from cvs 2) Fill in the electionName variable with the title of the election. 3) Fill in the seats variable with the number of seats to fill. 4) Fill the start variable with the timestamp for the starting date. 5) Fill the end variable with the timestamp for the ending date. 6) Fill in the votingGroups tuple with the FAS groups that can vote in the election. 7) Fill the candidates tuple with the FAS usernames that are up for election. I usually put their realname in a comment followed by their FAS account name but that's just because I'm anal :-) 8) Run the script on a machine that has network access to db1.fedora.phx.redhat.com, the fedora account system module checked out somewhere with the website module, the pgdb module, and the /etc/sysconfig/fedora-db-access file (to enable the website module to work). The script will ask you to confirm that the users and groups were correctly pulled from the database and then will insert the records into the elections database to make things work. 9) Edit vote.cgi and castvote.cgi. Set the electionName variable to the title of the election. 10) Copy the updated vote.cgi and castvote.cgi to the voting directory on the app servers:: scp vote.cgi castvote.cgi app1:/var/www/html/admin/voting/ scp vote.cgi castvote.cgi app2:/var/www/html/admin/voting/ Notes ----- In the past I have setup the election with an earlier date for people to test it out first. If you do this it's important to remember all the steps to take when making the database ready for the real election: 1) update election set start_date = 'ACTUAL DATE', end_date = 'ACTUAL DATE' where id = ELECTIONID; 2) delete from ballots where election_id = ELECTIONID; 3) delete from votes where election_id = ELECTIONID; Index: castvote.cgi =================================================================== RCS file: /cvs/fedora/fedora-vote/castvote.cgi,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- castvote.cgi 13 Jun 2006 08:15:46 -0000 1.8 +++ castvote.cgi 14 Feb 2007 05:49:26 -0000 1.9 @@ -24,7 +24,7 @@ import voting import votingadmin -electionName = 'FESCo 2006' +electionName = 'Fedora Documentation Steering Committee February 2007' def make_thank_you(electionName, receipt): content = ''' Index: newelection.py =================================================================== RCS file: /cvs/fedora/fedora-vote/newelection.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- newelection.py 3 Oct 2006 00:51:51 -0000 1.5 +++ newelection.py 14 Feb 2007 05:49:26 -0000 1.6 @@ -14,38 +14,32 @@ dbHost = 'db1.fedora.phx.redhat.com' dbUser = 'electionsuser' -electionName = 'Fedora Ambassadors 2006' -start = '2006-09-21 00:00:00' -end = '2006-09-27 23:59:59' +electionName = 'Fedora Documentation Steering Committee February 2007' +start = '2007-02-13 00:00:00' +end = '2006-02-15 23:59:59' #start = '2006-09-29 00:00:00' #end = '2006-10-05 23:59:59' -seats = '7' +seats = '6' -votingGroups = ('ambassadors',) +votingGroups = ('cvsdocs',) candidates = ( - # Alex Maier - 'amaier', - # Charles VINCHON - 'cvinchon', - # Damien Durand - 'splinux', - # David Nalley - 'ke4qqq', - # Francesco Ugolini - 'wmirror', - # Jack Aboutboul - 'jaboutboul', - # Jeffrey Tadlock - 'jeffreyt', - # Patrick W. Barnes - 'nman64', - # Robert Whetsel - 'rwhetsel', - # Rodrigo Padula - 'rodrigop', - # Thomas Chung - 'tchung' + # John Babich + 'jmbabich', + # Bart Couvreur + 'couf', + # Paul W. Frields + 'pfrields', + # Dimitris Glezos + 'glezos', + # Gavin Henry + 'ghenry', + # Robert 'Bob' Jensen + 'bjensen', + # Pawel Sadowski + 'mcgiwer', + # Karsten Wade + 'kwade' ) groupList = [] candList = [] Index: vote.cgi =================================================================== RCS file: /cvs/fedora/fedora-vote/vote.cgi,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- vote.cgi 16 Jun 2006 15:50:51 -0000 1.6 +++ vote.cgi 14 Feb 2007 05:49:26 -0000 1.7 @@ -11,7 +11,7 @@ import voting -electionName = 'FESCo 2006' +electionName = 'Fedora Documentation Steering Committee February 2007' def make_ballot(candidates, ballotName, openSeats): '''Return a string representing an html ballot.''' From fedora-extras-commits at redhat.com Wed Feb 14 06:05:49 2007 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 14 Feb 2007 01:05:49 -0500 Subject: rpms/eb/devel eb-aclocal-conf-libdir.patch, NONE, 1.1 eb.spec, 1.1, 1.2 Message-ID: <200702140605.l1E65nSZ013126@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/eb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13023 Modified Files: eb.spec Added Files: eb-aclocal-conf-libdir.patch Log Message: - eb-devel requires zlib-devel (#228243) - move eb.conf build config file to eb-devel and libdir - add eb-aclocal-conf-libdir.patch to update eb.conf location eb-aclocal-conf-libdir.patch: --- NEW FILE eb-aclocal-conf-libdir.patch --- --- eb-4.3/m4/eb4.m4~ 2006-06-28 17:20:01.000000000 +1000 +++ eb-4.3/m4/eb4.m4 2007-02-14 13:10:47.000000000 +1000 @@ -49,8 +49,8 @@ dnl * AC_ARG_WITH(eb-conf, AC_HELP_STRING([--with-eb-conf=FILE], - [eb.conf file is FILE [[SYSCONFDIR/eb.conf]]]), -[ebconf="${withval}"], [ebconf=$sysconfdir/eb.conf]) + [eb.conf file is FILE [[LIBDIR/eb.conf]]]), +[ebconf="${withval}"], [ebconf=$libdir/eb.conf]) if test X$prefix = XNONE; then PREFIX=$ac_default_prefix else Index: eb.spec =================================================================== RCS file: /cvs/extras/rpms/eb/devel/eb.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- eb.spec 14 Feb 2007 00:20:48 -0000 1.1 +++ eb.spec 14 Feb 2007 06:05:16 -0000 1.2 @@ -1,6 +1,6 @@ Name: eb Version: 4.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library for accessing Japanese CD-ROM electronic books Summary(ja): CD-ROM ??????????????????????????????????????????????????? @@ -9,6 +9,7 @@ URL: http://www.sra.co.jp/people/m-kasahr/eb/ Source0: ftp://ftp.sra.co.jp/pub/misc/eb/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch1: eb-aclocal-conf-libdir.patch BuildRequires: zlib-devel Requires(post): /sbin/ldconfig @@ -29,6 +30,7 @@ Summary: Development files for eb Group: Development/Libraries Requires: eb = %{version} +Requires: zlib-devel %description devel This package contains development files needs to use eb in programs. @@ -36,10 +38,11 @@ %prep %setup -q +%patch1 -p1 -b .1-etc~ %build -%configure --disable-static +%configure --disable-static --sysconfdir=%{_libdir} make %{?_smp_mflags} @@ -71,7 +74,6 @@ %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README -%config(noreplace) %{_sysconfdir}/eb.conf %{_bindir}/* %{_libdir}/libeb.so.* %{_datadir}/eb @@ -81,10 +83,16 @@ %defattr(-,root,root,-) %doc tmp/html %{_includedir}/eb +%{_libdir}/eb.conf %{_libdir}/libeb.so %{_datadir}/aclocal/* %changelog +* Wed Feb 14 2007 Jens Petersen - 4.3-2 +- eb-devel requires zlib-devel (#228243) +- move eb.conf build config file to eb-devel and libdir +- add eb-aclocal-conf-libdir.patch to update eb.conf location + * Mon Feb 12 2007 Jens Petersen - 4.3-1 -- initial packaging for Fedora +- initial packaging for Fedora (#228241) From fedora-extras-commits at redhat.com Wed Feb 14 06:24:27 2007 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Wed, 14 Feb 2007 01:24:27 -0500 Subject: fedora-vote README,1.1,1.2 Message-ID: <200702140624.l1E6ORpX015448@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/fedora/fedora-vote In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15396 Modified Files: README Log Message: * README: Add information on how to determine the winners after the election. Index: README =================================================================== RCS file: /cvs/fedora/fedora-vote/README,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- README 14 Feb 2007 05:49:26 -0000 1.1 +++ README 14 Feb 2007 06:24:25 -0000 1.2 @@ -1,10 +1,18 @@ +=================== Running an Election =================== +:Author: Toshio Kuratomi +:Date: 13 Feb 2007 + This is a bit more manual than I'd like it to be but it's not too hard. +---------- +Setting up +---------- + Information needed ------------------- +================== * Title of election * Number of seats to fill. @@ -13,7 +21,7 @@ * FAS usernames for the candidates. Steps ------ +===== 1) Checkout the fedora-vote module from cvs 2) Fill in the electionName variable with the title of the election. @@ -44,7 +52,7 @@ scp vote.cgi castvote.cgi app2:/var/www/html/admin/voting/ Notes ------ +===== In the past I have setup the election with an earlier date for people to test it out first. If you do this it's important to remember all the steps to @@ -55,3 +63,30 @@ 2) delete from ballots where election_id = ELECTIONID; 3) delete from votes where election_id = ELECTIONID; + +---------------------- +Getting the Tallysheet +---------------------- + +There is currently no web interface to this. You have to log in to the +db and view the tallysheet:: + + psql -h db1.fedora.phx.redhat.com -U electionsuser elections + Password: + elections=> select * from tallysheet where election_id = 2; + vote_count | id | election_id + ------------+--------+------------- + 35 | 100307 | 2 + 27 | 100263 | 2 + 26 | 100443 | 2 + 20 | 100290 | 2 + 19 | 100393 | 2 + 19 | 100189 | 2 + 19 | 100406 | 2 + 12 | 100516 | 2 + 11 | 100386 | 2 + 9 | 100815 | 2 + 6 | 100435 | 2 + +Then you have to connect to the Fedora Account System and lookup the user ids +for the winners to find out their names. From fedora-extras-commits at redhat.com Wed Feb 14 06:32:46 2007 From: fedora-extras-commits at redhat.com (Till Maas (till)) Date: Wed, 14 Feb 2007 01:32:46 -0500 Subject: rpms/optipng/devel optipng.spec,1.5,1.6 Message-ID: <200702140632.l1E6Wk2h016438@cvs-int.fedora.redhat.com> Author: till Update of /cvs/extras/rpms/optipng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16333 Modified Files: optipng.spec Log Message: rebuild because of new libpng Index: optipng.spec =================================================================== RCS file: /cvs/extras/rpms/optipng/devel/optipng.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- optipng.spec 6 Feb 2007 17:18:30 -0000 1.5 +++ optipng.spec 14 Feb 2007 06:32:13 -0000 1.6 @@ -1,6 +1,6 @@ Name: optipng Version: 0.5.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A PNG optimizer and converter Group: Applications/Multimedia @@ -51,6 +51,9 @@ %changelog +* Wed Feb 14 2007 Till Maas - 0.5.5-2 +- rebuild because of new libpng + * Tue Feb 06 2007 Till Maas - 0.5.5-1 - Version bump From fedora-extras-commits at redhat.com Wed Feb 14 06:59:35 2007 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 14 Feb 2007 01:59:35 -0500 Subject: rpms/gstreamer-python/FC-6 .cvsignore, 1.7, 1.8 gstreamer-python.spec, 1.15, 1.16 sources, 1.7, 1.8 Message-ID: <200702140659.l1E6xZmw019832@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/gstreamer-python/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19745 Modified Files: .cvsignore gstreamer-python.spec sources Log Message: Update to 0.10.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gstreamer-python/FC-6/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 11 Dec 2006 16:11:44 -0000 1.7 +++ .cvsignore 14 Feb 2007 06:59:03 -0000 1.8 @@ -1 +1 @@ -gst-python-0.10.6.tar.bz2 +gst-python-0.10.7.tar.bz2 Index: gstreamer-python.spec =================================================================== RCS file: /cvs/extras/rpms/gstreamer-python/FC-6/gstreamer-python.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gstreamer-python.spec 11 Dec 2006 16:11:44 -0000 1.15 +++ gstreamer-python.spec 14 Feb 2007 06:59:03 -0000 1.16 @@ -1,10 +1,7 @@ -%define gst_minver 0.10.4 -%define gstpb_minver 0.10.5 -%define pygtk_minver 2.8.0 %define majorminor 0.10 Name: gstreamer-python -Version: 0.10.6 +Version: 0.10.7 Release: 1%{?dist} Summary: Python bindings for GStreamer @@ -14,46 +11,50 @@ Source: http://gstreamer.freedesktop.org/src/gst-python/gst-python-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: python >= 2 -Requires: pygtk2 >= %{pygtk_minver} -Requires: gstreamer >= %{gst_minver} -Requires: gstreamer-plugins-base >= %{gstpb_minver} - -BuildRequires: python >= 2 -BuildRequires: python-devel >= 2 -BuildRequires: pygtk2-devel >= %{pygtk_minver} - +Requires: python >= 2.3 +Requires: pygtk2 >= 2.8.0 +Requires: gstreamer >= 0.10.4 +Requires: gstreamer-plugins-base >= 0.10.5 + +BuildRequires: python >= 2.3 +BuildRequires: python-devel >= 2.3 +BuildRequires: pygtk2-devel >= 2.8.0 # xwindowlistener needs X11 headers BuildRequires: libX11-devel - -BuildRequires: gstreamer-devel >= %{gst_minver} -BuildRequires: gstreamer-plugins-base-devel >= %{gstpb_minver} +BuildRequires: gstreamer-devel >= 0.10.4 +BuildRequires: gstreamer-plugins-base-devel >= 0.10.5 +BuildRequires: pygobject2-devel >= 2.11.2 # no sense in splitting off a devel package just yet Provides: gstreamer-python-devel = %{version}-%{release} + %description This module contains a wrapper that allows GStreamer applications to be written in Python. + %prep %setup -q -n gst-python-%{version} + %build # the "docs" were built when disting the tarball, so we don't need to # rebuild them %configure --disable-docs make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT - -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' + %clean rm -rf $RPM_BUILD_ROOT + %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README @@ -66,7 +67,11 @@ %{_datadir}/gst-python/%{majorminor}/defs/*.defs %{_libdir}/pkgconfig/gst-python-%{majorminor}.pc + %changelog +* Wed Feb 14 2007 Denis Leroy - 0.10.7-1 +- Update to 0.10.7 + * Mon Dec 11 2006 Denis Leroy - 0.10.6-1 - Update to 0.10.6 - Some macro simplifications Index: sources =================================================================== RCS file: /cvs/extras/rpms/gstreamer-python/FC-6/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 11 Dec 2006 16:11:44 -0000 1.7 +++ sources 14 Feb 2007 06:59:03 -0000 1.8 @@ -1 +1 @@ -dc9804aa67bc71aa9b6185726b6694ba gst-python-0.10.6.tar.bz2 +16dd6515fd011ad449e5ce191dbb94be gst-python-0.10.7.tar.bz2 From fedora-extras-commits at redhat.com Wed Feb 14 07:09:11 2007 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 14 Feb 2007 02:09:11 -0500 Subject: rpms/gstreamer-python/devel .cvsignore, 1.7, 1.8 gstreamer-python.spec, 1.15, 1.16 sources, 1.7, 1.8 Message-ID: <200702140709.l1E79BZN024187@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/gstreamer-python/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24130 Modified Files: .cvsignore gstreamer-python.spec sources Log Message: Update tp 0.10.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gstreamer-python/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 11 Dec 2006 11:42:08 -0000 1.7 +++ .cvsignore 14 Feb 2007 07:08:38 -0000 1.8 @@ -1 +1 @@ -gst-python-0.10.6.tar.bz2 +gst-python-0.10.7.tar.bz2 Index: gstreamer-python.spec =================================================================== RCS file: /cvs/extras/rpms/gstreamer-python/devel/gstreamer-python.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gstreamer-python.spec 11 Dec 2006 11:42:08 -0000 1.15 +++ gstreamer-python.spec 14 Feb 2007 07:08:38 -0000 1.16 @@ -1,10 +1,7 @@ -%define gst_minver 0.10.4 -%define gstpb_minver 0.10.5 -%define pygtk_minver 2.8.0 %define majorminor 0.10 Name: gstreamer-python -Version: 0.10.6 +Version: 0.10.7 Release: 1%{?dist} Summary: Python bindings for GStreamer @@ -14,46 +11,50 @@ Source: http://gstreamer.freedesktop.org/src/gst-python/gst-python-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: python >= 2 -Requires: pygtk2 >= %{pygtk_minver} -Requires: gstreamer >= %{gst_minver} -Requires: gstreamer-plugins-base >= %{gstpb_minver} - -BuildRequires: python >= 2 -BuildRequires: python-devel >= 2 -BuildRequires: pygtk2-devel >= %{pygtk_minver} - +Requires: python >= 2.3 +Requires: pygtk2 >= 2.8.0 +Requires: gstreamer >= 0.10.4 +Requires: gstreamer-plugins-base >= 0.10.5 + +BuildRequires: python >= 2.3 +BuildRequires: python-devel >= 2.3 +BuildRequires: pygtk2-devel >= 2.8.0 # xwindowlistener needs X11 headers BuildRequires: libX11-devel - -BuildRequires: gstreamer-devel >= %{gst_minver} -BuildRequires: gstreamer-plugins-base-devel >= %{gstpb_minver} +BuildRequires: gstreamer-devel >= 0.10.4 +BuildRequires: gstreamer-plugins-base-devel >= 0.10.5 +BuildRequires: pygobject2-devel >= 2.11.2 # no sense in splitting off a devel package just yet Provides: gstreamer-python-devel = %{version}-%{release} + %description This module contains a wrapper that allows GStreamer applications to be written in Python. + %prep %setup -q -n gst-python-%{version} + %build # the "docs" were built when disting the tarball, so we don't need to # rebuild them %configure --disable-docs make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT - -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' + %clean rm -rf $RPM_BUILD_ROOT + %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README @@ -66,7 +67,12 @@ %{_datadir}/gst-python/%{majorminor}/defs/*.defs %{_libdir}/pkgconfig/gst-python-%{majorminor}.pc + %changelog +* Wed Feb 14 2007 Denis Leroy - 0.10.7-1 +- Update to 0.10.7 +- Some spec cleanups + * Mon Dec 11 2006 Denis Leroy - 0.10.6-1 - Update to 0.10.6, build with python 2.5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gstreamer-python/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 11 Dec 2006 11:42:08 -0000 1.7 +++ sources 14 Feb 2007 07:08:38 -0000 1.8 @@ -1 +1 @@ -dc9804aa67bc71aa9b6185726b6694ba gst-python-0.10.6.tar.bz2 +16dd6515fd011ad449e5ce191dbb94be gst-python-0.10.7.tar.bz2 From fedora-extras-commits at redhat.com Wed Feb 14 07:50:13 2007 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 14 Feb 2007 02:50:13 -0500 Subject: rpms/em8300-kmod/FC-6 em8300-kmod.spec,1.17,1.18 Message-ID: <200702140750.l1E7oDi1025168@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/em8300-kmod/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25151 Modified Files: em8300-kmod.spec Log Message: * Wed Feb 14 2007 Ville Skytt?? - Rebuild for kernel 2.6.19-1.2911.fc6. Index: em8300-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/em8300-kmod/FC-6/em8300-kmod.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- em8300-kmod.spec 18 Jan 2007 20:42:30 -0000 1.17 +++ em8300-kmod.spec 14 Feb 2007 07:49:41 -0000 1.18 @@ -4,7 +4,7 @@ # end stuff to be ... # hardcode for now: -%{!?kversion: %define kversion 2.6.19-1.2895.fc6} +%{!?kversion: %define kversion 2.6.19-1.2911.fc6} %define kmod_name em8300 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null) @@ -80,6 +80,9 @@ %changelog +* Wed Feb 14 2007 Ville Skytt?? +- Rebuild for kernel 2.6.19-1.2911.fc6. + * Thu Jan 18 2007 Ville Skytt?? - Rebuild for kernel 2.6.19-1.2895.fc6. From fedora-extras-commits at redhat.com Wed Feb 14 07:57:41 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 14 Feb 2007 02:57:41 -0500 Subject: rpms/methane import.log,1.1,1.2 Message-ID: <200702140757.l1E7vfkR025521@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/methane In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25460 Modified Files: import.log Log Message: auto-import methane-1.4.7-1.fc7 on branch devel from methane-1.4.7-1.fc7.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/methane/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Feb 2007 19:43:34 -0000 1.1 +++ import.log 14 Feb 2007 07:57:09 -0000 1.2 @@ -0,0 +1 @@ +methane-1_4_7-1_fc7:HEAD:methane-1.4.7-1.fc7.src.rpm:1171439912 From fedora-extras-commits at redhat.com Wed Feb 14 07:57:44 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 14 Feb 2007 02:57:44 -0500 Subject: rpms/methane/devel methane-clanlib08.patch, NONE, 1.1 methane-fullscreen.patch, NONE, 1.1 methane-help.desktop, NONE, 1.1 methane-help.png, NONE, 1.1 methane-highscore.patch, NONE, 1.1 methane.desktop, NONE, 1.1 methane.png, NONE, 1.1 methane.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702140757.l1E7vijq025525@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/methane/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25460/devel Modified Files: .cvsignore sources Added Files: methane-clanlib08.patch methane-fullscreen.patch methane-help.desktop methane-help.png methane-highscore.patch methane.desktop methane.png methane.spec Log Message: auto-import methane-1.4.7-1.fc7 on branch devel from methane-1.4.7-1.fc7.src.rpm methane-clanlib08.patch: --- NEW FILE methane-clanlib08.patch --- --- methane-1.4.7/source/linux/makefile~ 2007-02-07 15:23:23.000000000 +0100 +++ methane-1.4.7/source/linux/makefile 2007-02-07 15:23:23.000000000 +0100 @@ -1,5 +1,5 @@ -METHANE_FLAGS = `pkg-config --cflags clanCore-0.7 clanDisplay-0.7 clanApp-0.7 clanGL-0.7` -METHANE_LIBS = `pkg-config --libs clanCore-0.7 clanDisplay-0.7 clanApp-0.7 clanGL-0.7` +METHANE_FLAGS = `pkg-config --cflags clanCore-0.8 clanDisplay-0.8 clanApp-0.8 clanGL-0.8` +METHANE_LIBS = `pkg-config --libs clanCore-0.8 clanDisplay-0.8 clanApp-0.8 clanGL-0.8` # Remove the following two lines to disable sound METHANE_SND_FLAGS = -DMETHANE_MIKMOD `libmikmod-config --cflags` methane-fullscreen.patch: --- NEW FILE methane-fullscreen.patch --- --- methane-1.4.7/source/linux/main.cpp.fullscreen 2007-02-07 15:32:32.000000000 +0100 +++ methane-1.4.7/source/linux/main.cpp 2007-02-07 15:34:16.000000000 +0100 @@ -114,10 +114,11 @@ CL_SetupGL setupGL; // Set the video mode - CL_DisplayWindow window("Super Methane Brothers", SCR_WIDTH*2, SCR_HEIGHT*2); - + CL_DisplayWindow window("Super Methane Brothers", 640, 480, true, true); + CL_Mouse::hide(); + CL_PixelBuffer pixel_screen(SCR_WIDTH, SCR_HEIGHT, SCR_WIDTH*4, CL_PixelFormat::rgba8888); - CL_Surface game_screen(&pixel_screen); + CL_Surface game_screen(pixel_screen); CL_Canvas game_canvas(game_screen); // Connect the Window close event @@ -142,7 +143,7 @@ CL_InputBuffer mykey; int quit_flag = 0; int disable_scale_flag = 0; - int full_screen_flag = 0; + int full_screen_flag = 1; int on_options_screen = 1; int option_page = 0; int game_speed = 60; --- NEW FILE methane-help.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Super Methane Brothers Documentation Exec=htmlview file:///usr/share/doc/methane-version/docs/info.html Icon=methane-help Terminal=false StartupNotify=true Type=Application Categories=Game;ArcadeGame; methane-highscore.patch: --- NEW FILE methane-highscore.patch --- --- methane-1.4.7/source/linux/doc.cpp.highscore 2005-01-20 17:22:02.000000000 +0100 +++ methane-1.4.7/source/linux/doc.cpp 2007-02-07 15:24:55.000000000 +0100 @@ -40,7 +40,7 @@ //------------------------------------------------------------------------------ // The HighScore table filename //------------------------------------------------------------------------------ -static char HighScoreFileName[] = "/var/games/methanescores"; +extern FILE *methanescoresfptr; #define HighScoreLoadBufferSize (MAX_HISCORES * 64) //------------------------------------------------------------------------------ @@ -382,23 +382,19 @@ //------------------------------------------------------------------------------ void CMethDoc::LoadScores(void) { - FILE *fptr; char *mptr; char *tptr; char let; int cnt; - fptr = fopen(HighScoreFileName, "r"); - if (!fptr) return; // No scores available + if (!methanescoresfptr) return; // No scores available + rewind(methanescoresfptr); // Allocate file memory, which is cleared to zero mptr = (char *) calloc(1, HighScoreLoadBufferSize); if (!mptr) // No memory - { - fclose(fptr); return; - } - fread( mptr, 1, HighScoreLoadBufferSize-2, fptr); // Get the file + fread( mptr, 1, HighScoreLoadBufferSize-2, methanescoresfptr); // Get the file // (Note: mptr is zero terminated) tptr = mptr; @@ -417,9 +413,6 @@ } free(mptr); - - fclose(fptr); - } //------------------------------------------------------------------------------ @@ -427,17 +420,14 @@ //------------------------------------------------------------------------------ void CMethDoc::SaveScores(void) { - FILE *fptr; int cnt; HISCORES *hs; - fptr = fopen(HighScoreFileName, "w"); - if (!fptr) return; // Cannot write scores + if (!methanescoresfptr) return; // Cannot write scores + rewind(methanescoresfptr); for (cnt=0, hs=m_GameTarget.m_Game.m_HiScores; cntname[0], hs->name[1], hs->name[2], hs->name[3], hs->score); + fprintf(methanescoresfptr, "%c%c%c%c%d$", hs->name[0], hs->name[1], hs->name[2], hs->name[3], hs->score); } - fclose(fptr); - } --- methane-1.4.7/source/linux/main.cpp.highscore 2005-01-20 17:22:02.000000000 +0100 +++ methane-1.4.7/source/linux/main.cpp 2007-02-07 15:26:13.000000000 +0100 @@ -13,6 +13,13 @@ //------------------------------------------------------------------------------ // Methane brothers main source file //------------------------------------------------------------------------------ +#ifndef _GNU_SOURCE +#define _GNU_SOURCE /* this must be done before the first include of unistd.h */ +#endif +#include +#include +#include + #ifdef METHANE_OLD_CPP #include #else @@ -32,6 +39,7 @@ // The Game Instance //------------------------------------------------------------------------------ CMethDoc Game; +FILE *methanescoresfptr = NULL; //------------------------------------------------------------------------------ // Keyboard stuff @@ -60,6 +68,15 @@ virtual int main(int argc, char **argv) { + gid_t realgid = getgid(); + + methanescoresfptr = fopen("/var/games/methanescores", "r+"); + + if (setresgid(-1, realgid, realgid) != 0) { + perror("Could not drop setgid privileges. Aborting."); + exit(1); + } + // Create a console window for text-output if not available CL_ConsoleWindow console("Console"); console.redirect_stdio(); @@ -305,6 +322,9 @@ Game.SaveScores(); Game.RemoveSoundDriver(); + + if (methanescoresfptr) + fclose(methanescoresfptr); } catch(CL_Error error) { --- NEW FILE methane.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Super Methane Brothers Name[af]=Super Metaan Broers Name[ca]=Els germans Super met?? Name[eo]=Supermetanaj fratoj Name[es]=Los hermanos super metano Name[fa]=?????????????? ?????? ???????? Name[fo]=Super Methan Br????ur Name[ja]=???????????????????????????????????? Name[lt]=Super metaniniai broliai Name[lv]=Super Met??na Br????i Name[nso]=Masogana a Super Methane Name[pl]=Bracia supemetanowcy Name[pt_BR]=Super Irm??os Name[ru]=???????????? ???????????? Name[sl]=Super metanska bratov????ina Name[ta]=Super Methane Brothers-???????????????? Name[tr]=S??per Metan Karde??ler Name[ven]=Vhakomana vhahulwane vha Ha-Methane Name[vi]=Super Methane Brothers Name[zh_CN]=?????? Methane ?????? Name[zh_TW]=?????????????????? Name[zu]=Obhuti be-Super Methane GenericName=Arcade Game GenericName[af]=Arkade Speletjie GenericName[be]=???????????????? ???????????? GenericName[bg]=???????? ?? ?????????????? ?????? ?????????????? GenericName[bs]=Arkadna igra GenericName[ca]=Joc d'arcade GenericName[cs]=Ark??dov?? hra GenericName[da]=Arkade-videospil GenericName[de]=Arkade-Spiel GenericName[el]=???????????????? Arcade GenericName[eo]=Arkadoludo GenericName[es]=Juego de Arcade GenericName[et]=P??nevusm??ng GenericName[eu]=Arcade Jokoa GenericName[fa]=???????? Arcade GenericName[fi]=Arcade peli GenericName[fo]=Arkadusp??l GenericName[fr]=Jeu d'arcade GenericName[he]=???????? Arcade GenericName[hr]=Arkadna igra GenericName[hu]=??gyess??gi GenericName[it]=Gioco arcade GenericName[ja]=???????????????????????? GenericName[ko]=????????? ?????? GenericName[lt]=Arkadinis ??aidimas GenericName[lv]=Ark??des Sp??le GenericName[mt]=Log??ba tal-arcades GenericName[nb]=Arkadespill GenericName[nl]=arcade-spel GenericName[nn]=Arkadespel GenericName[nso]=Papadi ya Arcade GenericName[pl]=Gra zr??czno??ciowa GenericName[pt]=Jogo de Arcada GenericName[pt_BR]= Arcade GenericName[ro]=Un joc de aventuri GenericName[ru]=???????????????? ???????? GenericName[sk]=Dobrodru??n?? hra GenericName[sl]=Arkadna igra GenericName[ss]=Umdlalo we Arcade GenericName[sv]=Arkadspel GenericName[ta]=Arcade Game-???????????????? GenericName[th]=???????????????????????? GenericName[tr]=Macera oyunu GenericName[uk]=?????? "Arcade" GenericName[ven]=Mutambo wa Akheidi GenericName[xh]=Umdlalo we Arcade GenericName[zh_CN]=???????????? GenericName[zh_TW]=???????????? GenericName[zu]=Umdlalo womhhume Comment=Converted from the Amiga by its original author Exec=methane Icon=methane Terminal=false StartupNotify=false Type=Application Categories=Game;ArcadeGame; --- NEW FILE methane.spec --- Name: methane Version: 1.4.7 Release: 1%{?dist} Summary: Super Methane Brothers Group: Amusements/Games License: GPL URL: http://methane.sourceforge.net/ Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tgz Source1: %{name}.desktop Source2: %{name}-help.desktop Source3: %{name}.png Source4: %{name}-help.png Patch0: methane-clanlib08.patch Patch1: methane-highscore.patch Patch2: methane-fullscreen.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ClanLib-devel mikmod-devel desktop-file-utils Requires: hicolor-icon-theme %description Super Methane Brothers is a platform game converted from the Amiga by its original author. It is very similar to the Taito game "Bubble Bobble". %prep %setup -q %patch0 -p1 -z .cl08 %patch1 -p1 -z .highscore %patch2 -p1 -z .fullscreen # we don't want every beeping file to be executable! chmod -x `find -type f` # put the correct version in methane-help.desktop cat %{SOURCE2} | sed s/version/%{version}/ > %{name}-help.desktop %build pushd source/linux make CXXFLAGS="$RPM_OPT_FLAGS" popd %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_var}/games install -m 755 source/linux/%{name} $RPM_BUILD_ROOT%{_bindir} touch $RPM_BUILD_ROOT%{_var}/games/%{name}scores # below is the desktop file and icon stuff. mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE1} desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ %{name}-help.desktop mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps install -p -m 644 %{SOURCE3} %{SOURCE4} \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files %defattr(-,root,root,-) %doc authors copying docs history i_linux readme todo %attr(2755,root,games) %{_bindir}/%{name} %verify(not md5 size mtime) %config(noreplace) %attr(664,root,games) %{_var}/games/%{name}scores %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/applications/fedora-%{name}-help.desktop %{_datadir}/icons/hicolor/32x32/apps/%{name}.png %{_datadir}/icons/hicolor/32x32/apps/%{name}-help.png %changelog * Thu Jan 25 2007 Hans de Goede 1.4.7-1 - Initial Fedora Extras package, based on the SUSE srpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/methane/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Feb 2007 19:43:42 -0000 1.1 +++ .cvsignore 14 Feb 2007 07:57:12 -0000 1.2 @@ -0,0 +1 @@ +methane-1.4.7.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/methane/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Feb 2007 19:43:42 -0000 1.1 +++ sources 14 Feb 2007 07:57:12 -0000 1.2 @@ -0,0 +1 @@ +c3db4683400ff39e5f9a4b93c4cdb526 methane-1.4.7.tgz From fedora-extras-commits at redhat.com Wed Feb 14 08:03:15 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 14 Feb 2007 03:03:15 -0500 Subject: rpms/xtide/devel .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 xtide.spec, 1.21, 1.22 Message-ID: <200702140803.l1E83FJ3029068@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xtide/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29036 Modified Files: .cvsignore sources xtide.spec Log Message: * Wed Feb 14 2007 Mamoru Tasaka - 2.9-0.3.RC2 - 2.9 RC2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xtide/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 2 Feb 2007 17:13:45 -0000 1.14 +++ .cvsignore 14 Feb 2007 08:02:43 -0000 1.15 @@ -1 +1 @@ -xtide-2.9-RC1.tar.bz2 +xtide-2.9-RC2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xtide/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 2 Feb 2007 17:13:45 -0000 1.14 +++ sources 14 Feb 2007 08:02:43 -0000 1.15 @@ -1 +1 @@ -614c2883316381b576dc092e6a8b3615 xtide-2.9-RC1.tar.bz2 +ff96ccf719b94924abd96708518f4000 xtide-2.9-RC2.tar.bz2 Index: xtide.spec =================================================================== RCS file: /cvs/extras/rpms/xtide/devel/xtide.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- xtide.spec 2 Feb 2007 17:13:45 -0000 1.21 +++ xtide.spec 14 Feb 2007 08:02:43 -0000 1.22 @@ -1,4 +1,5 @@ -%define betatag RC1 +%define betatag RC2 +%define dwfdate 20070211 Summary: Calculate tide all over the world Name: xtide @@ -107,7 +108,9 @@ # xttpd treatment # xttpd is wrapped -%{__install} -c -p -m 755 %{SOURCE14} \ +%{__sed} -e 's|20060708|%{dwfdate}|' %{SOURCE14} \ + > xtide-get_harmonics-data.sh +%{__install} -c -p -m 755 xtide-get_harmonics-data.sh \ $RPM_BUILD_ROOT%{_sbindir} %{__mv} $RPM_BUILD_ROOT%{_sbindir}/xttpd $RPM_BUILD_ROOT%{_libexecdir} %{__install} -c -p -m 755 scripts/Fedora/xttpd-wrapper.sh \ @@ -220,6 +223,9 @@ %{_datadir}/man/man8/xttpd.8* %changelog +* Wed Feb 14 2007 Mamoru Tasaka - 2.9-0.3.RC2 +- 2.9 RC2 + * Fri Feb 2 2007 Mamoru Tasaka - 2.9-0.3.RC1 - 2.9 RC1 From fedora-extras-commits at redhat.com Wed Feb 14 08:03:59 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 14 Feb 2007 03:03:59 -0500 Subject: rpms/xtide/FC-6 .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 xtide.spec, 1.21, 1.22 Message-ID: <200702140803.l1E83xc3029160@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xtide/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29107 Modified Files: .cvsignore sources xtide.spec Log Message: * Wed Feb 14 2007 Mamoru Tasaka - 2.9-0.3.RC2 - 2.9 RC2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xtide/FC-6/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 2 Feb 2007 17:14:09 -0000 1.14 +++ .cvsignore 14 Feb 2007 08:03:27 -0000 1.15 @@ -1 +1 @@ -xtide-2.9-RC1.tar.bz2 +xtide-2.9-RC2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xtide/FC-6/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 2 Feb 2007 17:14:09 -0000 1.14 +++ sources 14 Feb 2007 08:03:27 -0000 1.15 @@ -1 +1 @@ -614c2883316381b576dc092e6a8b3615 xtide-2.9-RC1.tar.bz2 +ff96ccf719b94924abd96708518f4000 xtide-2.9-RC2.tar.bz2 Index: xtide.spec =================================================================== RCS file: /cvs/extras/rpms/xtide/FC-6/xtide.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- xtide.spec 2 Feb 2007 17:14:09 -0000 1.21 +++ xtide.spec 14 Feb 2007 08:03:27 -0000 1.22 @@ -1,4 +1,5 @@ -%define betatag RC1 +%define betatag RC2 +%define dwfdate 20070211 Summary: Calculate tide all over the world Name: xtide @@ -107,7 +108,9 @@ # xttpd treatment # xttpd is wrapped -%{__install} -c -p -m 755 %{SOURCE14} \ +%{__sed} -e 's|20060708|%{dwfdate}|' %{SOURCE14} \ + > xtide-get_harmonics-data.sh +%{__install} -c -p -m 755 xtide-get_harmonics-data.sh \ $RPM_BUILD_ROOT%{_sbindir} %{__mv} $RPM_BUILD_ROOT%{_sbindir}/xttpd $RPM_BUILD_ROOT%{_libexecdir} %{__install} -c -p -m 755 scripts/Fedora/xttpd-wrapper.sh \ @@ -220,6 +223,9 @@ %{_datadir}/man/man8/xttpd.8* %changelog +* Wed Feb 14 2007 Mamoru Tasaka - 2.9-0.3.RC2 +- 2.9 RC2 + * Fri Feb 2 2007 Mamoru Tasaka - 2.9-0.3.RC1 - 2.9 RC1 From fedora-extras-commits at redhat.com Wed Feb 14 08:04:25 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 14 Feb 2007 03:04:25 -0500 Subject: rpms/xtide/FC-5 .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 xtide.spec, 1.22, 1.23 Message-ID: <200702140804.l1E84P7n029205@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xtide/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29139 Modified Files: .cvsignore sources xtide.spec Log Message: * Wed Feb 14 2007 Mamoru Tasaka - 2.9-0.3.RC2 - 2.9 RC2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xtide/FC-5/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 2 Feb 2007 17:14:36 -0000 1.14 +++ .cvsignore 14 Feb 2007 08:03:53 -0000 1.15 @@ -1 +1 @@ -xtide-2.9-RC1.tar.bz2 +xtide-2.9-RC2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xtide/FC-5/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 2 Feb 2007 17:14:36 -0000 1.14 +++ sources 14 Feb 2007 08:03:53 -0000 1.15 @@ -1 +1 @@ -614c2883316381b576dc092e6a8b3615 xtide-2.9-RC1.tar.bz2 +ff96ccf719b94924abd96708518f4000 xtide-2.9-RC2.tar.bz2 Index: xtide.spec =================================================================== RCS file: /cvs/extras/rpms/xtide/FC-5/xtide.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- xtide.spec 2 Feb 2007 17:14:36 -0000 1.22 +++ xtide.spec 14 Feb 2007 08:03:53 -0000 1.23 @@ -1,4 +1,5 @@ -%define betatag RC1 +%define betatag RC2 +%define dwfdate 20070211 Summary: Calculate tide all over the world Name: xtide @@ -107,7 +108,9 @@ # xttpd treatment # xttpd is wrapped -%{__install} -c -p -m 755 %{SOURCE14} \ +%{__sed} -e 's|20060708|%{dwfdate}|' %{SOURCE14} \ + > xtide-get_harmonics-data.sh +%{__install} -c -p -m 755 xtide-get_harmonics-data.sh \ $RPM_BUILD_ROOT%{_sbindir} %{__mv} $RPM_BUILD_ROOT%{_sbindir}/xttpd $RPM_BUILD_ROOT%{_libexecdir} %{__install} -c -p -m 755 scripts/Fedora/xttpd-wrapper.sh \ @@ -220,6 +223,9 @@ %{_datadir}/man/man8/xttpd.8* %changelog +* Wed Feb 14 2007 Mamoru Tasaka - 2.9-0.3.RC2 +- 2.9 RC2 + * Fri Feb 2 2007 Mamoru Tasaka - 2.9-0.3.RC1 - 2.9 RC1 From fedora-extras-commits at redhat.com Wed Feb 14 08:11:33 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 14 Feb 2007 03:11:33 -0500 Subject: rpms/gemdropx/devel gemdropx.desktop, NONE, 1.1 gemdropx.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702140811.l1E8BXZM029394@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gemdropx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29341/devel Modified Files: .cvsignore sources Added Files: gemdropx.desktop gemdropx.spec Log Message: auto-import gemdropx-0.9-2.fc7 on branch devel from gemdropx-0.9-2.fc7.src.rpm --- NEW FILE gemdropx.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Gem Drop X Comment=Falling blocks puzzlegame Exec=gemdropx Icon=gemdropx.png Terminal=false StartupNotify=false Type=Application Categories=Game;BlocksGame; --- NEW FILE gemdropx.spec --- Name: gemdropx Version: 0.9 Release: 2%{?dist} Summary: Falling blocks puzzlegame Group: Amusements/Games License: GPL URL: http://www.newbreedsoftware.com/gemdropx Source0: ftp://ftp.billsgames.com/unix/x/%{name}/src/%{name}-%{version}.tar.gz Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_mixer-devel ImageMagick desktop-file-utils Requires: hicolor-icon-theme %description Gem Drop X is a fast-paced puzzle game where it is your job to clear the screen of gems before they squash you. %prep %setup -q mv data/sounds/README README-sounds.txt mv data/images/README README-images.txt %build make XTRA_FLAGS="$RPM_OPT_FLAGS" DATA_PREFIX=%{_datadir}/%{name} %install rm -rf $RPM_BUILD_ROOT # Makefile always wants to install under /usr/local, so DIY mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/images install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir} install -p -m 644 data/images/*.bmp $RPM_BUILD_ROOT%{_datadir}/%{name}/images cp -a data/sounds $RPM_BUILD_ROOT%{_datadir}/%{name} # below is the desktop file and icon stuff. mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1} mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps convert data/images/%{name}-icon.xpm \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %postun touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %files %defattr(-,root,root,-) %doc README*.txt COPYING.txt AUTHORS.txt CHANGES.txt TODO.txt %{_bindir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/32x32/apps/%{name}.png %changelog * Fri Feb 9 2006 Hans de Goede 0.9-2 - Various specfile fixes from review (bz 226998) * Thu Feb 1 2006 Hans de Goede 0.9-1 - Initial Fedora Extras package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gemdropx/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Feb 2007 18:49:07 -0000 1.1 +++ .cvsignore 14 Feb 2007 08:11:01 -0000 1.2 @@ -0,0 +1 @@ +gemdropx-0.9.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gemdropx/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Feb 2007 18:49:07 -0000 1.1 +++ sources 14 Feb 2007 08:11:01 -0000 1.2 @@ -0,0 +1 @@ +fd0337e89778e2dba74461c555ea8e42 gemdropx-0.9.tar.gz From fedora-extras-commits at redhat.com Wed Feb 14 08:12:04 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 14 Feb 2007 03:12:04 -0500 Subject: rpms/methane/FC-6 .cvsignore,1.1,1.2 sources,1.1,1.2 Message-ID: <200702140812.l1E8C40u029437@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/methane/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29387 Modified Files: .cvsignore sources Log Message: * Thu Jan 25 2007 Hans de Goede 1.4.7-1 - Initial Fedora Extras package, based on the SUSE srpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/methane/FC-6/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Feb 2007 19:43:42 -0000 1.1 +++ .cvsignore 14 Feb 2007 08:11:32 -0000 1.2 @@ -0,0 +1 @@ +methane-1.4.7.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/methane/FC-6/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Feb 2007 19:43:42 -0000 1.1 +++ sources 14 Feb 2007 08:11:32 -0000 1.2 @@ -0,0 +1 @@ +c3db4683400ff39e5f9a4b93c4cdb526 methane-1.4.7.tgz From fedora-extras-commits at redhat.com Wed Feb 14 08:14:49 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 14 Feb 2007 03:14:49 -0500 Subject: rpms/gemdropx/FC-6 gemdropx.desktop, NONE, 1.1 gemdropx.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702140814.l1E8EnI0029637@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gemdropx/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29615 Modified Files: .cvsignore sources Added Files: gemdropx.desktop gemdropx.spec Log Message: * Fri Feb 9 2006 Hans de Goede 0.9-2 - Various specfile fixes from review (bz 226998) --- NEW FILE gemdropx.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Gem Drop X Comment=Falling blocks puzzlegame Exec=gemdropx Icon=gemdropx.png Terminal=false StartupNotify=false Type=Application Categories=Game;BlocksGame; --- NEW FILE gemdropx.spec --- Name: gemdropx Version: 0.9 Release: 2%{?dist} Summary: Falling blocks puzzlegame Group: Amusements/Games License: GPL URL: http://www.newbreedsoftware.com/gemdropx Source0: ftp://ftp.billsgames.com/unix/x/%{name}/src/%{name}-%{version}.tar.gz Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_mixer-devel ImageMagick desktop-file-utils Requires: hicolor-icon-theme %description Gem Drop X is a fast-paced puzzle game where it is your job to clear the screen of gems before they squash you. %prep %setup -q mv data/sounds/README README-sounds.txt mv data/images/README README-images.txt %build make XTRA_FLAGS="$RPM_OPT_FLAGS" DATA_PREFIX=%{_datadir}/%{name} %install rm -rf $RPM_BUILD_ROOT # Makefile always wants to install under /usr/local, so DIY mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/images install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir} install -p -m 644 data/images/*.bmp $RPM_BUILD_ROOT%{_datadir}/%{name}/images cp -a data/sounds $RPM_BUILD_ROOT%{_datadir}/%{name} # below is the desktop file and icon stuff. mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1} mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps convert data/images/%{name}-icon.xpm \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %postun touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %files %defattr(-,root,root,-) %doc README*.txt COPYING.txt AUTHORS.txt CHANGES.txt TODO.txt %{_bindir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/32x32/apps/%{name}.png %changelog * Fri Feb 9 2006 Hans de Goede 0.9-2 - Various specfile fixes from review (bz 226998) * Thu Feb 1 2006 Hans de Goede 0.9-1 - Initial Fedora Extras package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gemdropx/FC-6/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Feb 2007 18:49:07 -0000 1.1 +++ .cvsignore 14 Feb 2007 08:14:17 -0000 1.2 @@ -0,0 +1 @@ +gemdropx-0.9.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gemdropx/FC-6/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Feb 2007 18:49:07 -0000 1.1 +++ sources 14 Feb 2007 08:14:17 -0000 1.2 @@ -0,0 +1 @@ +fd0337e89778e2dba74461c555ea8e42 gemdropx-0.9.tar.gz From fedora-extras-commits at redhat.com Wed Feb 14 08:11:30 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 14 Feb 2007 03:11:30 -0500 Subject: rpms/gemdropx import.log,1.1,1.2 Message-ID: <200702140811.l1E8BUQJ029383@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gemdropx In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29341 Modified Files: import.log Log Message: auto-import gemdropx-0.9-2.fc7 on branch devel from gemdropx-0.9-2.fc7.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gemdropx/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 12 Feb 2007 18:48:59 -0000 1.1 +++ import.log 14 Feb 2007 08:10:58 -0000 1.2 @@ -0,0 +1 @@ +gemdropx-0_9-2_fc7:HEAD:gemdropx-0.9-2.fc7.src.rpm:1171440742 From fedora-extras-commits at redhat.com Wed Feb 14 08:12:53 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 14 Feb 2007 03:12:53 -0500 Subject: rpms/methane/FC-6 methane-clanlib08.patch, NONE, 1.1 methane-fullscreen.patch, NONE, 1.1 methane-help.desktop, NONE, 1.1 methane-help.png, NONE, 1.1 methane-highscore.patch, NONE, 1.1 methane.desktop, NONE, 1.1 methane.png, NONE, 1.1 methane.spec, NONE, 1.1 Message-ID: <200702140812.l1E8CrdA029509@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/methane/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29494 Added Files: methane-clanlib08.patch methane-fullscreen.patch methane-help.desktop methane-help.png methane-highscore.patch methane.desktop methane.png methane.spec Log Message: * Thu Jan 25 2007 Hans de Goede 1.4.7-1 - Initial Fedora Extras package, based on the SUSE srpm methane-clanlib08.patch: --- NEW FILE methane-clanlib08.patch --- --- methane-1.4.7/source/linux/makefile~ 2007-02-07 15:23:23.000000000 +0100 +++ methane-1.4.7/source/linux/makefile 2007-02-07 15:23:23.000000000 +0100 @@ -1,5 +1,5 @@ -METHANE_FLAGS = `pkg-config --cflags clanCore-0.7 clanDisplay-0.7 clanApp-0.7 clanGL-0.7` -METHANE_LIBS = `pkg-config --libs clanCore-0.7 clanDisplay-0.7 clanApp-0.7 clanGL-0.7` +METHANE_FLAGS = `pkg-config --cflags clanCore-0.8 clanDisplay-0.8 clanApp-0.8 clanGL-0.8` +METHANE_LIBS = `pkg-config --libs clanCore-0.8 clanDisplay-0.8 clanApp-0.8 clanGL-0.8` # Remove the following two lines to disable sound METHANE_SND_FLAGS = -DMETHANE_MIKMOD `libmikmod-config --cflags` methane-fullscreen.patch: --- NEW FILE methane-fullscreen.patch --- --- methane-1.4.7/source/linux/main.cpp.fullscreen 2007-02-07 15:32:32.000000000 +0100 +++ methane-1.4.7/source/linux/main.cpp 2007-02-07 15:34:16.000000000 +0100 @@ -114,10 +114,11 @@ CL_SetupGL setupGL; // Set the video mode - CL_DisplayWindow window("Super Methane Brothers", SCR_WIDTH*2, SCR_HEIGHT*2); - + CL_DisplayWindow window("Super Methane Brothers", 640, 480, true, true); + CL_Mouse::hide(); + CL_PixelBuffer pixel_screen(SCR_WIDTH, SCR_HEIGHT, SCR_WIDTH*4, CL_PixelFormat::rgba8888); - CL_Surface game_screen(&pixel_screen); + CL_Surface game_screen(pixel_screen); CL_Canvas game_canvas(game_screen); // Connect the Window close event @@ -142,7 +143,7 @@ CL_InputBuffer mykey; int quit_flag = 0; int disable_scale_flag = 0; - int full_screen_flag = 0; + int full_screen_flag = 1; int on_options_screen = 1; int option_page = 0; int game_speed = 60; --- NEW FILE methane-help.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Super Methane Brothers Documentation Exec=htmlview file:///usr/share/doc/methane-version/docs/info.html Icon=methane-help Terminal=false StartupNotify=true Type=Application Categories=Game;ArcadeGame; methane-highscore.patch: --- NEW FILE methane-highscore.patch --- --- methane-1.4.7/source/linux/doc.cpp.highscore 2005-01-20 17:22:02.000000000 +0100 +++ methane-1.4.7/source/linux/doc.cpp 2007-02-07 15:24:55.000000000 +0100 @@ -40,7 +40,7 @@ //------------------------------------------------------------------------------ // The HighScore table filename //------------------------------------------------------------------------------ -static char HighScoreFileName[] = "/var/games/methanescores"; +extern FILE *methanescoresfptr; #define HighScoreLoadBufferSize (MAX_HISCORES * 64) //------------------------------------------------------------------------------ @@ -382,23 +382,19 @@ //------------------------------------------------------------------------------ void CMethDoc::LoadScores(void) { - FILE *fptr; char *mptr; char *tptr; char let; int cnt; - fptr = fopen(HighScoreFileName, "r"); - if (!fptr) return; // No scores available + if (!methanescoresfptr) return; // No scores available + rewind(methanescoresfptr); // Allocate file memory, which is cleared to zero mptr = (char *) calloc(1, HighScoreLoadBufferSize); if (!mptr) // No memory - { - fclose(fptr); return; - } - fread( mptr, 1, HighScoreLoadBufferSize-2, fptr); // Get the file + fread( mptr, 1, HighScoreLoadBufferSize-2, methanescoresfptr); // Get the file // (Note: mptr is zero terminated) tptr = mptr; @@ -417,9 +413,6 @@ } free(mptr); - - fclose(fptr); - } //------------------------------------------------------------------------------ @@ -427,17 +420,14 @@ //------------------------------------------------------------------------------ void CMethDoc::SaveScores(void) { - FILE *fptr; int cnt; HISCORES *hs; - fptr = fopen(HighScoreFileName, "w"); - if (!fptr) return; // Cannot write scores + if (!methanescoresfptr) return; // Cannot write scores + rewind(methanescoresfptr); for (cnt=0, hs=m_GameTarget.m_Game.m_HiScores; cntname[0], hs->name[1], hs->name[2], hs->name[3], hs->score); + fprintf(methanescoresfptr, "%c%c%c%c%d$", hs->name[0], hs->name[1], hs->name[2], hs->name[3], hs->score); } - fclose(fptr); - } --- methane-1.4.7/source/linux/main.cpp.highscore 2005-01-20 17:22:02.000000000 +0100 +++ methane-1.4.7/source/linux/main.cpp 2007-02-07 15:26:13.000000000 +0100 @@ -13,6 +13,13 @@ //------------------------------------------------------------------------------ // Methane brothers main source file //------------------------------------------------------------------------------ +#ifndef _GNU_SOURCE +#define _GNU_SOURCE /* this must be done before the first include of unistd.h */ +#endif +#include +#include +#include + #ifdef METHANE_OLD_CPP #include #else @@ -32,6 +39,7 @@ // The Game Instance //------------------------------------------------------------------------------ CMethDoc Game; +FILE *methanescoresfptr = NULL; //------------------------------------------------------------------------------ // Keyboard stuff @@ -60,6 +68,15 @@ virtual int main(int argc, char **argv) { + gid_t realgid = getgid(); + + methanescoresfptr = fopen("/var/games/methanescores", "r+"); + + if (setresgid(-1, realgid, realgid) != 0) { + perror("Could not drop setgid privileges. Aborting."); + exit(1); + } + // Create a console window for text-output if not available CL_ConsoleWindow console("Console"); console.redirect_stdio(); @@ -305,6 +322,9 @@ Game.SaveScores(); Game.RemoveSoundDriver(); + + if (methanescoresfptr) + fclose(methanescoresfptr); } catch(CL_Error error) { --- NEW FILE methane.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Super Methane Brothers Name[af]=Super Metaan Broers Name[ca]=Els germans Super met?? Name[eo]=Supermetanaj fratoj Name[es]=Los hermanos super metano Name[fa]=?????????????? ?????? ???????? Name[fo]=Super Methan Br????ur Name[ja]=???????????????????????????????????? Name[lt]=Super metaniniai broliai Name[lv]=Super Met??na Br????i Name[nso]=Masogana a Super Methane Name[pl]=Bracia supemetanowcy Name[pt_BR]=Super Irm??os Name[ru]=???????????? ???????????? Name[sl]=Super metanska bratov????ina Name[ta]=Super Methane Brothers-???????????????? Name[tr]=S??per Metan Karde??ler Name[ven]=Vhakomana vhahulwane vha Ha-Methane Name[vi]=Super Methane Brothers Name[zh_CN]=?????? Methane ?????? Name[zh_TW]=?????????????????? Name[zu]=Obhuti be-Super Methane GenericName=Arcade Game GenericName[af]=Arkade Speletjie GenericName[be]=???????????????? ???????????? GenericName[bg]=???????? ?? ?????????????? ?????? ?????????????? GenericName[bs]=Arkadna igra GenericName[ca]=Joc d'arcade GenericName[cs]=Ark??dov?? hra GenericName[da]=Arkade-videospil GenericName[de]=Arkade-Spiel GenericName[el]=???????????????? Arcade GenericName[eo]=Arkadoludo GenericName[es]=Juego de Arcade GenericName[et]=P??nevusm??ng GenericName[eu]=Arcade Jokoa GenericName[fa]=???????? Arcade GenericName[fi]=Arcade peli GenericName[fo]=Arkadusp??l GenericName[fr]=Jeu d'arcade GenericName[he]=???????? Arcade GenericName[hr]=Arkadna igra GenericName[hu]=??gyess??gi GenericName[it]=Gioco arcade GenericName[ja]=???????????????????????? GenericName[ko]=????????? ?????? GenericName[lt]=Arkadinis ??aidimas GenericName[lv]=Ark??des Sp??le GenericName[mt]=Log??ba tal-arcades GenericName[nb]=Arkadespill GenericName[nl]=arcade-spel GenericName[nn]=Arkadespel GenericName[nso]=Papadi ya Arcade GenericName[pl]=Gra zr??czno??ciowa GenericName[pt]=Jogo de Arcada GenericName[pt_BR]= Arcade GenericName[ro]=Un joc de aventuri GenericName[ru]=???????????????? ???????? GenericName[sk]=Dobrodru??n?? hra GenericName[sl]=Arkadna igra GenericName[ss]=Umdlalo we Arcade GenericName[sv]=Arkadspel GenericName[ta]=Arcade Game-???????????????? GenericName[th]=???????????????????????? GenericName[tr]=Macera oyunu GenericName[uk]=?????? "Arcade" GenericName[ven]=Mutambo wa Akheidi GenericName[xh]=Umdlalo we Arcade GenericName[zh_CN]=???????????? GenericName[zh_TW]=???????????? GenericName[zu]=Umdlalo womhhume Comment=Converted from the Amiga by its original author Exec=methane Icon=methane Terminal=false StartupNotify=false Type=Application Categories=Game;ArcadeGame; --- NEW FILE methane.spec --- Name: methane Version: 1.4.7 Release: 1%{?dist} Summary: Super Methane Brothers Group: Amusements/Games License: GPL URL: http://methane.sourceforge.net/ Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tgz Source1: %{name}.desktop Source2: %{name}-help.desktop Source3: %{name}.png Source4: %{name}-help.png Patch0: methane-clanlib08.patch Patch1: methane-highscore.patch Patch2: methane-fullscreen.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ClanLib-devel mikmod-devel desktop-file-utils Requires: hicolor-icon-theme %description Super Methane Brothers is a platform game converted from the Amiga by its original author. It is very similar to the Taito game "Bubble Bobble". %prep %setup -q %patch0 -p1 -z .cl08 %patch1 -p1 -z .highscore %patch2 -p1 -z .fullscreen # we don't want every beeping file to be executable! chmod -x `find -type f` # put the correct version in methane-help.desktop cat %{SOURCE2} | sed s/version/%{version}/ > %{name}-help.desktop %build pushd source/linux make CXXFLAGS="$RPM_OPT_FLAGS" popd %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_var}/games install -m 755 source/linux/%{name} $RPM_BUILD_ROOT%{_bindir} touch $RPM_BUILD_ROOT%{_var}/games/%{name}scores # below is the desktop file and icon stuff. mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE1} desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ %{name}-help.desktop mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps install -p -m 644 %{SOURCE3} %{SOURCE4} \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files %defattr(-,root,root,-) %doc authors copying docs history i_linux readme todo %attr(2755,root,games) %{_bindir}/%{name} %verify(not md5 size mtime) %config(noreplace) %attr(664,root,games) %{_var}/games/%{name}scores %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/applications/fedora-%{name}-help.desktop %{_datadir}/icons/hicolor/32x32/apps/%{name}.png %{_datadir}/icons/hicolor/32x32/apps/%{name}-help.png %changelog * Thu Jan 25 2007 Hans de Goede 1.4.7-1 - Initial Fedora Extras package, based on the SUSE srpm From fedora-extras-commits at redhat.com Wed Feb 14 08:43:08 2007 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 14 Feb 2007 03:43:08 -0500 Subject: rpms/NetworkManager-vpnc/FC-6 .cvsignore, 1.10, 1.11 NetworkManager-vpnc.spec, 1.20, 1.21 sources, 1.10, 1.11 Message-ID: <200702140843.l1E8h8sE029889@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/NetworkManager-vpnc/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29868 Modified Files: .cvsignore NetworkManager-vpnc.spec sources Log Message: Downgrading to 1:0.6.4 to keep par with NetworkManager core version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/FC-6/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 4 Dec 2006 22:20:46 -0000 1.10 +++ .cvsignore 14 Feb 2007 08:42:36 -0000 1.11 @@ -1,2 +1,5 @@ -NetworkManager-vpnc-0.7.0.cvs20060929.tar.gz -NetworkManager-vpnc-0.7.0.cvs20061204.tar.gz +NetworkManager-vpnc-0.2.tar.gz +NetworkManager-vpnc-0.3.tar.gz +NetworkManager-vpnc-0.5.0.tar.gz +NetworkManager-vpnc-0.6.0.tar.gz +NetworkManager-vpnc-0.6.4.tar.gz Index: NetworkManager-vpnc.spec =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/FC-6/NetworkManager-vpnc.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- NetworkManager-vpnc.spec 4 Dec 2006 22:20:46 -0000 1.20 +++ NetworkManager-vpnc.spec 14 Feb 2007 08:42:36 -0000 1.21 @@ -4,20 +4,15 @@ %define vpnc_version 0.3.3-3 %define shared_mime_version 0.16-3 -%define cvs_snapshot 1 - -%if %{cvs_snapshot} -%define nm_vpnc_cvs_version .cvs20061204 -%endif - Summary: NetworkManager VPN integration for vpnc Name: NetworkManager-vpnc -Version: 0.7.0 -Release: 0%{?nm_vpnc_cvs_version}%{?dist} +Epoch: 1 +Version: 0.6.4 +Release: 1%{?dist} License: GPL Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ -Source: %{name}-%{version}%{?nm_vpnc_cvs_version}.tar.gz +Source: %{name}-%{version}.tar.gz Patch0: NetworkManager-vpnc-0.7.0-gppasswd.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -100,6 +95,9 @@ %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png %changelog +* Wed Feb 14 2007 Denis Leroy - 1:0.6.4-1 +- Downgrading to 1:0.6.4 to keep par with NetworkManager core version + * Mon Dec 4 2006 Dan Williams - 0.7.0-0.cvs20061204 - Allow "NAT-Keepalive packet interval" config option Index: sources =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/FC-6/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 4 Dec 2006 22:20:47 -0000 1.10 +++ sources 14 Feb 2007 08:42:36 -0000 1.11 @@ -1 +1 @@ -c42691dc47448e5b5310566bfc33d807 NetworkManager-vpnc-0.7.0.cvs20061204.tar.gz +ae2d37c75bfef1752f9a4fb944d0a7e5 NetworkManager-vpnc-0.6.4.tar.gz From fedora-extras-commits at redhat.com Wed Feb 14 08:47:40 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 14 Feb 2007 03:47:40 -0500 Subject: comps comps-fe6.xml.in,1.293,1.294 comps-fe7.xml.in,1.101,1.102 Message-ID: <200702140847.l1E8leQX029998@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29973 Modified Files: comps-fe6.xml.in comps-fe7.xml.in Log Message: add gemdropx and methane Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.293 retrieving revision 1.294 diff -u -r1.293 -r1.294 --- comps-fe6.xml.in 7 Feb 2007 15:09:10 -0000 1.293 +++ comps-fe6.xml.in 14 Feb 2007 08:47:10 -0000 1.294 @@ -421,6 +421,7 @@ freedroid freedroidrpg frozen-bubble + gemdropx gl-117 glest gnofract4d @@ -438,6 +439,7 @@ Maelstrom magicor manaworld + methane mirrormagic monkey-bubble monsterz Index: comps-fe7.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe7.xml.in,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- comps-fe7.xml.in 7 Feb 2007 15:09:10 -0000 1.101 +++ comps-fe7.xml.in 14 Feb 2007 08:47:10 -0000 1.102 @@ -421,6 +421,7 @@ freedroid freedroidrpg frozen-bubble + gemdropx gl-117 glest gnofract4d @@ -438,6 +439,7 @@ Maelstrom magicor manaworld + methane mirrormagic monkey-bubble monsterz From fedora-extras-commits at redhat.com Wed Feb 14 08:58:01 2007 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 14 Feb 2007 03:58:01 -0500 Subject: rpms/NetworkManager-vpnc/devel .cvsignore, 1.9, 1.10 NetworkManager-vpnc.spec, 1.20, 1.21 sources, 1.10, 1.11 Message-ID: <200702140858.l1E8w1Q5030088@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/NetworkManager-vpnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30065 Modified Files: .cvsignore NetworkManager-vpnc.spec sources Log Message: Downgrading to 1:0.6.4 to keep par with core NM version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 2 Oct 2006 23:13:54 -0000 1.9 +++ .cvsignore 14 Feb 2007 08:57:28 -0000 1.10 @@ -1 +1,5 @@ -NetworkManager-vpnc-0.7.0.cvs20060929.tar.gz +NetworkManager-vpnc-0.2.tar.gz +NetworkManager-vpnc-0.3.tar.gz +NetworkManager-vpnc-0.5.0.tar.gz +NetworkManager-vpnc-0.6.0.tar.gz +NetworkManager-vpnc-0.6.4.tar.gz Index: NetworkManager-vpnc.spec =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- NetworkManager-vpnc.spec 4 Dec 2006 22:30:35 -0000 1.20 +++ NetworkManager-vpnc.spec 14 Feb 2007 08:57:28 -0000 1.21 @@ -4,20 +4,15 @@ %define vpnc_version 0.3.3-3 %define shared_mime_version 0.16-3 -%define cvs_snapshot 1 - -%if %{cvs_snapshot} -%define nm_vpnc_cvs_version .cvs20061204 -%endif - Summary: NetworkManager VPN integration for vpnc Name: NetworkManager-vpnc -Version: 0.7.0 -Release: 0%{?nm_vpnc_cvs_version}%{?dist} +Epoch: 1 +Version: 0.6.4 +Release: 1%{?dist} License: GPL Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ -Source: %{name}-%{version}%{?nm_vpnc_cvs_version}.tar.gz +Source: %{name}-%{version}.tar.gz Patch0: NetworkManager-vpnc-0.7.0-gppasswd.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -100,6 +95,9 @@ %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png %changelog +* Wed Feb 14 2007 Denis Leroy - 1:0.6.4-1 +- Downgrading to 1:0.6.4 to keep par with core NM version + * Mon Dec 4 2006 Dan Williams - 0.7.0-0.cvs20061204 - Allow "NAT-Keepalive packet interval" config option Index: sources =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 4 Dec 2006 22:30:35 -0000 1.10 +++ sources 14 Feb 2007 08:57:28 -0000 1.11 @@ -1 +1 @@ -c42691dc47448e5b5310566bfc33d807 NetworkManager-vpnc-0.7.0.cvs20061204.tar.gz +ae2d37c75bfef1752f9a4fb944d0a7e5 NetworkManager-vpnc-0.6.4.tar.gz From fedora-extras-commits at redhat.com Wed Feb 14 09:03:00 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 14 Feb 2007 04:03:00 -0500 Subject: rpms/hunspell-af import.log,1.1,1.2 Message-ID: <200702140903.l1E930A5001258@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-af In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1216 Modified Files: import.log Log Message: auto-import hunspell-af-0.20060117-1 on branch devel from hunspell-af-0.20060117-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/hunspell-af/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Feb 2007 18:39:50 -0000 1.1 +++ import.log 14 Feb 2007 09:02:27 -0000 1.2 @@ -0,0 +1 @@ +hunspell-af-0_20060117-1:HEAD:hunspell-af-0.20060117-1.src.rpm:1171443835 From fedora-extras-commits at redhat.com Wed Feb 14 09:03:02 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 14 Feb 2007 04:03:02 -0500 Subject: rpms/hunspell-af/devel hunspell-af.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702140903.l1E932mU001262@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-af/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1216/devel Modified Files: .cvsignore sources Added Files: hunspell-af.spec Log Message: auto-import hunspell-af-0.20060117-1 on branch devel from hunspell-af-0.20060117-1.src.rpm --- NEW FILE hunspell-af.spec --- Name: hunspell-af Summary: Afrikaans hunspell dictionary %define upstreamid 20060117 Version: 0.%{upstreamid} Release: 1%{?dist} Source: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/af_ZA-pack.zip Group: Applications/Text URL: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: LGPL BuildArch: noarch Requires: hunspell %description Afrikaans hunspell dictionary %prep %setup -q -c -n hunspell-af_ZA unzip myspell-af_ZA-%{upstreamid}.zip %build %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell pushd $RPM_BUILD_ROOT/%{_datadir}/myspell/ af_ZA_aliases="af_NA" for lang in $af_ZA_aliases; do ln -s af_ZA.aff $lang.aff ln -s af_ZA.dic $lang.dic done popd %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README_af_ZA.txt %{_datadir}/myspell/* %changelog * Wed Oct 25 2006 Caolan McNamara - 0.20060117-1 - initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hunspell-af/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Feb 2007 18:39:57 -0000 1.1 +++ .cvsignore 14 Feb 2007 09:02:30 -0000 1.2 @@ -0,0 +1 @@ +af_ZA-pack.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/hunspell-af/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Feb 2007 18:39:57 -0000 1.1 +++ sources 14 Feb 2007 09:02:30 -0000 1.2 @@ -0,0 +1 @@ +381415236fb0a4b703bf3c04f0f1e1d3 af_ZA-pack.zip From fedora-extras-commits at redhat.com Wed Feb 14 09:19:29 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 14 Feb 2007 04:19:29 -0500 Subject: rpms/hunspell-bg/devel hunspell-bg.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702140919.l1E9JTTX001852@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-bg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1812/devel Modified Files: .cvsignore sources Added Files: hunspell-bg.spec Log Message: auto-import hunspell-bg-0.20040405-1 on branch devel from hunspell-bg-0.20040405-1.src.rpm --- NEW FILE hunspell-bg.spec --- Name: hunspell-bg Summary: Bulgarian hunspell dictionaries %define upstreamid 20040405 Version: 0.%{upstreamid} Release: 1%{?dist} Source: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/bg_BG.zip Group: Applications/Text URL: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: GPL BuildArch: noarch Requires: hunspell %description Bulgarian hunspell dictionaries. %prep %setup -q -c -n hunspell-bg %build tr -d '\r' < README_bg_BG.txt > README_bg_BG.txt.new iconv -f ISO-8859-2 -t UTF-8 README_bg_BG.txt.new > README_bg_BG.txt %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README_bg_BG.txt %{_datadir}/myspell/* %changelog * Mon Feb 12 2006 Caolan McNamara - 0.20040405-1 - initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hunspell-bg/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Feb 2007 18:42:43 -0000 1.1 +++ .cvsignore 14 Feb 2007 09:18:56 -0000 1.2 @@ -0,0 +1 @@ +bg_BG.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/hunspell-bg/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Feb 2007 18:42:43 -0000 1.1 +++ sources 14 Feb 2007 09:18:56 -0000 1.2 @@ -0,0 +1 @@ +0619620e36b1a9a45995f939d765fd3e bg_BG.zip From fedora-extras-commits at redhat.com Wed Feb 14 09:19:26 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 14 Feb 2007 04:19:26 -0500 Subject: rpms/hunspell-bg import.log,1.1,1.2 Message-ID: <200702140919.l1E9JQQt001848@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-bg In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1812 Modified Files: import.log Log Message: auto-import hunspell-bg-0.20040405-1 on branch devel from hunspell-bg-0.20040405-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/hunspell-bg/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Feb 2007 18:42:40 -0000 1.1 +++ import.log 14 Feb 2007 09:18:54 -0000 1.2 @@ -0,0 +1 @@ +hunspell-bg-0_20040405-1:HEAD:hunspell-bg-0.20040405-1.src.rpm:1171444822 From fedora-extras-commits at redhat.com Wed Feb 14 09:30:57 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 14 Feb 2007 04:30:57 -0500 Subject: rpms/hunspell-ca/devel hunspell-ca.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702140930.l1E9Uvt1002084@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-ca/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2034/devel Modified Files: .cvsignore sources Added Files: hunspell-ca.spec Log Message: auto-import hunspell-ca-0.20021015-1 on branch devel from hunspell-ca-0.20021015-1.src.rpm --- NEW FILE hunspell-ca.spec --- Name: hunspell-ca Summary: Catalan hunspell dictionaries %define upstreamid 20021015 Version: 0.%{upstreamid} Release: 1%{?dist} Source: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/ca_ES.zip Group: Applications/Text URL: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: GPL BuildArch: noarch Requires: hunspell %description Catalan hunspell dictionaries. %prep %setup -q -c -n hunspell-ca %build chmod -x * %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc README_ca_ES.txt %{_datadir}/myspell/* %changelog * Thu Dec 07 2006 Caolan McNamara - 0.20021015-1 - initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hunspell-ca/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Feb 2007 18:41:22 -0000 1.1 +++ .cvsignore 14 Feb 2007 09:30:25 -0000 1.2 @@ -0,0 +1 @@ +ca_ES.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/hunspell-ca/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Feb 2007 18:41:22 -0000 1.1 +++ sources 14 Feb 2007 09:30:25 -0000 1.2 @@ -0,0 +1 @@ +6cea81b3e1101fb277062e7eef4ff720 ca_ES.zip From fedora-extras-commits at redhat.com Wed Feb 14 09:30:55 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 14 Feb 2007 04:30:55 -0500 Subject: rpms/hunspell-ca import.log,1.1,1.2 Message-ID: <200702140930.l1E9Ut88002078@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-ca In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2034 Modified Files: import.log Log Message: auto-import hunspell-ca-0.20021015-1 on branch devel from hunspell-ca-0.20021015-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/hunspell-ca/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Feb 2007 18:41:14 -0000 1.1 +++ import.log 14 Feb 2007 09:30:23 -0000 1.2 @@ -0,0 +1 @@ +hunspell-ca-0_20021015-1:HEAD:hunspell-ca-0.20021015-1.src.rpm:1171445510 From fedora-extras-commits at redhat.com Wed Feb 14 09:35:07 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 14 Feb 2007 04:35:07 -0500 Subject: rpms/hunspell-cy import.log,1.1,1.2 Message-ID: <200702140935.l1E9Z76E002301@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-cy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2257 Modified Files: import.log Log Message: auto-import hunspell-cy-0.20040425-1 on branch devel from hunspell-cy-0.20040425-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/hunspell-cy/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Feb 2007 18:44:05 -0000 1.1 +++ import.log 14 Feb 2007 09:34:35 -0000 1.2 @@ -0,0 +1 @@ +hunspell-cy-0_20040425-1:HEAD:hunspell-cy-0.20040425-1.src.rpm:1171445762 From fedora-extras-commits at redhat.com Wed Feb 14 09:35:09 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 14 Feb 2007 04:35:09 -0500 Subject: rpms/hunspell-cy/devel hunspell-cy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702140935.l1E9Z9iG002305@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-cy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2257/devel Modified Files: .cvsignore sources Added Files: hunspell-cy.spec Log Message: auto-import hunspell-cy-0.20040425-1 on branch devel from hunspell-cy-0.20040425-1.src.rpm --- NEW FILE hunspell-cy.spec --- Name: hunspell-cy Summary: Welsh hunspell dictionaries %define upstreamid 20040425 Version: 0.%{upstreamid} Release: 1%{?dist} Source: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/cy_GB.zip Group: Applications/Text URL: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: GPL BuildArch: noarch Requires: hunspell %description Welsh hunspell dictionaries. %prep %setup -q -c -n hunspell-cy %build chmod -x * tr -d '\r' < README_cy_GB.txt > README_cy_GB.txt.new mv -f README_cy_GB.txt.new README_cy_GB.txt %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README_cy_GB.txt %{_datadir}/myspell/* %changelog * Thu Dec 07 2006 Caolan McNamara - 0.20040425-1 - initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hunspell-cy/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Feb 2007 18:44:12 -0000 1.1 +++ .cvsignore 14 Feb 2007 09:34:37 -0000 1.2 @@ -0,0 +1 @@ +cy_GB.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/hunspell-cy/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Feb 2007 18:44:12 -0000 1.1 +++ sources 14 Feb 2007 09:34:37 -0000 1.2 @@ -0,0 +1 @@ +accdb94f38555af45a54494e046a88f3 cy_GB.zip From fedora-extras-commits at redhat.com Wed Feb 14 09:37:32 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 14 Feb 2007 04:37:32 -0500 Subject: rpms/hunspell-da import.log,1.1,1.2 Message-ID: <200702140937.l1E9bWii002460@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-da In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2420 Modified Files: import.log Log Message: auto-import hunspell-da-0.20070106-1 on branch devel from hunspell-da-0.20070106-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/hunspell-da/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Feb 2007 18:45:27 -0000 1.1 +++ import.log 14 Feb 2007 09:37:00 -0000 1.2 @@ -0,0 +1 @@ +hunspell-da-0_20070106-1:HEAD:hunspell-da-0.20070106-1.src.rpm:1171445907 From fedora-extras-commits at redhat.com Wed Feb 14 09:37:35 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 14 Feb 2007 04:37:35 -0500 Subject: rpms/hunspell-da/devel hunspell-da.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702140937.l1E9bZid002464@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-da/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2420/devel Modified Files: .cvsignore sources Added Files: hunspell-da.spec Log Message: auto-import hunspell-da-0.20070106-1 on branch devel from hunspell-da-0.20070106-1.src.rpm --- NEW FILE hunspell-da.spec --- Name: hunspell-da Summary: Danish hunspell dictionaries %define upstreamid 20070106 Version: 0.%{upstreamid} Release: 1%{?dist} Source: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/da_DK.zip Group: Applications/Text URL: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: GPL BuildArch: noarch Requires: hunspell %description Danish hunspell dictionaries. %prep %setup -q -c -n hunspell-da %build chmod -x * %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README_da_DK.txt %{_datadir}/myspell/* %changelog * Thu Feb 13 2007 Caolan McNamara - 0.20070106-1 - new upstream dictionaries * Thu Dec 07 2006 Caolan McNamara - 0.20050330-1 - initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hunspell-da/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Feb 2007 18:45:35 -0000 1.1 +++ .cvsignore 14 Feb 2007 09:37:02 -0000 1.2 @@ -0,0 +1 @@ +da_DK.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/hunspell-da/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Feb 2007 18:45:35 -0000 1.1 +++ sources 14 Feb 2007 09:37:02 -0000 1.2 @@ -0,0 +1 @@ +fa9f4c50a585b4bb38e379b5a377f9f7 da_DK.zip From fedora-extras-commits at redhat.com Wed Feb 14 09:46:24 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 14 Feb 2007 04:46:24 -0500 Subject: rpms/catfish/devel .cvsignore, 1.4, 1.5 catfish.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200702140946.l1E9kOTX002667@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/catfish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2608 Modified Files: .cvsignore catfish.spec sources Log Message: Well, I am sorry for numbering version... Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/catfish/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 31 Jan 2007 18:05:58 -0000 1.4 +++ .cvsignore 14 Feb 2007 09:45:52 -0000 1.5 @@ -1 +1 @@ -catfish-0.2d.tar.gz +catfish-0.2.tar.gz Index: catfish.spec =================================================================== RCS file: /cvs/extras/rpms/catfish/devel/catfish.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- catfish.spec 31 Jan 2007 18:05:58 -0000 1.4 +++ catfish.spec 14 Feb 2007 09:45:52 -0000 1.5 @@ -1,12 +1,14 @@ +%define _version 0.2 + Name: catfish -Version: 0.2d +Version: 0.2stable Release: 1%{?dist} Summary: A handy file search tool Group: Applications/File License: GPL -URL: http://software.twotoasts.de/?page=search4files -Source0: http://software.twotoasts.de/media/%{name}/%{name}-%{version}.tar.gz +URL: http://software.twotoasts.de/?page=%{name} +Source0: http://software.twotoasts.de/media/%{name}/%{name}-%{_version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -34,12 +36,10 @@ configuration options from the command line. %prep -%setup -q +%setup -q -n %{name}-%{_version} %build # Some configulation change -# Important note: Upstream removed DESTDIR option, however -# this Makefile.in won't work without DESTDIR!! %{__sed} -i.misc \ -e 's|666|644|' \ -e '/svg/s|install|install -m 644|' \ @@ -47,9 +47,7 @@ -e 's|\([^ \t][^ \t]*\).glade|-m 644 \1.glade|' \ -e 's|pyc|py|' \ -e 's|^\([ \t]*\)ln |\1: ln |' \ - -e '/install/s|\$(PREFIX)|$(DESTDIR)$(PREFIX)|' \ - -e '/cp/s|\$(PREFIX)|$(DESTDIR)$(PREFIX)|' \ - -e 's|cp -rf|cp -prc|' \ + -e 's|cp -rf|cp -prf|' \ Makefile.in %{__sed} -i.byte \ @@ -88,6 +86,8 @@ # and.. manually link.. %{__ln_s} -f ../pixmaps/%{name}.svg \ $RPM_BUILD_ROOT%{_datadir}/%{name}/ +%{__ln_s} -f ../locale/ \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{__mv} -f $RPM_BUILD_ROOT%{_prefix}/locale $RPM_BUILD_ROOT%{_datadir} %{find_lang} %{name} @@ -105,6 +105,9 @@ %{_datadir}/pixmaps/%{name}.svg %changelog +* Wed Feb 14 2007 Mamoru Tasaka 0.2stable-1 +- 0.2 + * Wed Jan 30 2007 Mamoru Tasaka 0.2d-1 - 0.2d Index: sources =================================================================== RCS file: /cvs/extras/rpms/catfish/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 31 Jan 2007 18:05:58 -0000 1.4 +++ sources 14 Feb 2007 09:45:52 -0000 1.5 @@ -1 +1 @@ -9f185d956402f35940fe07ed1f1eec01 catfish-0.2d.tar.gz +848d61da8dcfd32dd1c5d2add6c10cd8 catfish-0.2.tar.gz From fedora-extras-commits at redhat.com Wed Feb 14 09:46:52 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 14 Feb 2007 04:46:52 -0500 Subject: rpms/hunspell-de import.log,1.1,1.2 Message-ID: <200702140946.l1E9kqoU002684@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-de In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2642 Modified Files: import.log Log Message: auto-import hunspell-de-0.20051213-1 on branch devel from hunspell-de-0.20051213-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/hunspell-de/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Feb 2007 18:46:54 -0000 1.1 +++ import.log 14 Feb 2007 09:46:20 -0000 1.2 @@ -0,0 +1 @@ +hunspell-de-0_20051213-1:HEAD:hunspell-de-0.20051213-1.src.rpm:1171446468 From fedora-extras-commits at redhat.com Wed Feb 14 09:46:55 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 14 Feb 2007 04:46:55 -0500 Subject: rpms/hunspell-de/devel hunspell-de.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702140946.l1E9ktD3002688@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-de/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2642/devel Modified Files: .cvsignore sources Added Files: hunspell-de.spec Log Message: auto-import hunspell-de-0.20051213-1 on branch devel from hunspell-de-0.20051213-1.src.rpm --- NEW FILE hunspell-de.spec --- Name: hunspell-de Summary: German hunspell dictionaries %define upstreamid 20051213 Version: 0.%{upstreamid} Release: 1%{?dist} Source0: http://j3e.de/hunspell/de_DE-%{upstreamid}.zip Source1: http://j3e.de/hunspell/de_CH-%{upstreamid}.zip Group: Applications/Text URL: http://j3e.de/hunspell/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: GPL BuildArch: noarch Requires: hunspell %description German (Germany, Switzerland, etc.) hunspell dictionaries. %prep %setup -q -c -n hunspell-de unzip -q -o %{SOURCE1} %build tr -d '\r' < README_de_DE.txt > README_de_DE.txt.new tr -d '\r' < README_de_CH.txt > README_de_CH.txt.new mv -f README_de_DE.txt.new README_de_DE.txt mv -f README_de_CH.txt.new README_de_CH.txt %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell chmod -x * cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell pushd $RPM_BUILD_ROOT/%{_datadir}/myspell/ de_DE_aliases="de_BE de_LU" for lang in $de_DE_aliases; do ln -s de_DE.aff $lang.aff ln -s de_DE.dic $lang.dic done de_CH_aliases="de_LI" for lang in $de_CH_aliases; do ln -s de_CH.aff $lang.aff ln -s de_CH.dic $lang.dic done popd %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README_de_DE.txt README_de_CH.txt COPYING_OASIS COPYING %{_datadir}/myspell/* %changelog * Thu Dec 07 2006 Caolan McNamara - 0.20051213-1 - initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hunspell-de/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Feb 2007 18:47:02 -0000 1.1 +++ .cvsignore 14 Feb 2007 09:46:22 -0000 1.2 @@ -0,0 +1,2 @@ +de_CH-20051213.zip +de_DE-20051213.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/hunspell-de/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Feb 2007 18:47:02 -0000 1.1 +++ sources 14 Feb 2007 09:46:22 -0000 1.2 @@ -0,0 +1,2 @@ +4e0fbf25d39993d708ff1c250cda47e8 de_CH-20051213.zip +b6256f5abb2c5347b7fb15516902da04 de_DE-20051213.zip From fedora-extras-commits at redhat.com Wed Feb 14 09:48:36 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 14 Feb 2007 04:48:36 -0500 Subject: rpms/catfish/FC-6 .cvsignore, 1.4, 1.5 catfish.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200702140948.l1E9madw002851@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/catfish/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2816 Modified Files: .cvsignore catfish.spec sources Log Message: * Wed Feb 14 2007 Mamoru Tasaka 0.2stable-1 - 0.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/catfish/FC-6/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 31 Jan 2007 18:06:38 -0000 1.4 +++ .cvsignore 14 Feb 2007 09:48:03 -0000 1.5 @@ -1 +1 @@ -catfish-0.2d.tar.gz +catfish-0.2.tar.gz Index: catfish.spec =================================================================== RCS file: /cvs/extras/rpms/catfish/FC-6/catfish.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- catfish.spec 31 Jan 2007 18:06:38 -0000 1.4 +++ catfish.spec 14 Feb 2007 09:48:03 -0000 1.5 @@ -1,12 +1,14 @@ +%define _version 0.2 + Name: catfish -Version: 0.2d +Version: 0.2stable Release: 1%{?dist} Summary: A handy file search tool Group: Applications/File License: GPL -URL: http://software.twotoasts.de/?page=search4files -Source0: http://software.twotoasts.de/media/%{name}/%{name}-%{version}.tar.gz +URL: http://software.twotoasts.de/?page=%{name} +Source0: http://software.twotoasts.de/media/%{name}/%{name}-%{_version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -34,12 +36,10 @@ configuration options from the command line. %prep -%setup -q +%setup -q -n %{name}-%{_version} %build # Some configulation change -# Important note: Upstream removed DESTDIR option, however -# this Makefile.in won't work without DESTDIR!! %{__sed} -i.misc \ -e 's|666|644|' \ -e '/svg/s|install|install -m 644|' \ @@ -47,9 +47,7 @@ -e 's|\([^ \t][^ \t]*\).glade|-m 644 \1.glade|' \ -e 's|pyc|py|' \ -e 's|^\([ \t]*\)ln |\1: ln |' \ - -e '/install/s|\$(PREFIX)|$(DESTDIR)$(PREFIX)|' \ - -e '/cp/s|\$(PREFIX)|$(DESTDIR)$(PREFIX)|' \ - -e 's|cp -rf|cp -prc|' \ + -e 's|cp -rf|cp -prf|' \ Makefile.in %{__sed} -i.byte \ @@ -88,6 +86,8 @@ # and.. manually link.. %{__ln_s} -f ../pixmaps/%{name}.svg \ $RPM_BUILD_ROOT%{_datadir}/%{name}/ +%{__ln_s} -f ../locale/ \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{__mv} -f $RPM_BUILD_ROOT%{_prefix}/locale $RPM_BUILD_ROOT%{_datadir} %{find_lang} %{name} @@ -105,6 +105,9 @@ %{_datadir}/pixmaps/%{name}.svg %changelog +* Wed Feb 14 2007 Mamoru Tasaka 0.2stable-1 +- 0.2 + * Wed Jan 30 2007 Mamoru Tasaka 0.2d-1 - 0.2d Index: sources =================================================================== RCS file: /cvs/extras/rpms/catfish/FC-6/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 31 Jan 2007 18:06:38 -0000 1.4 +++ sources 14 Feb 2007 09:48:03 -0000 1.5 @@ -1 +1 @@ -9f185d956402f35940fe07ed1f1eec01 catfish-0.2d.tar.gz +848d61da8dcfd32dd1c5d2add6c10cd8 catfish-0.2.tar.gz From fedora-extras-commits at redhat.com Wed Feb 14 09:49:30 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 14 Feb 2007 04:49:30 -0500 Subject: rpms/catfish/FC-5 .cvsignore, 1.4, 1.5 catfish.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200702140949.l1E9nUrg002920@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/catfish/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2894 Modified Files: .cvsignore catfish.spec sources Log Message: * Wed Feb 14 2007 Mamoru Tasaka 0.2stable-1 - 0.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/catfish/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 31 Jan 2007 18:06:57 -0000 1.4 +++ .cvsignore 14 Feb 2007 09:48:57 -0000 1.5 @@ -1 +1 @@ -catfish-0.2d.tar.gz +catfish-0.2.tar.gz Index: catfish.spec =================================================================== RCS file: /cvs/extras/rpms/catfish/FC-5/catfish.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- catfish.spec 31 Jan 2007 18:06:57 -0000 1.4 +++ catfish.spec 14 Feb 2007 09:48:57 -0000 1.5 @@ -1,12 +1,14 @@ +%define _version 0.2 + Name: catfish -Version: 0.2d +Version: 0.2stable Release: 1%{?dist} Summary: A handy file search tool Group: Applications/File License: GPL -URL: http://software.twotoasts.de/?page=search4files -Source0: http://software.twotoasts.de/media/%{name}/%{name}-%{version}.tar.gz +URL: http://software.twotoasts.de/?page=%{name} +Source0: http://software.twotoasts.de/media/%{name}/%{name}-%{_version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -34,12 +36,10 @@ configuration options from the command line. %prep -%setup -q +%setup -q -n %{name}-%{_version} %build # Some configulation change -# Important note: Upstream removed DESTDIR option, however -# this Makefile.in won't work without DESTDIR!! %{__sed} -i.misc \ -e 's|666|644|' \ -e '/svg/s|install|install -m 644|' \ @@ -47,9 +47,7 @@ -e 's|\([^ \t][^ \t]*\).glade|-m 644 \1.glade|' \ -e 's|pyc|py|' \ -e 's|^\([ \t]*\)ln |\1: ln |' \ - -e '/install/s|\$(PREFIX)|$(DESTDIR)$(PREFIX)|' \ - -e '/cp/s|\$(PREFIX)|$(DESTDIR)$(PREFIX)|' \ - -e 's|cp -rf|cp -prc|' \ + -e 's|cp -rf|cp -prf|' \ Makefile.in %{__sed} -i.byte \ @@ -88,6 +86,8 @@ # and.. manually link.. %{__ln_s} -f ../pixmaps/%{name}.svg \ $RPM_BUILD_ROOT%{_datadir}/%{name}/ +%{__ln_s} -f ../locale/ \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{__mv} -f $RPM_BUILD_ROOT%{_prefix}/locale $RPM_BUILD_ROOT%{_datadir} %{find_lang} %{name} @@ -105,6 +105,9 @@ %{_datadir}/pixmaps/%{name}.svg %changelog +* Wed Feb 14 2007 Mamoru Tasaka 0.2stable-1 +- 0.2 + * Wed Jan 30 2007 Mamoru Tasaka 0.2d-1 - 0.2d Index: sources =================================================================== RCS file: /cvs/extras/rpms/catfish/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 31 Jan 2007 18:06:57 -0000 1.4 +++ sources 14 Feb 2007 09:48:57 -0000 1.5 @@ -1 +1 @@ -9f185d956402f35940fe07ed1f1eec01 catfish-0.2d.tar.gz +848d61da8dcfd32dd1c5d2add6c10cd8 catfish-0.2.tar.gz From fedora-extras-commits at redhat.com Wed Feb 14 09:53:07 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 14 Feb 2007 04:53:07 -0500 Subject: rpms/hunspell-ee/devel et_EE.aff, NONE, 1.1 et_EE.dic, NONE, 1.1 hunspell-ee.spec, NONE, 1.1 Message-ID: <200702140953.l1E9r76f003065@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-ee/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3024/devel Added Files: et_EE.aff et_EE.dic hunspell-ee.spec Log Message: auto-import hunspell-ee-0.20030602-1 on branch devel from hunspell-ee-0.20030602-1.src.rpm --- NEW FILE et_EE.aff --- SET ISO8859-1 TRY aeistlunkodmrvpgjh??b?o?fcwzx?q? COMPOUNDFLAG Z COMPOUNDMIN 2 # rule/flag 1 (affects 97897 words, has 52 subrules): SFX a Y 52 SFX a 0 b u SFX a 0 bki u SFX a 0 dki u SFX a 0 gi [aelmnr] SFX a 0 ki [dst] SFX a 0 ksid u SFX a 0 ksidki u SFX a 0 ksime u SFX a 0 ksimegi u SFX a 0 ksin u SFX a 0 ksingi u SFX a 0 ksite u SFX a 0 ksitegi u SFX a 0 kski u SFX a 0 ku k SFX a 0 kugi k SFX a 0 kusid k SFX a 0 kusidki k SFX a 0 me u SFX a 0 megi u SFX a 0 n u SFX a 0 ngi u SFX a 0 ta i SFX a 0 tagi i SFX a 0 tagu i SFX a 0 tagugi i SFX a 0 taks i SFX a 0 takse i SFX a 0 taksegi i SFX a 0 takski i SFX a 0 tama i SFX a 0 tamagi i SFX a 0 tav i SFX a 0 tavgi i SFX a 0 tavus i SFX a 0 tavuski i SFX a 0 tavusse i SFX a 0 tavussegi i SFX a 0 tavust i SFX a 0 tavustki i SFX a 0 te u SFX a 0 tegi u SFX a 0 ti i SFX a 0 tigi i SFX a 0 us v SFX a 0 uski v SFX a 0 usse v SFX a 0 ussegi v SFX a 0 ust v SFX a 0 ustki v SFX a 0 vad u SFX a 0 vadki u # rule/flag 32 (affects 28043 words, has 921 subrules): SFX b Y 921 SFX b ga d aga SFX b ga dki ega SFX b ga t [iu]ga SFX b ga tki uga SFX b nud b enud SFX b nud bki enud SFX b nud d enud SFX b nud dagu inud SFX b nud dagugi inud SFX b nud daks inud SFX b nud dakski inud SFX b nud dama inud SFX b nud damagi inud SFX b nud damatu inud SFX b nud damatud inud SFX b nud damatudki inud SFX b nud damatuga inud SFX b nud damatugagi inud SFX b nud damatugi inud SFX b nud damatuid inud SFX b nud damatuidki inud SFX b nud damatuiga inud SFX b nud damatuigagi inud SFX b nud damatuiks inud SFX b nud damatuikski inud SFX b nud damatuil inud SFX b nud damatuile inud SFX b nud damatuilegi inud SFX b nud damatuilgi inud SFX b nud damatuilt inud SFX b nud damatuiltki inud SFX b nud damatuina inud SFX b nud damatuinagi inud SFX b nud damatuini inud SFX b nud damatuinigi inud SFX b nud damatuis inud SFX b nud damatuiski inud SFX b nud damatuisse inud SFX b nud damatuissegi inud SFX b nud damatuist inud SFX b nud damatuistki inud SFX b nud damatuita inud SFX b nud damatuitagi inud SFX b nud damatuks inud SFX b nud damatukski inud SFX b nud damatul inud SFX b nud damatule inud SFX b nud damatulegi inud SFX b nud damatulgi inud SFX b nud damatult inud SFX b nud damatultki inud SFX b nud damatuna inud SFX b nud damatunagi inud SFX b nud damatuni inud SFX b nud damatunigi inud SFX b nud damatus inud SFX b nud damatuski inud SFX b nud damatusse inud SFX b nud damatussegi inud SFX b nud damatust inud SFX b nud damatustki inud SFX b nud damatut inud SFX b nud damatuta inud SFX b nud damatutagi inud SFX b nud damatute inud SFX b nud damatutega inud SFX b nud damatutegagi inud SFX b nud damatutegi inud SFX b nud damatuteks inud SFX b nud damatutekski inud SFX b nud damatutel inud SFX b nud damatutele inud SFX b nud damatutelegi inud SFX b nud damatutelgi inud SFX b nud damatutelt inud SFX b nud damatuteltki inud SFX b nud damatutena inud SFX b nud damatutenagi inud SFX b nud damatuteni inud SFX b nud damatutenigi inud SFX b nud damatutes inud SFX b nud damatuteski inud SFX b nud damatutesse inud SFX b nud damatutessegi inud SFX b nud damatutest inud SFX b nud damatutestki inud SFX b nud damatuteta inud SFX b nud damatutetagi inud SFX b nud damatutki inud SFX b nud dav inud SFX b nud dava inud SFX b nud davad inud SFX b nud davadki inud SFX b nud davaga inud SFX b nud davagagi inud SFX b nud davagi inud SFX b nud davaid inud SFX b nud davaidki inud SFX b nud davaiga inud SFX b nud davaigagi inud SFX b nud davaiks inud SFX b nud davaikski inud SFX b nud davail inud SFX b nud davaile inud SFX b nud davailegi inud SFX b nud davailgi inud SFX b nud davailt inud SFX b nud davailtki inud SFX b nud davaina inud SFX b nud davainagi inud SFX b nud davaini inud SFX b nud davainigi inud SFX b nud davais inud SFX b nud davaiski inud SFX b nud davaisse inud SFX b nud davaissegi inud SFX b nud davaist inud SFX b nud davaistki inud SFX b nud davaita inud SFX b nud davaitagi inud SFX b nud davaks inud SFX b nud davakski inud SFX b nud daval inud SFX b nud davale inud SFX b nud davalegi inud SFX b nud davalgi inud SFX b nud davalt inud SFX b nud davaltki inud SFX b nud davana inud SFX b nud davanagi inud SFX b nud davani inud SFX b nud davanigi inud SFX b nud davas inud SFX b nud davaski inud SFX b nud davasse inud SFX b nud davassegi inud SFX b nud davast inud SFX b nud davastki inud [...8931 lines suppressed...] SFX x janud gavuselgi [lr]janud SFX x janud gavuselt [lr]janud SFX x janud gavuseltki [lr]janud SFX x janud gavusena [lr]janud SFX x janud gavusenagi [lr]janud SFX x janud gavuseni [lr]janud SFX x janud gavusenigi [lr]janud SFX x janud gavuses [lr]janud SFX x janud gavuseski [lr]janud SFX x janud gavusesse [lr]janud SFX x janud gavusessegi [lr]janud SFX x janud gavusest [lr]janud SFX x janud gavusestki [lr]janud SFX x janud gavuseta [lr]janud SFX x janud gavusetagi [lr]janud SFX x janud gavusi [lr]janud SFX x janud gavusiga [lr]janud SFX x janud gavusigagi [lr]janud SFX x janud gavusigi [lr]janud SFX x janud gavusiks [lr]janud SFX x janud gavusikski [lr]janud SFX x janud gavusil [lr]janud SFX x janud gavusile [lr]janud SFX x janud gavusilegi [lr]janud SFX x janud gavusilgi [lr]janud SFX x janud gavusilt [lr]janud SFX x janud gavusiltki [lr]janud SFX x janud gavusina [lr]janud SFX x janud gavusinagi [lr]janud SFX x janud gavusini [lr]janud SFX x janud gavusinigi [lr]janud SFX x janud gavusis [lr]janud SFX x janud gavusiski [lr]janud SFX x janud gavusisse [lr]janud SFX x janud gavusissegi [lr]janud SFX x janud gavusist [lr]janud SFX x janud gavusistki [lr]janud SFX x janud gavusita [lr]janud SFX x janud gavusitagi [lr]janud SFX x janud gavuski [lr]janud SFX x janud gavusse [lr]janud SFX x janud gavussegi [lr]janud SFX x janud gavust [lr]janud SFX x janud gavuste [lr]janud SFX x janud gavustega [lr]janud SFX x janud gavustegagi [lr]janud SFX x janud gavustegi [lr]janud SFX x janud gavusteks [lr]janud SFX x janud gavustekski [lr]janud SFX x janud gavustel [lr]janud SFX x janud gavustele [lr]janud SFX x janud gavustelegi [lr]janud SFX x janud gavustelgi [lr]janud SFX x janud gavustelt [lr]janud SFX x janud gavusteltki [lr]janud SFX x janud gavustena [lr]janud SFX x janud gavustenagi [lr]janud SFX x janud gavusteni [lr]janud SFX x janud gavustenigi [lr]janud SFX x janud gavustes [lr]janud SFX x janud gavusteski [lr]janud SFX x janud gavustesse [lr]janud SFX x janud gavustessegi [lr]janud SFX x janud gavustest [lr]janud SFX x janud gavustestki [lr]janud SFX x janud gavusteta [lr]janud SFX x janud gavustetagi [lr]janud SFX x janud gavustki [lr]janud # rule/flag 13841 (affects 72744 words, has 25 subrules): SFX y Y 25 SFX y a eta da SFX y a etagi da SFX y a etagu da SFX y a etagugi da SFX y a etaks da SFX y a etakse da SFX y a etaksegi da SFX y a etakski da SFX y a etama da SFX y a etamagi da SFX y a etav da SFX y a etavgi da SFX y a etavus da SFX y a etavuski da SFX y a etavusse da SFX y a etavussegi da SFX y a etavust da SFX y a etavustki da SFX y a eti da SFX y a etigi da SFX y a i ga SFX y d ksidki ud SFX y d ksimegi ud SFX y d ksingi ud SFX y d ksitegi ud # rule/flag 13866 (affects 6969 words, has 101 subrules): SFX z Y 101 SFX z a use ga SFX z a used ga SFX z a usedki ga SFX z a usega ga SFX z a usegagi ga SFX z a usegi ga SFX z a useid ga SFX z a useidki ga SFX z a useiga ga SFX z a useigagi ga SFX z a useiks ga SFX z a useikski ga SFX z a useil ga SFX z a useile ga SFX z a useilegi ga SFX z a useilgi ga SFX z a useilt ga SFX z a useiltki ga SFX z a useina ga SFX z a useinagi ga SFX z a useini ga SFX z a useinigi ga SFX z a useis ga SFX z a useiski ga SFX z a useisse ga SFX z a useissegi ga SFX z a useist ga SFX z a useistki ga SFX z a useita ga SFX z a useitagi ga SFX z a useks ga SFX z a usekski ga SFX z a usel ga SFX z a usele ga SFX z a uselegi ga SFX z a uselgi ga SFX z a uselt ga SFX z a useltki ga SFX z a usena ga SFX z a usenagi ga SFX z a useni ga SFX z a usenigi ga SFX z a uses ga SFX z a useski ga SFX z a usesse ga SFX z a usessegi ga SFX z a usest ga SFX z a usestki ga SFX z a useta ga SFX z a usetagi ga SFX z a usi ga SFX z a usiga ga SFX z a usigagi ga SFX z a usigi ga SFX z a usiks ga SFX z a usikski ga SFX z a usil ga SFX z a usile ga SFX z a usilegi ga SFX z a usilgi ga SFX z a usilt ga SFX z a usiltki ga SFX z a usina ga SFX z a usinagi ga SFX z a usini ga SFX z a usinigi ga SFX z a usis ga SFX z a usiski ga SFX z a usisse ga SFX z a usissegi ga SFX z a usist ga SFX z a usistki ga SFX z a usita ga SFX z a usitagi ga SFX z a uste ga SFX z a ustega ga SFX z a ustegagi ga SFX z a ustegi ga SFX z a usteks ga SFX z a ustekski ga SFX z a ustel ga SFX z a ustele ga SFX z a ustelegi ga SFX z a ustelgi ga SFX z a ustelt ga SFX z a usteltki ga SFX z a ustena ga SFX z a ustenagi ga SFX z a usteni ga SFX z a ustenigi ga SFX z a ustes ga SFX z a usteski ga SFX z a ustesse ga SFX z a ustessegi ga SFX z a ustest ga SFX z a ustestki ga SFX z a usteta ga SFX z a ustetagi ga SFX z d gi ud SFX z d ta ud SFX z d tagi ud --- NEW FILE et_EE.dic --- 282173 ACPI/Z APM/Z AS/Z ATS/Z Abel/Za Abeleiga/Zacejl Abeli/Z Abeliga/Zabcehijlmoy Ameerika/Z Ameerikaga/Zabcdefgikmnoy Apollonios/Zarsuw Apolloniose/Z Apolloniosega/Zabhilmny Apolloniosi/Z Apolloniosiga/Zajly Apollonioste/Z Apolloniostega/Zalmny Archimedes/Zauw Archimedese/Z Archimedesega/Zabehiklmny Archimedeste/Z Archimedestega/Zalmny B/Z BEF/Z BSA/Z BSD/Z Bayes/Za Bayeseiga/Zacejl Bayesi/Z Bayesiga/Zabcehijlmoy CD/Z CD-ROM/Z CD-RW/Z Cardano/Z Cardanoga/Zaijy Cardanot/Z Cardanotki/Z Cartesius/Zarsuw Cartesiuse/Z Cartesiusega/Zabhilmny Cartesiusi/Z Cartesiusiga/Zajly Cartesiuste/Z Cartesiustega/Zalmny Cauchy/Z Cauchyd/Z Cauchyde/Z Cauchydega/Z Cauchydegagi/Z Cauchydegi/Z Cauchydeks/Z Cauchydekski/Z Cauchydel/Z Cauchydele/Z Cauchydelegi/Z Cauchydelgi/Z Cauchydelt/Z Cauchydeltki/Z Cauchydena/Z Cauchydenagi/Z Cauchydeni/Z Cauchydenigi/Z Cauchydes/Z Cauchydeski/Z Cauchydesse/Z Cauchydessegi/Z Cauchydest/Z Cauchydestki/Z Cauchydeta/Z Cauchydetagi/Z Cauchydki/Z Cauchyga/Zay Cauchyke/Z Cauchykegi/Z Cauchykene/Z Cauchykenegi/Z Cauchykese/Z Cauchykesed/Z Cauchykesedki/Z Cauchykesega/Z Cauchykesegagi/Z Cauchykesegi/Z Cauchykeseks/Z Cauchykesekski/Z Cauchykesel/Z Cauchykesele/Z Cauchykeselegi/Z Cauchykeselgi/Z Cauchykeselt/Z Cauchykeseltki/Z Cauchykesena/Z Cauchykesenagi/Z Cauchykeseni/Z Cauchykesenigi/Z Cauchykeses/Z Cauchykeseski/Z Cauchykesesse/Z Cauchykesessegi/Z Cauchykesest/Z Cauchykesestki/Z Cauchykeseta/Z Cauchykesetagi/Z Cauchykesi/Z Cauchykesiga/Z Cauchykesigagi/Z Cauchykesigi/Z Cauchykesiks/Z Cauchykesikski/Z Cauchykesil/Z Cauchykesile/Z Cauchykesilegi/Z Cauchykesilgi/Z Cauchykesilt/Z Cauchykesiltki/Z Cauchykesina/Z Cauchykesinagi/Z Cauchykesini/Z Cauchykesinigi/Z Cauchykesis/Z Cauchykesiski/Z Cauchykesisse/Z Cauchykesissegi/Z Cauchykesist/Z Cauchykesistki/Z Cauchykesita/Z Cauchykesitagi/Z Cauchykesse/Z Cauchykessegi/Z Cauchykest/Z Cauchykeste/Z Cauchykestega/Z Cauchykestegagi/Z Cauchykestegi/Z Cauchykesteks/Z Cauchykestekski/Z Cauchykestel/Z Cauchykestele/Z Cauchykestelegi/Z Cauchykestelgi/Z Cauchykestelt/Z Cauchykesteltki/Z Cauchykestena/Z Cauchykestenagi/Z Cauchykesteni/Z Cauchykestenigi/Z Cauchykestes/Z Cauchykesteski/Z Cauchykestesse/Z Cauchykestessegi/Z Cauchykestest/Z Cauchykestestki/Z Cauchykesteta/Z Cauchykestetagi/Z Cauchykestki/Z Cauchyks/Z Cauchykski/Z Cauchyl/Z Cauchyle/Z Cauchylegi/Z Cauchylgi/Z Cauchylt/Z Cauchyltki/Z Cauchyna/Z Cauchynagi/Z Cauchyni/Z Cauchynigi/Z Cauchys/Z Cauchysid/Z Cauchysidki/Z Cauchyski/Z Cauchysse/Z Cauchyssegi/Z Cauchyst/Z Cauchystki/Z Cauchyta/Z Cauchytagi/Z Cavalier/Z Cavalierd/Z Cavalierde/Z Cavalierdega/Z Cavalierdegagi/Z Cavalierdegi/Z Cavalierdeks/Z Cavalierdekski/Z Cavalierdel/Z Cavalierdele/Z Cavalierdelegi/Z Cavalierdelgi/Z Cavalierdelt/Z Cavalierdeltki/Z Cavalierdena/Z Cavalierdenagi/Z Cavalierdeni/Z Cavalierdenigi/Z Cavalierdes/Z Cavalierdeski/Z Cavalierdesse/Z Cavalierdessegi/Z [...281775 lines suppressed...] ??rikesuski/Z ??rikesusse/Z ??rikesussegi/Z ??rikesust/Z ??rikesuste/Z ??rikesustega/Zalmny ??rikesustki/Z ??riline/Zaqt ??rilise/Z ??rilisega/Zabhilmny ??rilisi/Z ??rilisiga/Zajly ??riliste/Z ??rilistega/Zalmny ??rin/Z ??rinu/Z ??rinud/Zacdefhijklmnopqrstuvwyz ??rnik/Zauw ??rnike/Z ??rnikega/Zalmny ??rnikkude/Z ??rnikkudega/Zalmny ??rniku/Z ??rnikuga/Zacdegimy ?aboiga/Zacejl ?aboo/Z ?aboode/Z ?aboodegi/Z ?abooga/Zaily ?alusii/Z ?alusiiga/Zacefijkly ?andarmeeria/Z ?andarmeeriaga/Zabcdefgikmnoy ?anr/Za ?anre/Z ?anrega/Zalmny ?anreiga/Zacejl ?anri/Z ?anriga/Zabcefhijklmoy ?anriline/Zaqrt ?anrilise/Z ?anrilisega/Zabdhjlmny ?anrilisi/Z ?anrilisiga/Zajlny ?anriliste/Z ?anrilistega/Zalmny ?anrilisuse/Z ?anrilisusega/Zabehklmny ?anrilisusi/Z ?anrilisusiga/Zajly ?anrilisuste/Z ?anrilisustega/Zalmny ?argoon/Za ?argoone/Z ?argoonega/Zalmny ?argooni/Z ?argooniga/Zacefijkly ?argooniline/Zaqrt ?argoonilise/Z ?argoonilisega/Zabdhjlmny ?argoonilisi/Z ?argoonilisiga/Zajlny ?argooniliste/Z ?argoonilistega/Zalmny ?argoonilisuse/Z ?argoonilisusega/Zabehklmny ?argoonilisusi/Z ?argoonilisusiga/Zajly ?argoonilisuste/Z ?argoonilisustega/Zalmny ?elatiin/Za ?elatiine/Z ?elatiinega/Zalmny ?elatiini/Z ?elatiiniga/Zacefijkly ?elatiinine/Zaqr ?elatiinise/Z ?elatiinisega/Zabdehjklmnoy ?elatiiniste/Z ?elatiinistega/Zalmny ?elatiinisuse/Z ?elatiinisusega/Zabehklmny ?elatiinisusi/Z ?elatiinisusiga/Zajly ?elatiinisuste/Z ?elatiinisustega/Zalmny ?elatiinja/Z ?elatiinjaga/Zabcdefgjklmnoy ?elatiinjasti/Z ?elatiinjastigi/Z ?elatiinjus/Zarsuw ?elatiinjuse/Z ?elatiinjusega/Zabehklmny ?elatiinjusi/Z ?elatiinjusiga/Zajly ?elatiinjuste/Z ?elatiinjustega/Zalmny ?elee/Z ?eleega/Zabghilmny ?eleiga/Zacejl ?en?enn/Za ?en?enne/Z ?en?ennega/Zalmny ?en?enni/Z ?en?enniga/Zacefijkly ?est/Za ?este/Z ?estega/Zalmny ?esti/Z ?estiga/Zacefijkly ?estikulatsioon/Za ?estikulatsioone/Z ?estikulatsioonega/Zalmny ?estikulatsiooni/Z ?estikulatsiooniga/Zacefijkly ?estikuleeri/Z ?estikuleerin/Z ?estikuleerinu/Z ?estikuleerinud/Zacdefhijklmnopqrstuvwyz ?etoon/Za ?etoone/Z ?etoonega/Zalmny ?etooni/Z ?etooniga/Zacefijkly ?gutega/Zalmn ?guti/Z ?gutiga/Zaceijly ?gutt/Zasuw ?guttide/Z ?guttidega/Zalmny ?iig/Z ?iige/Z ?iigega/Zalmny ?iigi/Z ?iigiga/Zacefijkly ?iigki/Z ?iiro/Z ?iirode/Z ?iirodegi/Z ?iiroga/Zaily ?iirot/Z ?iirotki/Z ?iletega/Zalmn ?ileti/Z ?iletiga/Zaceijly ?ilett/Zasuw ?ilettide/Z ?ilettidega/Zalmny ?irafega/Zalmn ?iraff/Z ?iraffe/Z ?iraffegi/Z ?iraffi/Z ?iraffide/Z ?iraffidega/Zalmny ?iraffigi/Z ?iraffisid/Z ?iraffisidki/Z ?iraffki/Z ?irafi/Z ?irafiga/Zaceijly ?irandega/Zalmn ?irandi/Z ?irandiga/Zaceijly ?irant/Zasuw ?irantide/Z ?irantidega/Zalmny ?ireeri/Z ?ireerin/Z ?ireerinu/Z ?ireerinud/Zacdefhijklmnopqrstuvwyz ?ongleeri/Z ?ongleerin/Z ?ongleerinu/Z ?ongleerinud/Zacdefhijklmnopqrstuvwyz ?ongl??r/Za ?ongl??re/Z ?ongl??rega/Zalmny ?ongl??ri/Z ?ongl??riga/Zacefijkly ?or?etega/Zalmn ?or?eti/Z ?or?etiga/Zaceijly ?or?ett/Zasuw ?or?ettide/Z ?or?ettidega/Zalmny ?urnaal/Za ?urnaale/Z ?urnaalega/Zalmny ?urnaali/Z ?urnaaliga/Zacefijkly ?urnalist/Za ?urnaliste/Z ?urnalistega/Zalmny ?urnalisti/Z ?urnalistiga/Zacefijkly ?urnalistika/Z ?urnalistikaga/Zabcdefgikmnoy ??rii/Z ??riiga/Zacefijkly --- NEW FILE hunspell-ee.spec --- Name: hunspell-ee Summary: Estonian hunspell dictionaries %define upstreamid 20030602 Version: 0.%{upstreamid} Release: 1%{?dist} Source0: http://www.meso.ee/~jjpp/speller/et_EE.dic Source1: http://www.meso.ee/~jjpp/speller/et_EE.aff Group: Applications/Text URL: http://www.meso.ee/~jjpp/speller/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: LGPL BuildArch: noarch Requires: hunspell %description Estonian hunspell dictionaries. %prep %setup -q -T -c -n hunspell-ee cp -p %{SOURCE0} . cp -p %{SOURCE1} . %build %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_datadir}/myspell/* %changelog * Thu Dec 07 2006 Caolan McNamara - 0.20030602-1 - initial version From fedora-extras-commits at redhat.com Wed Feb 14 09:53:35 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 14 Feb 2007 04:53:35 -0500 Subject: rpms/hunspell-ee import.log,1.1,1.2 Message-ID: <200702140953.l1E9rZDo003084@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-ee In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3024 Modified Files: import.log Log Message: auto-import hunspell-ee-0.20030602-1 on branch devel from hunspell-ee-0.20030602-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/hunspell-ee/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Feb 2007 18:53:59 -0000 1.1 +++ import.log 14 Feb 2007 09:53:03 -0000 1.2 @@ -0,0 +1 @@ +hunspell-ee-0_20030602-1:HEAD:hunspell-ee-0.20030602-1.src.rpm:1171446721 From fedora-extras-commits at redhat.com Wed Feb 14 10:06:36 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 14 Feb 2007 05:06:36 -0500 Subject: rpms/hunspell-el import.log,1.1,1.2 Message-ID: <200702141006.l1EA6aVa006765@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-el In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6729 Modified Files: import.log Log Message: auto-import hunspell-el-0.20041220-1 on branch devel from hunspell-el-0.20041220-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/hunspell-el/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Feb 2007 18:55:21 -0000 1.1 +++ import.log 14 Feb 2007 10:06:04 -0000 1.2 @@ -0,0 +1 @@ +hunspell-el-0_20041220-1:HEAD:hunspell-el-0.20041220-1.src.rpm:1171447652 From fedora-extras-commits at redhat.com Wed Feb 14 10:06:39 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 14 Feb 2007 05:06:39 -0500 Subject: rpms/hunspell-el/devel hunspell-el.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702141006.l1EA6d9J006769@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-el/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6729/devel Modified Files: .cvsignore sources Added Files: hunspell-el.spec Log Message: auto-import hunspell-el-0.20041220-1 on branch devel from hunspell-el-0.20041220-1.src.rpm --- NEW FILE hunspell-el.spec --- Name: hunspell-el Summary: Greek hunspell dictionaries %define upstreamid 20041220 Version: 0.%{upstreamid} Release: 1%{?dist} Source: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/el_GR.zip Group: Applications/Text URL: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: GPL BuildArch: noarch Requires: hunspell %description Greek hunspell dictionaries. %prep %setup -q -c -n hunspell-el %build chmod -x * %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README_el_GR.txt %{_datadir}/myspell/* %changelog * Thu Dec 07 2006 Caolan McNamara - 0.20041220-1 - initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hunspell-el/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Feb 2007 18:55:28 -0000 1.1 +++ .cvsignore 14 Feb 2007 10:06:06 -0000 1.2 @@ -0,0 +1 @@ +el_GR.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/hunspell-el/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Feb 2007 18:55:28 -0000 1.1 +++ sources 14 Feb 2007 10:06:06 -0000 1.2 @@ -0,0 +1 @@ +02d4c0022dee569bd4733e02ef885dc4 el_GR.zip From fedora-extras-commits at redhat.com Wed Feb 14 10:09:39 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 14 Feb 2007 05:09:39 -0500 Subject: rpms/hunspell-es/devel hunspell-es.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702141009.l1EA9dJt006962@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-es/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6922/devel Modified Files: .cvsignore sources Added Files: hunspell-es.spec Log Message: auto-import hunspell-es-0.20050510-1 on branch devel from hunspell-es-0.20050510-1.src.rpm --- NEW FILE hunspell-es.spec --- Name: hunspell-es Summary: Spanish hunspell dictionaries %define upstreamid 20050510 Version: 0.%{upstreamid} Release: 1%{?dist} Source0: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/es_ES.zip Source1: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/es_MX.zip Group: Applications/Text URL: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: LGPL BuildArch: noarch Requires: hunspell %description Spanish (Spain, Mexico, etc.) hunspell dictionaries. %prep %setup -q -c -n hunspell-es unzip -q %{SOURCE1} %build chmod -x * %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell pushd $RPM_BUILD_ROOT/%{_datadir}/myspell/ es_MX_aliases="es_AR es_BO es_CL es_CO es_CR es_DO es_EC es_GT es_HN es_NI es_PA es_PE es_PR es_PY es_SV es_UY es_VE" for lang in $es_MX_aliases; do ln -s es_MX.aff $lang.aff ln -s es_MX.dic $lang.dic done popd %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README_es_ES.txt README_es_MX.txt %{_datadir}/myspell/* %changelog * Thu Dec 07 2006 Caolan McNamara - 0.20050510-1 - initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hunspell-es/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Feb 2007 18:56:56 -0000 1.1 +++ .cvsignore 14 Feb 2007 10:09:07 -0000 1.2 @@ -0,0 +1,2 @@ +es_ES.zip +es_MX.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/hunspell-es/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Feb 2007 18:56:56 -0000 1.1 +++ sources 14 Feb 2007 10:09:07 -0000 1.2 @@ -0,0 +1,2 @@ +4b272f7c958dd619b2ddc007c45db53b es_ES.zip +e32f5ec8c94fd902a9823dae4040a019 es_MX.zip From fedora-extras-commits at redhat.com Wed Feb 14 10:09:36 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 14 Feb 2007 05:09:36 -0500 Subject: rpms/hunspell-es import.log,1.1,1.2 Message-ID: <200702141009.l1EA9aHB006958@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-es In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6922 Modified Files: import.log Log Message: auto-import hunspell-es-0.20050510-1 on branch devel from hunspell-es-0.20050510-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/hunspell-es/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Feb 2007 18:56:48 -0000 1.1 +++ import.log 14 Feb 2007 10:09:04 -0000 1.2 @@ -0,0 +1 @@ +hunspell-es-0_20050510-1:HEAD:hunspell-es-0.20050510-1.src.rpm:1171447832 From fedora-extras-commits at redhat.com Wed Feb 14 10:11:38 2007 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Wed, 14 Feb 2007 05:11:38 -0500 Subject: rpms/kicad/devel kicad.desktop,1.1,1.2 kicad.spec,1.7,1.8 Message-ID: <200702141011.l1EABcAQ007104@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/kicad/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7061 Modified Files: kicad.desktop kicad.spec Log Message: Fix desktop entry. Fix #228598. Index: kicad.desktop =================================================================== RCS file: /cvs/extras/rpms/kicad/devel/kicad.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kicad.desktop 11 Jul 2006 15:18:15 -0000 1.1 +++ kicad.desktop 14 Feb 2007 10:11:06 -0000 1.2 @@ -1,6 +1,6 @@ [Desktop Entry] -Categories=Application; -Comment=Une suite logicielle int??gr??e pour la saisie de sch??mas et le routage de circuits imprim??s +Categories=Qt;KDE;Education;Science;Engineering;X-Fedora; +Comment=An open source software for the creation of electronic schematic diagrams and printed circuit board artwork Comment[fr]=Une suite logicielle int??gr??e pour la saisie de sch??mas et le routage de circuits imprim??s Encoding=UTF-8 Exec=kicad Index: kicad.spec =================================================================== RCS file: /cvs/extras/rpms/kicad/devel/kicad.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- kicad.spec 8 Feb 2007 13:21:04 -0000 1.7 +++ kicad.spec 14 Feb 2007 10:11:06 -0000 1.8 @@ -1,6 +1,6 @@ Name: kicad Version: 2007.01.15 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Electronic schematic diagrams and printed circuit board artwork Summary(fr): Saisie de sch??ma ??lectronique et trac?? de circuit imprim?? @@ -244,6 +244,9 @@ %{_datadir}/pixmaps/kicad_icon.png %changelog +* Wed Feb 14 2007 Alain Portal 2007.01.15-2 + - Fix desktop entry. Fix #228598 + * Thu Feb 8 2007 Alain Portal 2007.01.15-1 - New upstream version From fedora-extras-commits at redhat.com Wed Feb 14 10:12:18 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 14 Feb 2007 05:12:18 -0500 Subject: rpms/hunspell-ga import.log,1.1,1.2 Message-ID: <200702141012.l1EACIQW007208@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-ga In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7115 Modified Files: import.log Log Message: auto-import hunspell-ga-0.20060731-1 on branch devel from hunspell-ga-0.20060731-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/hunspell-ga/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Feb 2007 18:49:22 -0000 1.1 +++ import.log 14 Feb 2007 10:11:46 -0000 1.2 @@ -0,0 +1 @@ +hunspell-ga-0_20060731-1:HEAD:hunspell-ga-0.20060731-1.src.rpm:1171447993 From fedora-extras-commits at redhat.com Wed Feb 14 10:12:21 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 14 Feb 2007 05:12:21 -0500 Subject: rpms/hunspell-ga/devel hunspell-ga.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702141012.l1EACLcS007210@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-ga/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7115/devel Modified Files: .cvsignore sources Added Files: hunspell-ga.spec Log Message: auto-import hunspell-ga-0.20060731-1 on branch devel from hunspell-ga-0.20060731-1.src.rpm --- NEW FILE hunspell-ga.spec --- Name: hunspell-ga Summary: Irish hunspell dictionaries %define upstreamid 20060731 Version: 0.%{upstreamid} Release: 1%{?dist} Source: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/ga_IE.zip Group: Applications/Text URL: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: GPL BuildArch: noarch Requires: hunspell %description Irish hunspell dictionaries. %prep %setup -q -c -n hunspell-ga %build chmod -x * %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README_ga_IE.txt %{_datadir}/myspell/* %changelog * Thu Dec 07 2006 Caolan McNamara - 0.20060731-1 - initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hunspell-ga/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Feb 2007 18:49:30 -0000 1.1 +++ .cvsignore 14 Feb 2007 10:11:49 -0000 1.2 @@ -0,0 +1 @@ +ga_IE.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/hunspell-ga/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Feb 2007 18:49:30 -0000 1.1 +++ sources 14 Feb 2007 10:11:49 -0000 1.2 @@ -0,0 +1 @@ +bf115e31b0618268001c28c4bb638444 ga_IE.zip From fedora-extras-commits at redhat.com Wed Feb 14 10:12:48 2007 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Wed, 14 Feb 2007 05:12:48 -0500 Subject: rpms/kicad/FC-6 kicad.desktop,1.1,1.2 kicad.spec,1.7,1.8 Message-ID: <200702141012.l1EACmZj007283@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/kicad/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7190 Modified Files: kicad.desktop kicad.spec Log Message: Fix desktop entry. Fix #228598. Index: kicad.desktop =================================================================== RCS file: /cvs/extras/rpms/kicad/FC-6/kicad.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kicad.desktop 11 Jul 2006 15:18:15 -0000 1.1 +++ kicad.desktop 14 Feb 2007 10:12:15 -0000 1.2 @@ -1,6 +1,6 @@ [Desktop Entry] -Categories=Application; -Comment=Une suite logicielle int??gr??e pour la saisie de sch??mas et le routage de circuits imprim??s +Categories=Qt;KDE;Education;Science;Engineering;X-Fedora; +Comment=An open source software for the creation of electronic schematic diagrams and printed circuit board artwork Comment[fr]=Une suite logicielle int??gr??e pour la saisie de sch??mas et le routage de circuits imprim??s Encoding=UTF-8 Exec=kicad Index: kicad.spec =================================================================== RCS file: /cvs/extras/rpms/kicad/FC-6/kicad.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- kicad.spec 8 Feb 2007 13:25:10 -0000 1.7 +++ kicad.spec 14 Feb 2007 10:12:15 -0000 1.8 @@ -1,6 +1,6 @@ Name: kicad Version: 2007.01.15 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Electronic schematic diagrams and printed circuit board artwork Summary(fr): Saisie de sch??ma ??lectronique et trac?? de circuit imprim?? @@ -244,15 +244,21 @@ %{_datadir}/pixmaps/kicad_icon.png %changelog +* Wed Feb 14 2007 Alain Portal 2007.01.15-2 + - Fix desktop entry. Fix #228598 + * Thu Feb 8 2007 Alain Portal 2007.01.15-1 - New upstream version -* Thu Feb 8 2007 Alain Portal 2006.08.28-3 +* Thu Feb 8 2007 Alain Portal 2006.08.28-4 - Add patch to build with RPM_OPT_FLAGS and remove -s from LDFLAGS Contribution of Ville Skytt?? Fix #227757 - Fix typo in french summary +* Thu Dec 28 2006 Jason L Tibbitts III 2006.08.28-3 + - Rebuild with wxGTK 2.8. + * Thu Oct 05 2006 Christian Iseli 2006.08.28-2 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 From fedora-extras-commits at redhat.com Wed Feb 14 10:13:46 2007 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Wed, 14 Feb 2007 05:13:46 -0500 Subject: rpms/kicad/FC-5 kicad.desktop,1.1,1.2 kicad.spec,1.4,1.5 Message-ID: <200702141013.l1EADkSI007372@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/kicad/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7339 Modified Files: kicad.desktop kicad.spec Log Message: Fix desktop entry. Fix #228598. Index: kicad.desktop =================================================================== RCS file: /cvs/extras/rpms/kicad/FC-5/kicad.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kicad.desktop 11 Jul 2006 15:18:15 -0000 1.1 +++ kicad.desktop 14 Feb 2007 10:13:14 -0000 1.2 @@ -1,6 +1,6 @@ [Desktop Entry] -Categories=Application; -Comment=Une suite logicielle int??gr??e pour la saisie de sch??mas et le routage de circuits imprim??s +Categories=Qt;KDE;Education;Science;Engineering;X-Fedora; +Comment=An open source software for the creation of electronic schematic diagrams and printed circuit board artwork Comment[fr]=Une suite logicielle int??gr??e pour la saisie de sch??mas et le routage de circuits imprim??s Encoding=UTF-8 Exec=kicad Index: kicad.spec =================================================================== RCS file: /cvs/extras/rpms/kicad/FC-5/kicad.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- kicad.spec 8 Feb 2007 13:29:02 -0000 1.4 +++ kicad.spec 14 Feb 2007 10:13:14 -0000 1.5 @@ -1,6 +1,6 @@ Name: kicad Version: 2007.01.15 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Electronic schematic diagrams and printed circuit board artwork Summary(fr): Saisie de sch??ma ??lectronique et trac?? de circuit imprim?? @@ -244,15 +244,24 @@ %{_datadir}/pixmaps/kicad_icon.png %changelog +* Wed Feb 14 2007 Alain Portal 2007.01.15-2 + - Fix desktop entry. Fix #228598 + * Thu Feb 8 2007 Alain Portal 2007.01.15-1 - New upstream version -* Thu Feb 8 2007 Alain Portal 2006.08.28-2 +* Thu Feb 8 2007 Alain Portal 2006.08.28-4 - Add patch to build with RPM_OPT_FLAGS and remove -s from LDFLAGS Contribution of Ville Skytt?? Fix #227757 - Fix typo in french summary +* Thu Dec 28 2006 Jason L Tibbitts III 2006.08.28-3 + - Rebuild with wxGTK 2.8. + +* Thu Oct 05 2006 Christian Iseli 2006.08.28-2 + - rebuilt for unwind info generation, broken in gcc-4.1.1-21 + * Fri Sep 22 2006 Alain Portal 2006.08.28-1 - New upstream version - Use macro style instead of variable style From fedora-extras-commits at redhat.com Wed Feb 14 10:14:55 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 14 Feb 2007 05:14:55 -0500 Subject: rpms/hunspell-gl import.log,1.1,1.2 Message-ID: <200702141014.l1EAEtfg007472@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-gl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7434 Modified Files: import.log Log Message: auto-import hunspell-gl-0.20061002-1 on branch devel from hunspell-gl-0.20061002-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/hunspell-gl/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Feb 2007 18:50:50 -0000 1.1 +++ import.log 14 Feb 2007 10:14:23 -0000 1.2 @@ -0,0 +1 @@ +hunspell-gl-0_20061002-1:HEAD:hunspell-gl-0.20061002-1.src.rpm:1171448151 From fedora-extras-commits at redhat.com Wed Feb 14 10:14:58 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 14 Feb 2007 05:14:58 -0500 Subject: rpms/hunspell-gl/devel hunspell-gl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702141014.l1EAEwki007476@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-gl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7434/devel Modified Files: .cvsignore sources Added Files: hunspell-gl.spec Log Message: auto-import hunspell-gl-0.20061002-1 on branch devel from hunspell-gl-0.20061002-1.src.rpm --- NEW FILE hunspell-gl.spec --- Name: hunspell-gl Summary: Galician hunspell dictionaries %define upstreamid 20061002 Version: 0.%{upstreamid} Release: 1%{?dist} Source: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/gl_ES.zip Group: Applications/Text URL: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: GPL BuildArch: noarch Requires: hunspell %description Galician hunspell dictionaries. %prep %setup -q -c -n hunspell-gl %build chmod -x * %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README_gl_ES.txt %{_datadir}/myspell/* %changelog * Thu Dec 07 2006 Caolan McNamara - 0.20061002-1 - initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hunspell-gl/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Feb 2007 18:50:58 -0000 1.1 +++ .cvsignore 14 Feb 2007 10:14:26 -0000 1.2 @@ -0,0 +1 @@ +gl_ES.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/hunspell-gl/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Feb 2007 18:50:58 -0000 1.1 +++ sources 14 Feb 2007 10:14:26 -0000 1.2 @@ -0,0 +1 @@ +df6bc9f18cb12a3deb9f7c857f010939 gl_ES.zip From fedora-extras-commits at redhat.com Wed Feb 14 10:32:52 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 14 Feb 2007 05:32:52 -0500 Subject: rpms/hunspell-he/devel hunspell-he.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702141032.l1EAWqik007787@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-he/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7739/devel Modified Files: .cvsignore sources Added Files: hunspell-he.spec Log Message: auto-import hunspell-he-0.20050112-1 on branch devel from hunspell-he-0.20050112-1.src.rpm --- NEW FILE hunspell-he.spec --- Name: hunspell-he Summary: Hebrew hunspell dictionaries %define upstreamid 20050112 Version: 0.%{upstreamid} Release: 1%{?dist} Source: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/he_IL.zip Group: Applications/Text URL: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: GPL BuildArch: noarch Requires: hunspell %description Hebrew hunspell dictionaries. %prep %setup -q -c -n hunspell-he %build chmod -x * %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README_he_IL.txt %{_datadir}/myspell/* %changelog * Thu Dec 07 2006 Caolan McNamara - 0.20050112-1 - initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hunspell-he/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Feb 2007 18:52:25 -0000 1.1 +++ .cvsignore 14 Feb 2007 10:32:20 -0000 1.2 @@ -0,0 +1 @@ +he_IL.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/hunspell-he/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Feb 2007 18:52:25 -0000 1.1 +++ sources 14 Feb 2007 10:32:20 -0000 1.2 @@ -0,0 +1 @@ +5ff2bf971a2185f65c004150ccae9965 he_IL.zip From fedora-extras-commits at redhat.com Wed Feb 14 10:32:49 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 14 Feb 2007 05:32:49 -0500 Subject: rpms/hunspell-he import.log,1.1,1.2 Message-ID: <200702141032.l1EAWnVs007783@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-he In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7739 Modified Files: import.log Log Message: auto-import hunspell-he-0.20050112-1 on branch devel from hunspell-he-0.20050112-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/hunspell-he/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Feb 2007 18:52:17 -0000 1.1 +++ import.log 14 Feb 2007 10:32:17 -0000 1.2 @@ -0,0 +1 @@ +hunspell-he-0_20050112-1:HEAD:hunspell-he-0.20050112-1.src.rpm:1171449225 From fedora-extras-commits at redhat.com Wed Feb 14 10:42:50 2007 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Wed, 14 Feb 2007 05:42:50 -0500 Subject: rpms/emacs-nxml-mode - New directory Message-ID: <200702141042.l1EAgoID008092@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/extras/rpms/emacs-nxml-mode In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8087/emacs-nxml-mode Log Message: Directory /cvs/extras/rpms/emacs-nxml-mode added to the repository From fedora-extras-commits at redhat.com Wed Feb 14 10:42:58 2007 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Wed, 14 Feb 2007 05:42:58 -0500 Subject: rpms/emacs-nxml-mode/devel - New directory Message-ID: <200702141042.l1EAgwSd008110@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/extras/rpms/emacs-nxml-mode/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8087/emacs-nxml-mode/devel Log Message: Directory /cvs/extras/rpms/emacs-nxml-mode/devel added to the repository From fedora-extras-commits at redhat.com Wed Feb 14 11:56:08 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 14 Feb 2007 06:56:08 -0500 Subject: rpms/arrows/devel arrows.spec,1.1,1.2 Message-ID: <200702141156.l1EBu8iD012133@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/arrows/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12116 Modified Files: arrows.spec Log Message: * Sat Nov 25 2006 Hans de Goede 0.6-3 - Honor $RPM_OPT_FLAGS (bz 225098) Index: arrows.spec =================================================================== RCS file: /cvs/extras/rpms/arrows/devel/arrows.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- arrows.spec 25 Nov 2006 20:59:20 -0000 1.1 +++ arrows.spec 14 Feb 2007 11:55:36 -0000 1.2 @@ -1,6 +1,6 @@ Name: arrows Version: 0.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Neat little maze game Group: Amusements/Games License: GPL @@ -24,7 +24,7 @@ %build -make %{?_smp_mflags} +make %{?_smp_mflags} CCOPTS="$RPM_OPT_FLAGS" %install @@ -68,6 +68,9 @@ %changelog +* Sat Nov 25 2006 Hans de Goede 0.6-3 +- Honor $RPM_OPT_FLAGS (bz 225098) + * Sat Nov 25 2006 Hans de Goede 0.6-2 - Add Requires hicolor-icon-theme, drop GNOME from desktop catagories (bz 217239) From fedora-extras-commits at redhat.com Wed Feb 14 12:01:36 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb)) Date: Wed, 14 Feb 2007 07:01:36 -0500 Subject: rpms/qt4-qsa/devel qt4-qsa-fhs.patch, NONE, 1.1 qt4-qsa.spec, 1.12, 1.13 Message-ID: <200702141201.l1EC1aMf015616@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/qt4-qsa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12194 Modified Files: qt4-qsa.spec Added Files: qt4-qsa-fhs.patch Log Message: fix Bug 210544 qt4-qsa-fhs.patch: --- NEW FILE qt4-qsa-fhs.patch --- --- qsa-x11-opensource-1.2.2/src/qsa/qsa.pro.prefix 2006-12-08 14:02:25.000000000 +0100 +++ qsa-x11-opensource-1.2.2/src/qsa/qsa.pro 2007-02-10 17:59:43.000000000 +0100 @@ -83,16 +83,16 @@ ..\ide\qsworkbench.h !isEmpty(QSA_INSTALL_PREFIX) { - headers.path = $$QSA_INSTALL_PREFIX/include + headers.path = $$(QTINC) win32 { target.path = $$QSA_INSTALL_PREFIX/bin } else { - target.path = $$QSA_INSTALL_PREFIX/lib + target.path = $$(QTLIB) } prf.files = qsa.prf - prf.path = $$QSA_INSTALL_PREFIX/mkspecs/features + prf.path = $$(QTDATA)/mkspecs/features documentation.files = ../../doc/html/* - documentation.path = $$QSA_INSTALL_PREFIX/doc/html + documentation.path = $$(QTDATA)/doc/html INSTALLS += headers target prf documentation } Index: qt4-qsa.spec =================================================================== RCS file: /cvs/extras/rpms/qt4-qsa/devel/qt4-qsa.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- qt4-qsa.spec 11 Jan 2007 09:04:30 -0000 1.12 +++ qt4-qsa.spec 14 Feb 2007 12:01:02 -0000 1.13 @@ -1,27 +1,20 @@ Name: qt4-qsa Summary: Qt Script for Applications Version: 1.2.2 -Release: 1%{?dist} +Release: 2%{?dist} BuildRequires: qt4-devel URL: http://www.trolltech.com/products/qt/addon/qsa License: GPL Group: Development/Libraries Source: ftp://ftp.trolltech.com/qsa/source/qsa-x11-opensource-%{version}.tar.gz +Patch0: qt4-qsa-fhs.patch Buildroot: %{_tmppath}/qsa-%{version}-%{release}-root-%(%{__id_u} -n) -%define qtdir %(qmake-qt4 -query QT_INSTALL_PREFIX) - -# fix the the broken include path -%define qtinc %{qtdir}/include -%ifarch x86_64 -%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS)/qt4/lib64 -%else -%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS)/qt4/lib -%endif - -#%%define qtinc %(qmake4 -query QT_INSTALL_HEADERS) -#%%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS) +%define qtdir %(qmake-qt4 -query QT_INSTALL_PREFIX) +%define qtinc %(qmake-qt4 -query QT_INSTALL_HEADERS) +%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS) +%define qtdata %(qmake-qt4 -query QT_INSTALL_DATA) %package devel @@ -40,22 +33,25 @@ %prep %setup -q -n qsa-x11-opensource-%{version} +%patch0 -p1 -z .fhs %build export QTDIR=%{qtdir} -export PATH=$QTDIR/bin:$PATH +export PATH=%{qtlib}/qt4/bin:$PATH export QTINC=%{qtinc} export QTLIB=%{qtlib} +export QTDATA=%{qtdata} + #without qt3support #./configure -release -new-editor -prefix %{qtdir} ./configure -release -prefix %{qtdir} #./configure -release -make %{?_smp_mflags} -e INSTALL_ROOT=$RPM_BUILD_ROOT sub-src +make %{?_smp_mflags} sub-src %install rm -rf $RPM_BUILD_ROOT -make %{?_smp_mflags} -e INSTALL_ROOT=$RPM_BUILD_ROOT install -rm -rf $RPM_BUILD_ROOT/%{qtdir}/doc +make -e INSTALL_ROOT=$RPM_BUILD_ROOT install +rm -rf $RPM_BUILD_ROOT/%{qtdata}/doc #remove uneeded files rm -f examples/qsa.prf find examples -name "Makefile.*" | xargs rm -f @@ -71,12 +67,6 @@ install -p -m 644 src/ide/qsworkbench.h $RPM_BUILD_ROOT%{qtinc}/ install -p -m 644 src/qsa/qsutilfactory.h $RPM_BUILD_ROOT%{qtinc}/ -%if "%{_lib}" != "lib" -test -d $RPM_BUILD_ROOT%{qtdir}/lib && \ -mkdir -p $RPM_BUILD_ROOT%{qtlib} && \ -mv $RPM_BUILD_ROOT%{qtdir}/lib/* $RPM_BUILD_ROOT%{qtlib}/ -%endif - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -94,12 +84,15 @@ %defattr(0644,root,root) %{qtinc}/* %{qtlib}/libqsa.so -%{qtdir}/mkspecs/features/qsa.prf +%{qtdata}/mkspecs/features/qsa.prf %defattr(0644,root,root,0755) %doc examples %doc doc/html %changelog +* Thu Feb 13 2007 Frank B??ttner - 1.2.2-2%{?dist} +- fix Bug 210544, thanks Hans de Goede + * Thu Jan 11 2007 Frank B??ttner - 1.2.2-1%{?dist} - update to 1.2.2 - add warning about end of life From fedora-extras-commits at redhat.com Wed Feb 14 12:24:05 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb)) Date: Wed, 14 Feb 2007 07:24:05 -0500 Subject: rpms/qt4-qsa/FC-6 qt4-qsa-fhs.patch, NONE, 1.1 qt4-qsa.spec, 1.12, 1.13 Message-ID: <200702141224.l1ECO5Aa015757@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/qt4-qsa/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15731 Modified Files: qt4-qsa.spec Added Files: qt4-qsa-fhs.patch Log Message: fix Bug 210544 qt4-qsa-fhs.patch: --- NEW FILE qt4-qsa-fhs.patch --- --- qsa-x11-opensource-1.2.2/src/qsa/qsa.pro.prefix 2006-12-08 14:02:25.000000000 +0100 +++ qsa-x11-opensource-1.2.2/src/qsa/qsa.pro 2007-02-10 17:59:43.000000000 +0100 @@ -83,16 +83,16 @@ ..\ide\qsworkbench.h !isEmpty(QSA_INSTALL_PREFIX) { - headers.path = $$QSA_INSTALL_PREFIX/include + headers.path = $$(QTINC) win32 { target.path = $$QSA_INSTALL_PREFIX/bin } else { - target.path = $$QSA_INSTALL_PREFIX/lib + target.path = $$(QTLIB) } prf.files = qsa.prf - prf.path = $$QSA_INSTALL_PREFIX/mkspecs/features + prf.path = $$(QTDATA)/mkspecs/features documentation.files = ../../doc/html/* - documentation.path = $$QSA_INSTALL_PREFIX/doc/html + documentation.path = $$(QTDATA)/doc/html INSTALLS += headers target prf documentation } Index: qt4-qsa.spec =================================================================== RCS file: /cvs/extras/rpms/qt4-qsa/FC-6/qt4-qsa.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- qt4-qsa.spec 11 Jan 2007 17:50:06 -0000 1.12 +++ qt4-qsa.spec 14 Feb 2007 12:23:33 -0000 1.13 @@ -1,27 +1,20 @@ Name: qt4-qsa Summary: Qt Script for Applications Version: 1.2.2 -Release: 1%{?dist} +Release: 2%{?dist} BuildRequires: qt4-devel URL: http://www.trolltech.com/products/qt/addon/qsa License: GPL Group: Development/Libraries Source: ftp://ftp.trolltech.com/qsa/source/qsa-x11-opensource-%{version}.tar.gz +Patch0: qt4-qsa-fhs.patch Buildroot: %{_tmppath}/qsa-%{version}-%{release}-root-%(%{__id_u} -n) -%define qtdir %(qmake-qt4 -query QT_INSTALL_PREFIX) - -# fix the the broken include path -%define qtinc %{qtdir}/include -%ifarch x86_64 -%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS)/qt4/lib64 -%else -%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS)/qt4/lib -%endif - -#%%define qtinc %(qmake4 -query QT_INSTALL_HEADERS) -#%%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS) +%define qtdir %(qmake-qt4 -query QT_INSTALL_PREFIX) +%define qtinc %(qmake-qt4 -query QT_INSTALL_HEADERS) +%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS) +%define qtdata %(qmake-qt4 -query QT_INSTALL_DATA) %package devel @@ -40,22 +33,25 @@ %prep %setup -q -n qsa-x11-opensource-%{version} +%patch0 -p1 -z .fhs %build export QTDIR=%{qtdir} -export PATH=$QTDIR/bin:$PATH +export PATH=%{qtlib}/qt4/bin:$PATH export QTINC=%{qtinc} export QTLIB=%{qtlib} +export QTDATA=%{qtdata} + #without qt3support #./configure -release -new-editor -prefix %{qtdir} ./configure -release -prefix %{qtdir} #./configure -release -make %{?_smp_mflags} -e INSTALL_ROOT=$RPM_BUILD_ROOT sub-src +make %{?_smp_mflags} sub-src %install rm -rf $RPM_BUILD_ROOT -make %{?_smp_mflags} -e INSTALL_ROOT=$RPM_BUILD_ROOT install -rm -rf $RPM_BUILD_ROOT/%{qtdir}/doc +make -e INSTALL_ROOT=$RPM_BUILD_ROOT install +rm -rf $RPM_BUILD_ROOT/%{qtdata}/doc #remove uneeded files rm -f examples/qsa.prf find examples -name "Makefile.*" | xargs rm -f @@ -71,12 +67,6 @@ install -p -m 644 src/ide/qsworkbench.h $RPM_BUILD_ROOT%{qtinc}/ install -p -m 644 src/qsa/qsutilfactory.h $RPM_BUILD_ROOT%{qtinc}/ -%if "%{_lib}" != "lib" -test -d $RPM_BUILD_ROOT%{qtdir}/lib && \ -mkdir -p $RPM_BUILD_ROOT%{qtlib} && \ -mv $RPM_BUILD_ROOT%{qtdir}/lib/* $RPM_BUILD_ROOT%{qtlib}/ -%endif - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -94,12 +84,15 @@ %defattr(0644,root,root) %{qtinc}/* %{qtlib}/libqsa.so -%{qtdir}/mkspecs/features/qsa.prf +%{qtdata}/mkspecs/features/qsa.prf %defattr(0644,root,root,0755) %doc examples %doc doc/html %changelog +* Thu Feb 13 2007 Frank B??ttner - 1.2.2-2%{?dist} +- fix Bug 210544, thanks Hans de Goede + * Thu Jan 11 2007 Frank B??ttner - 1.2.2-1%{?dist} - update to 1.2.2 - add warning about end of life From fedora-extras-commits at redhat.com Wed Feb 14 13:00:56 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 14 Feb 2007 08:00:56 -0500 Subject: rpms/MagicPoint/FC-5 magicpoint-1.11b-64bit.patch, NONE, 1.1 magicpoint-1.11b-debian.patch, NONE, 1.1 magicpoint-1.11b-embed.patch, NONE, 1.1 MagicPoint.spec, 1.3, 1.4 magicpoint-1.09a-rpath.patch, 1.1, 1.2 magicpoint-1.08a-redhat.patch, 1.1, NONE magicpoint-1.11b-fix-undefined-operation.patch, 1.1, NONE Message-ID: <200702141300.l1ED0uJ8016026@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/MagicPoint/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15989 Modified Files: MagicPoint.spec magicpoint-1.09a-rpath.patch Added Files: magicpoint-1.11b-64bit.patch magicpoint-1.11b-debian.patch magicpoint-1.11b-embed.patch Removed Files: magicpoint-1.08a-redhat.patch magicpoint-1.11b-fix-undefined-operation.patch Log Message: * Sat Oct 21 2006 Hans de Goede 1.11b-4 - Unorphan - Take some patches from Debian - Actually make ./configure detect and use freetype1, it was testing for it but the test failed - Package mgp2html and mgp2latex from the contrib dir magicpoint-1.11b-64bit.patch: --- NEW FILE magicpoint-1.11b-64bit.patch --- --- magicpoint-1.11b/draw.c.64bit 2006-10-21 13:29:24.000000000 +0200 +++ magicpoint-1.11b/draw.c 2006-10-21 13:27:28.000000000 +0200 @@ -4884,8 +4884,8 @@ char *registry; { char *xfont; - static XftFont *last_xftfont; - static char lastfont[100]; + static XftFont *last_xftfont = NULL; + static char lastfont[100] = ""; static int lastsize = 0; XftFont *xftfont; char *p, *p2; @@ -4934,12 +4934,12 @@ XFT_FAMILY, XftTypeString, font, XFT_ENCODING, XftTypeString, registry, XFT_STYLE, XftTypeString, style, - XFT_PIXEL_SIZE, XftTypeDouble, (float)csize, 0); + XFT_PIXEL_SIZE, XftTypeDouble, (double)csize, NULL); } else { xftfont = XftFontOpen(display, screen, XFT_FAMILY, XftTypeString, font, XFT_ENCODING, XftTypeString, registry, - XFT_PIXEL_SIZE, XftTypeDouble, (float)csize, 0); + XFT_PIXEL_SIZE, XftTypeDouble, (double)csize, NULL); } if (xftfont == 0) { free(xfont); @@ -4950,6 +4950,9 @@ fprintf(stderr, "using xftfont [%s] size: %d\n", lastfont, csize); } + if (last_xftfont) + XftFontClose(display, last_xftfont); + lastsize = csize; last_xftfont = xftfont; free(xfont); magicpoint-1.11b-debian.patch: --- NEW FILE magicpoint-1.11b-debian.patch --- --- mgp-1.11b.orig/contrib/mgp2html.pl.in +++ mgp-1.11b/contrib/mgp2html.pl.in @@ -79,10 +79,18 @@ &prologue; while (<>) { - s/\n$//; + s/[\n\r]*$//; # trim CR and LF + s/; # concatenate next line + s/[\n\r]*$//; # trim CR and LF + } + if ($_ eq '' || $_ =~ /^[^%]/) { $line++; $cont = 0 if ($cont == 2); @@ -103,6 +111,8 @@ next; } + $cont = 0 if ($cont == 2); + $cont = 2 if ($cont == 1); &cmds($_); } &pageepilogue; @@ -152,14 +162,15 @@ if (!$doimage) { # don't use images } elsif (scalar(@dir) == 2 || scalar(@dir) == 3) { - print "\"$dir[1]\"\n"; + &output("\"$dir[1]\"\n"); } elsif (scalar(@dir) == 4) { # interpretation wrong - print "\"$dir[1]\"\n"; + &output("\"$dir[1]\"\n"); } elsif (scalar(@dir) >= 5) { # interpretation wrong - print "\"$dir[1]\"\n"; + &output("\"$dir[1]\"\n"); } + $endline = "
\n"; } elsif ($dir[0] eq 'nodefault') { $nodefault++; } elsif ($dir[0] =~ /^(left|leftfill|right|center)$/) { --- mgp-1.11b.orig/contrib/mgpnet.in +++ mgp-1.11b/contrib/mgpnet.in @@ -32,7 +32,7 @@ # configurations $tmpdir = '/tmp'; -$httpdatestr = "date '+\%a, \%d \%b \%Y \%H:\%M:\%S \%Z'"; +$httpdatestr = "env LC_ALL=C date '+\%a, \%d \%b \%Y \%H:\%M:\%S \%Z'"; $seltimeout = 1; $refreshtimeout = 10; $debug = 0; @@ -53,6 +53,7 @@ } while ($hostname =~ /^127\./); close(IN); }; + $hostname =~ s/^addr://; # for GNU/Linux, by ukai print "http://$hostname:$port/\n"; exit 0; } @@ -150,19 +151,19 @@ vec($rin, fileno(S), 1) = 1; vec($win, fileno(S), 1) = 1; $ewin = $rin | $win; - print STDERR "waiting for connetion...\n" if ($debug); + print STDERR "waiting for connection...\n" if ($debug); ($nfound, $timeleft) = select($rout = $rin, $wout = $win, $eout = $ein, $seltimeout); next if ($nfound <= 0); if (vec($rout, fileno(S), 1)) { - print STDERR "accepting connetion...\n" if ($debug); + print STDERR "accepting connection...\n" if ($debug); accept(NS, S) || do { print STDERR "server: accept fail\n" if ($debug); next; }; $acceptstat++; - print STDERR "connetion accepted...\n" if ($debug); + print STDERR "connection accepted...\n" if ($debug); $pid = fork; if ($pid < 0) { @@ -185,7 +186,7 @@ } } print STDERR "leaving MagicPoint Netserver...\n"; -print STDERR "accepted $acceptstat connetions so far.\n"; +print STDERR "accepted $acceptstat connections so far.\n"; close(NS); close(S); unlink($imagefile); @@ -256,7 +257,7 @@ $httpmethod = $httppath = $httpver = ''; ($httpmethod, $httppath, $httpver) = split(/\s+/, $httpreq); $httppath =~ s/http:\/\/[^:\/]+(:\d+)\//\//; - if ($httpver eq '' || $httpver eq 'HTTP/1.0') { + if ($httpver eq '' || $httpver =~ m'HTTP/1.[01]') { ; # ok } else { &httpheader(501, $cthtml) if ($httpver); @@ -350,7 +351,7 @@ File Not found

File Not found

The requested URL $httppath was not found on this server.

-Looks like a mitake in configuration. +Looks like a mistake in configuration. Contact the administrator.

EOF @@ -415,7 +416,7 @@ 'XXX4', 'SO_REUSEPORT', 'XXX5', 'SOCK_STREAM', 'XXX6', 'WNOHANG', ); $tmpnam = &tmpname; - open(CPP, "| @CPP@ >$tmpnam") || return; + open(CPP, "| @CPP@ - >$tmpnam") || return; print CPP "#include \n"; print CPP "#include \n"; foreach $tmp (keys %varnames) { @@ -439,12 +440,19 @@ $havesinlen = 0; $sockaddr = 'S n a4 x8'; } + use Socket; foreach $i (keys %varnames) { if (@tmp2 = grep($_ =~ /^$i/, @tmp1)) { $tmp = (split(/\s+/, @tmp2[0]))[1]; $tmp = oct($tmp) if ($tmp =~ /^0/); - next if ($tmp !~ /^[0-9]+$/); - eval "\$$varnames{$i} = \$tmp;"; + if ($tmp =~ /^[0-9]+$/) { + eval "\$$varnames{$i} = \$tmp;"; + } else { + # some constant defined by enum, so we can not + # always use cpp as above. I believe use Socket + # is more reliable in these days. + eval "\$$varnames{$i} = &$varnames{$i};"; + } } } } --- mgp-1.11b.orig/README.lang +++ mgp-1.11b/README.lang @@ -16,6 +16,9 @@ %charset "iso8859-1" +Note that this directive can be used after %page directive, that is, +you can't use %charset directive in preamble. + In the future, we will add more encodings to charset directive, like "iso2022-jp", or "euc-jp" --- mgp-1.11b.orig/mgpembed.pl.in +++ mgp-1.11b/mgpembed.pl.in @@ -85,12 +85,20 @@ print OUT; next; } - if (/^%(.*)image\s+/i) { - $prefix = $1; $postfix = $'; - if ($postfix =~ /\"([^"]*)\"/) { - # "]*)\"/) { # (workaround for bug in Emacs Perl-syntax) + if (/^%(.*)image\s+([^,]+)/i) { + $a = $1; $fname0 = $fname = $2; $b = $'; + if ($a =~ /new$/) { + if ($fname =~ /\"([^"]*)\"$/) { $fname = $1; - } elsif ($b =~ /^(\S+)/) { + } + } else { + if ($fname =~ /\s.*/) { + $b = $' . $b; + } + } + if ($fname =~ /^\"([^"]*)\"/) { + $fname = $1; + } elsif ($fname =~ /^(\S+)/) { $fname = $1; } $base = $fname; @@ -106,10 +114,11 @@ } $files{$base} = $fname; $embfn = "EMBEDDIR/" . $base; - $postfix =~ s/\"$fname\"/\"$embfn\"/; + $fname0 =~ s/$fname/$embfn/; print OUT '%'; - print OUT "$prefix"; - print OUT "image $postfix"; + print OUT "$a"; + print OUT "image $fname0"; + print OUT "$b"; } elsif (/^%(.*)include\s+(\S+)(.*)$/i) { $incfname = $2; if ($incfname =~ /^\"(.+)\"$/) { --- mgp-1.11b.orig/parse.c +++ mgp-1.11b/parse.c @@ -782,6 +782,10 @@ } } } else { +#if 1 /* escape % by backslash */ + if (buf[0] == 0x5c) + memcpy(&buf[0], &buf[1], strlen(buf)); +#endif /* this is data */ /* @@ -1091,6 +1099,7 @@ case CTL_TMFONT: tmpstr[4] = cp; break; #endif case CTL_XFONT2: + define_font (cp); if (strcmp(cp->ctc2_value2, "iso8859-1") == 0) { tmpstr[2] = cp; @@ -1913,7 +1922,7 @@ int i; /* find duplicated def */ - for (i = 0; i < MAXFONTDEF; i++) { + for (i = 0; cp->ct_op != CTL_XFONT2 && i < MAXFONTDEF; i++) { if (!fontdef_control[i]) continue; if (strcmp(fontdef_control[i]->ctc_value, @@ -1949,8 +1958,10 @@ for (i = 0; i < MAXFONTDEF; i++) { if (!fontdef_control[i]) continue; - if (strcmp(fontdef_control[i]->ctc_value, font) == 0) + if (fontdef_control[i]->ct_op != CTL_XFONT2 + && strcmp(fontdef_control[i]->ctc_value, font) == 0) { return fontdef_control[i]; + } } return NULL; } --- mgp-1.11b.orig/sample/sample-fr.mgp +++ mgp-1.11b/sample/sample-fr.mgp @@ -182,6 +182,8 @@ this is test %endfilter + Pour voir cette feature (et les 2 slides prochains) il faut utiliser -U parce que c'est dangereux. + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %PAGE --- mgp-1.11b.orig/sample/sample-jp.mgp +++ mgp-1.11b/sample/sample-jp.mgp @@ -312,6 +312,9 @@ %filter "rev" this is test %endfilter + + $B$3$N%U%#!<%A%c!<$O4m$$$G$9$+$i(B -U $B$,I,MW$G$9!J 1.11b-4 +- Unorphan +- Take some patches from Debian +- Actually make ./configure detect and use freetype1, it was testing for it + but the test failed +- Package mgp2html and mgp2latex from the contrib dir + * Fri Aug 5 2005 Colin Charles - 1.11b-3 - Re-enable debuginfo builds - Ralf Corsepius watchful eyes fixes - cleaning up the spec @@ -204,7 +221,7 @@ * Wed May 24 2000 Tim Powers - updated to 1.07a - cleaned up files list -- using %configure +- using %%configure - fixed to use XFree86 4.0 * Mon Jul 19 1999 Tim Powers magicpoint-1.09a-rpath.patch: Index: magicpoint-1.09a-rpath.patch =================================================================== RCS file: /cvs/extras/rpms/MagicPoint/FC-5/magicpoint-1.09a-rpath.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- magicpoint-1.09a-rpath.patch 27 Jun 2005 05:48:40 -0000 1.1 +++ magicpoint-1.09a-rpath.patch 14 Feb 2007 13:00:24 -0000 1.2 @@ -10,3 +10,14 @@ AC_DEFINE(MNG)], [AC_CHECK_LIB(mng, mng_readdisplay, [LIBS="$LIBS -lmng -ljpeg" +--- magicpoint-1.11b/configure~ 2006-10-07 17:31:51.000000000 +0200 ++++ magicpoint-1.11b/configure 2006-10-07 17:31:51.000000000 +0200 +@@ -4831,7 +4831,7 @@ + echo "$as_me:$LINENO: result: $ac_cv_lib_mng_mng_initialize" >&5 + echo "${ECHO_T}$ac_cv_lib_mng_mng_initialize" >&6 + if test $ac_cv_lib_mng_mng_initialize = yes; then +- LIBS="$LIBS -Wl,-rpath,$i/lib -lmng" ++ LIBS="$LIBS -lmng" + cat >>confdefs.h <<\_ACEOF + #define MNG 1 + _ACEOF --- magicpoint-1.08a-redhat.patch DELETED --- --- magicpoint-1.11b-fix-undefined-operation.patch DELETED --- From fedora-extras-commits at redhat.com Wed Feb 14 13:10:09 2007 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Wed, 14 Feb 2007 08:10:09 -0500 Subject: rpms/gnubg/devel gnubg.spec,1.5,1.6 Message-ID: <200702141310.l1EDA90p019548@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/extras/rpms/gnubg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19527 Modified Files: gnubg.spec Log Message: Buildrequires fix. Index: gnubg.spec =================================================================== RCS file: /cvs/extras/rpms/gnubg/devel/gnubg.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gnubg.spec 14 Feb 2007 04:42:06 -0000 1.5 +++ gnubg.spec 14 Feb 2007 13:09:37 -0000 1.6 @@ -3,7 +3,7 @@ Group: Amusements/Games Summary: A backgammon game and analyser Version: 20061119 -Release: 2%{?dist} +Release: 3%{?dist} Source0: http://www.gnubg.org/media/sources/%{name}-source-MAIN-%{version}.tar.gz Source1: gnubg.weights Source2: gnubg.desktop @@ -25,6 +25,9 @@ BuildRequires: ghostscript BuildRequires: info BuildRequires: desktop-file-utils +BuildRequires: audiofile-devel +BuildRequires: cairo-devel +BuildRequires: libxml2-devel Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -129,6 +132,8 @@ %{_datadir}/gnubg/flags %changelog +* Wed Feb 14 2007 Jon Ciesla - 20061119-3 +- BuildRequires fix. * Tue Feb 13 2007 Jon Ciesla - 20061119-2 - Removed czech.png, added scripts, flags dirs. * Tue Feb 13 2007 Jon Ciesla - 20061119-1 From fedora-extras-commits at redhat.com Wed Feb 14 13:22:53 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 14 Feb 2007 08:22:53 -0500 Subject: rpms/MagicPoint/FC-5 MagicPoint.spec,1.4,1.5 Message-ID: <200702141322.l1EDMr8F019744@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/MagicPoint/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19725 Modified Files: MagicPoint.spec Log Message: * Sat Oct 21 2006 Hans de Goede 1.11b-4 - Unorphan - Take some patches from Debian - Actually make ./configure detect and use freetype1, it was testing for it but the test failed - Package mgp2html and mgp2latex from the contrib dir Index: MagicPoint.spec =================================================================== RCS file: /cvs/extras/rpms/MagicPoint/FC-5/MagicPoint.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- MagicPoint.spec 14 Feb 2007 13:00:24 -0000 1.4 +++ MagicPoint.spec 14 Feb 2007 13:22:21 -0000 1.5 @@ -17,6 +17,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: freetype-devel giflib-devel libpng-devel libmng-devel imake BuildRequires: imlib-devel libXmu-devel libXft-devel bison flex perl sharutils +BuildRequires: libXt-devel Requires: sharutils Obsoletes: mgp < %{version}-%{release}, magicpoint < %{version}-%{release} Provides: mgp = %{version}-%{release}, magicpoint = %{version}-%{release} From fedora-extras-commits at redhat.com Wed Feb 14 13:29:29 2007 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Wed, 14 Feb 2007 08:29:29 -0500 Subject: rpms/graphviz/devel graphviz.spec,1.33,1.34 Message-ID: <200702141329.l1EDTTvX019888@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/graphviz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19845 Modified Files: graphviz.spec Log Message: * Wed Feb 14 2007 Patrick "Jima" Laughton 2.12-6 - Removed patch, as tcl/tk got rolled back to 8.4 Index: graphviz.spec =================================================================== RCS file: /cvs/extras/rpms/graphviz/devel/graphviz.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- graphviz.spec 7 Feb 2007 14:55:06 -0000 1.33 +++ graphviz.spec 14 Feb 2007 13:28:57 -0000 1.34 @@ -7,13 +7,12 @@ #-- graphviz src.rpm -------------------------------------------------------- Name: graphviz Version: 2.12 -Release: 5%{?dist} +Release: 6%{?dist} License: CPL URL: http://www.graphviz.org/ Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.12.tar.gz Patch0: %{name}-php5.patch -Patch1: %{name}-tk8.5.patch # graphviz is relocatable Prefix: /usr @@ -398,9 +397,6 @@ %prep %setup -q %patch0 -p1 -%if "%fedora" >= "7" -%patch1 -p1 -%endif %build # XXX ix86 only used to have -ffast-math, let's use everywhere @@ -437,6 +433,9 @@ #-- changelog -------------------------------------------------- %changelog +* Wed Feb 14 2007 Patrick "Jima" Laughton 2.12-6 +- Removed patch, as tcl/tk got rolled back to 8.4 + * Wed Feb 07 2007 Patrick "Jima" Laughton 2.12-5 - Added patch for slightly broken tk 8.5 From fedora-extras-commits at redhat.com Wed Feb 14 13:29:32 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 14 Feb 2007 08:29:32 -0500 Subject: rpms/gnucap/devel .cvsignore, 1.2, 1.3 gnucap-0.34-debian.patch, 1.1, 1.2 gnucap.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200702141329.l1EDTWUN019899@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gnucap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19854 Modified Files: .cvsignore gnucap-0.34-debian.patch gnucap.spec sources Log Message: * Wed Feb 14 2007 Hans de Goede 0.35-1 - New upstream release 0.35 - Link with -lncurses instead of -ltermcap (bz 226771) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnucap/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 27 Apr 2006 19:29:32 -0000 1.2 +++ .cvsignore 14 Feb 2007 13:28:59 -0000 1.3 @@ -1 +1 @@ -gnucap-0.34.tar.gz +gnucap-0.35.tar.gz gnucap-0.34-debian.patch: Index: gnucap-0.34-debian.patch =================================================================== RCS file: /cvs/extras/rpms/gnucap/devel/gnucap-0.34-debian.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnucap-0.34-debian.patch 27 Apr 2006 19:29:32 -0000 1.1 +++ gnucap-0.34-debian.patch 14 Feb 2007 13:28:59 -0000 1.2 @@ -1,5 +1,5 @@ ---- gnucap-0.34.orig/doc/whatisit -+++ gnucap-0.34/doc/whatisit +--- gnucap-0.35/doc/whatisit.debian 2000-08-16 10:15:00.000000000 +0200 ++++ gnucap-0.35/doc/whatisit 2007-02-14 13:04:05.000000000 +0100 @@ -1,4 +1,4 @@ -ACS is a general purpose circuit simulator. It performs nonlinear +Gnucap is a general purpose circuit simulator. It performs nonlinear @@ -58,9 +58,9 @@ Albert Davis aldavis at ieee.org ---- gnucap-0.34.orig/src/bm.cc -+++ gnucap-0.34/src/bm.cc -@@ -207,7 +207,8 @@ +--- gnucap-0.35/src/bm.cc.debian 2006-08-28 08:15:43.000000000 +0200 ++++ gnucap-0.35/src/bm.cc 2007-02-14 13:04:05.000000000 +0100 +@@ -141,7 +141,8 @@ /*--------------------------------------------------------------------------*/ void EVAL_BM_ACTION_BASE::tr_finish_tdv(ELEMENT* d, double val)const { @@ -70,19 +70,19 @@ tr_final_adjust(&(d->_y0), false); } /*--------------------------------------------------------------------------*/ ---- gnucap-0.34.orig/src/e_card.h -+++ gnucap-0.34/src/e_card.h -@@ -32,6 +32,7 @@ - // external +--- gnucap-0.35/src/e_card.h.debian 2006-08-28 08:15:43.000000000 +0200 ++++ gnucap-0.35/src/e_card.h 2007-02-14 13:04:05.000000000 +0100 +@@ -35,6 +35,7 @@ + class CARD_LIST; class CS; class COMMON_COMPONENT; +CARD_LIST::fat_iterator findbranch(CS&,CARD_LIST::fat_iterator); /*--------------------------------------------------------------------------*/ class CARD : public CKT_BASE { private: ---- gnucap-0.34.orig/src/d_vcvs.cc -+++ gnucap-0.34/src/d_vcvs.cc -@@ -58,7 +58,8 @@ +--- gnucap-0.35/src/d_vcvs.cc.debian 2006-08-28 08:15:43.000000000 +0200 ++++ gnucap-0.35/src/d_vcvs.cc 2007-02-14 13:04:05.000000000 +0100 +@@ -61,7 +61,8 @@ assert(_y0.f0 != LINEAR); store_values(); q_load(); @@ -92,33 +92,33 @@ _m0 *= -_loss0; }else{ assert(conchk(_loss0, 1./OPT::shortckt)); ---- gnucap-0.34.orig/src/u_sdp.h -+++ gnucap-0.34/src/u_sdp.h -@@ -29,6 +29,9 @@ - #include "ap.h" +--- gnucap-0.35/src/u_sdp.h.debian 2006-08-28 08:15:43.000000000 +0200 ++++ gnucap-0.35/src/u_sdp.h 2007-02-14 13:04:05.000000000 +0100 +@@ -32,6 +32,9 @@ /*--------------------------------------------------------------------------*/ class OMSTREAM; + class CARD_LIST; +class SDP; +bool get(CS& cmd, const std::string& key, SDP* value, + AP_MOD mod, double scale); /*--------------------------------------------------------------------------*/ class SDP { - friend bool get(CS& cmd, const std::string& key, SDP* value, ---- gnucap-0.34.orig/src/e_storag.cc -+++ gnucap-0.34/src/e_storag.cc + friend bool get(CS& cmd, const std::string& key, SDP* value); +--- gnucap-0.35/src/e_storag.cc.debian 2006-08-28 08:15:43.000000000 +0200 ++++ gnucap-0.35/src/e_storag.cc 2007-02-14 13:04:05.000000000 +0100 @@ -78,7 +78,8 @@ _dt = NOT_VALID; - _i0 = _q[0] = _q[1] = _q[2] = _q[3] = FPOLY1(0., 0., 0.); + _i0 = _q[0] = _q[1] = _q[2] = FPOLY1(0., 0., 0.); _it1_f0 = 0.; - _m1 = _m0 = CPOLY1(0., 0., 0.); + CPOLY1 cp1(0., 0., 0.); + _m1 = _m0 = cp1; assert(_loss0 == 0.); assert(_loss1 == 0.); - if (!using_tr_eval()){ ---- gnucap-0.34.orig/src/d_admit.cc -+++ gnucap-0.34/src/d_admit.cc -@@ -56,7 +56,8 @@ + if (!using_tr_eval()) { +--- gnucap-0.35/src/d_admit.cc.debian 2006-08-28 08:15:43.000000000 +0200 ++++ gnucap-0.35/src/d_admit.cc 2007-02-14 13:04:05.000000000 +0100 +@@ -57,7 +57,8 @@ assert(_y0.f0 != LINEAR); store_values(); q_load(); @@ -128,7 +128,7 @@ }else{ assert(_y0.f0 == LINEAR); assert(_y0.f1 == value()); -@@ -171,7 +172,8 @@ +@@ -172,7 +173,8 @@ bool DEV_CPOLY_G::do_tr() { assert(_values); @@ -138,9 +138,9 @@ return do_tr_con_chk_and_q(); } /*--------------------------------------------------------------------------*/ -@@ -193,7 +195,8 @@ - }} - }} +@@ -195,7 +197,8 @@ + } + } trace2("", _values[0], c0); - _m0 = CPOLY1(0., c0, _values[1]); + CPOLY1 cp1(0., c0, _values[1]); @@ -148,8 +148,8 @@ return do_tr_con_chk_and_q(); } ---- gnucap-0.34.orig/src/e_compon.h -+++ gnucap-0.34/src/e_compon.h +--- gnucap-0.35/src/e_compon.h.debian 2006-08-28 08:15:43.000000000 +0200 ++++ gnucap-0.35/src/e_compon.h 2007-02-14 13:04:05.000000000 +0100 @@ -43,6 +43,9 @@ } /*--------------------------------------------------------------------------*/ @@ -160,21 +160,21 @@ // pass this as an argument to a common constructor to mark it as static, // so it won't be deleted /*--------------------------------------------------------------------------*/ ---- gnucap-0.34.orig/src/d_cap.cc -+++ gnucap-0.34/src/d_cap.cc -@@ -49,7 +49,8 @@ +--- gnucap-0.35/src/d_cap.cc.debian 2006-08-28 08:15:43.000000000 +0200 ++++ gnucap-0.35/src/d_cap.cc 2007-02-14 13:05:47.000000000 +0100 +@@ -47,7 +47,8 @@ + _i0.x = _y0.x; _i0.f0 = differentiate(); _i0.f1 = tr_c_to_g(_q[0].f1, _i0.f1); - - _m0 = CPOLY1(_i0); + CPOLY1 cp1(_i0); + _m0 = cp1; return converged(); } /*--------------------------------------------------------------------------*/ -@@ -172,7 +173,8 @@ - }} - }} +@@ -191,7 +192,8 @@ + assert(_vi0[i] == _vi0[i]); + } - _m0 = CPOLY1(0., _vi0[0], _vi0[1]); + CPOLY1 cp1(0., _vi0[0], _vi0[1]); @@ -182,9 +182,9 @@ return do_tr_con_chk_and_q(); } /*--------------------------------------------------------------------------*/ ---- gnucap-0.34.orig/src/l_timer.h -+++ gnucap-0.34/src/l_timer.h -@@ -25,6 +25,8 @@ +--- gnucap-0.35/src/l_timer.h.debian 2006-08-28 08:15:43.000000000 +0200 ++++ gnucap-0.35/src/l_timer.h 2007-02-14 13:04:05.000000000 +0100 +@@ -26,6 +26,8 @@ #define U_TIMER_H #include "io_.h" /*--------------------------------------------------------------------------*/ @@ -193,102 +193,9 @@ class TIMER { private: enum {_T_NAME_LEN = 8}; ---- gnucap-0.34.orig/ibis/model-in.cc -+++ gnucap-0.34/ibis/model-in.cc -@@ -145,23 +145,23 @@ - /*--------------------------------------------------------------------------*/ - void Model_Base::Type::parse(CS& file) - { -- set(file, "Terminator", &_type, mtTERMINATOR) -- || set(file, "Input_ECL", &_type, mtINPUT_ECL) -- || set(file, "Input", &_type, mtINPUT) -- || set(file, "I/O_open_sink", &_type, mtIO_OPEN_SINK) -- || set(file, "I/O_open_drain", &_type, mtIO_OPEN_DRAIN) -- || set(file, "I/O_open_source",&_type, mtIO_OPEN_SOURCE) -- || set(file, "I/O_ECL", &_type, mtIO_ECL) -- || set(file, "I/O", &_type, mtIO) -- || set(file, "3-state_ECL", &_type, mt3STATE_ECL) -- || set(file, "3-state", &_type, mt3STATE) -- || set(file, "Output_ECL", &_type, mtOUTPUT_ECL) -- || set(file, "Output", &_type, mtOUTPUT) -- || set(file, "Open_sink", &_type, mtOPEN_SINK) -- || set(file, "Open_drain", &_type, mtOPEN_DRAIN) -- || set(file, "Open_source", &_type, mtOPEN_SOURCE) -- || set(file, "Series_switch", &_type, mtSERIES_SWITCH) -- || set(file, "Series", &_type, mtSERIES) -+ set(file, "Terminator", (int*)&_type, (int)mtTERMINATOR) -+ || set(file, "Input_ECL", (int*)&_type, (int)mtINPUT_ECL) -+ || set(file, "Input", (int*)&_type, (int)mtINPUT) -+ || set(file, "I/O_open_sink", (int*)&_type, (int)mtIO_OPEN_SINK) -+ || set(file, "I/O_open_drain", (int*)&_type, (int)mtIO_OPEN_DRAIN) -+ || set(file, "I/O_open_source",(int*)&_type, (int)mtIO_OPEN_SOURCE) -+ || set(file, "I/O_ECL", (int*)&_type, (int)mtIO_ECL) -+ || set(file, "I/O", (int*)&_type, (int)mtIO) -+ || set(file, "3-state_ECL", (int*)&_type, (int)mt3STATE_ECL) -+ || set(file, "3-state", (int*)&_type, (int)mt3STATE) -+ || set(file, "Output_ECL", (int*)&_type, (int)mtOUTPUT_ECL) -+ || set(file, "Output", (int*)&_type, (int)mtOUTPUT) -+ || set(file, "Open_sink", (int*)&_type, (int)mtOPEN_SINK) -+ || set(file, "Open_drain", (int*)&_type, (int)mtOPEN_DRAIN) -+ || set(file, "Open_source", (int*)&_type, (int)mtOPEN_SOURCE) -+ || set(file, "Series_switch", (int*)&_type, (int)mtSERIES_SWITCH) -+ || set(file, "Series", (int*)&_type, (int)mtSERIES) - || file.warn(0, "illegal model type"); - } - /*--------------------------------------------------------------------------*/ -@@ -235,8 +235,8 @@ - /*--------------------------------------------------------------------------*/ - void IO_Base::Polarity::parse(CS& file) - { -- set(file, "Non-Inverting", &_p, pNON_INVERTING) -- || set(file, "Inverting", &_p, pINVERTING) -+ set(file, "Non-Inverting", (int*)&_p, (int)pNON_INVERTING) -+ || set(file, "Inverting", (int*)&_p, (int)pINVERTING) - || file.warn(0, "need Inverting or Non-Inverting"); - } - /*--------------------------------------------------------------------------*/ ---- gnucap-0.34.orig/ibis/base.h -+++ gnucap-0.34/ibis/base.h -@@ -40,7 +40,7 @@ - class Base - { - private: -- explicit Base(const Base&) {unreachable();} -+// explicit Base(const Base&) {unreachable();} - // This private base copy constructor inhibits generation of - // copy constructors for its derived classes. - protected: ---- gnucap-0.34.orig/ibis/comp-in.cc -+++ gnucap-0.34/ibis/comp-in.cc -@@ -24,8 +24,8 @@ - /*--------------------------------------------------------------------------*/ - void Component::Pin_Die::parse(CS& file) - { -- set(file, "Pin", &_pd, pdPIN) -- || set(file, "Die", &_pd, pdDIE) -+ set(file, "Pin", (int*)&_pd, (int)pdPIN) -+ || set(file, "Die", (int*)&_pd, (int)pdDIE) - || file.warn(0, "need Pin or Die"); - } - /*--------------------------------------------------------------------------*/ ---- gnucap-0.34.orig/ibis/file-in.cc -+++ gnucap-0.34/ibis/file-in.cc -@@ -25,9 +25,9 @@ - /*--------------------------------------------------------------------------*/ - void Redistribution::parse(CS& file) - { -- set(file, "Yes", &_r, dYES) -- || set(file, "No", &_r, dNO) -- || set(file, "Specific",&_r, dSPECIFIC) -+ set(file, "Yes", (int*)&_r, (int)dYES) -+ || set(file, "No", (int*)&_r, (int)dNO) -+ || set(file, "Specific",(int*)&_r, (int)dSPECIFIC) - || file.warn(0, "need Yes, No, or Specific"); - } - /*--------------------------------------------------------------------------*/ ---- gnucap-0.34.orig/modelgen/mg_.h -+++ gnucap-0.34/modelgen/mg_.h -@@ -118,7 +118,7 @@ +--- gnucap-0.35/modelgen/mg_.h.debian 2006-08-28 07:45:36.000000000 +0200 ++++ gnucap-0.35/modelgen/mg_.h 2007-02-14 13:04:05.000000000 +0100 +@@ -120,7 +120,7 @@ } T* p = new T(file); {if (!file.stuck(&here)) { @@ -297,7 +204,7 @@ }else { delete p; file.warn(0, "not valid here"); -@@ -137,7 +137,7 @@ +@@ -141,7 +141,7 @@ int here = file.cursor(); T* m = new T(file); {if (!file.stuck(&here)) { @@ -306,8 +213,8 @@ }else{ delete m; file.warn(0, "what's this??"); ---- gnucap-0.34.orig/examples/runall -+++ gnucap-0.34/examples/runall +--- gnucap-0.35/examples/runall.debian 2000-09-05 06:22:00.000000000 +0200 ++++ gnucap-0.35/examples/runall 2007-02-14 13:04:05.000000000 +0100 @@ -1,16 +1,16 @@ -# -$1 -b eq2-145.ckt Index: gnucap.spec =================================================================== RCS file: /cvs/extras/rpms/gnucap/devel/gnucap.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gnucap.spec 28 Aug 2006 11:31:29 -0000 1.2 +++ gnucap.spec 14 Feb 2007 13:28:59 -0000 1.3 @@ -1,6 +1,6 @@ Name: gnucap -Version: 0.34 -Release: 3%{?dist} +Version: 0.35 +Release: 1%{?dist} Summary: The Gnu Circuit Analysis Package Group: Applications/Engineering License: GPL @@ -22,29 +22,25 @@ %prep %setup -q -%patch0 -p1 -z .debian -%{__sed} -i 's!/usr/lib!%{_libdir}!g' src/configure -%{__sed} -i 's!ln -s!ln!g' src/Make1 -%{__sed} -i 's!ln -s!ln!g' src/Make.aux -mv doc/acs-tutorial doc/gnucap-tutorial +%patch0 -p1 +# use ncurses instead of termcap (bz 226771) +sed -i 's/-ltermcap/-lncurses/g' configure %build -# Don't use %%configure because this is not an autotools-generated -# configure script and will choke on some of the default configure switches. -./configure --prefix=%{_prefix} -make %{?_smp_mflags} \ - CCFLAGS="$RPM_OPT_FLAGS -DHAS_READLINE -DUNIX -DNDEBUG -I. -I.." +%configure +make %{?_smp_mflags} %install # make install uses hardcoded /usr/bin etc paths, so we must do this DIY rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_mandir}/man1 -install -m 755 src/O/gnucap $RPM_BUILD_ROOT%{_bindir} -install -m 755 ibis/O/gnucap-ibis $RPM_BUILD_ROOT%{_bindir} -install -m 755 modelgen/O/gnucap-modelgen $RPM_BUILD_ROOT%{_bindir} -install -m 644 doc/gnucap.1 doc/gnucap-ibis.1 $RPM_BUILD_ROOT%{_mandir}/man1 +make install DESTDIR=$RPM_BUILD_ROOT + +# for %%doc +rm -fr $RPM_BUILD_ROOT%{_datadir}/%{name} +mv doc/acs-tutorial doc/gnucap-tutorial +rm examples/Makefile* %clean @@ -54,12 +50,16 @@ %files %defattr(-,root,root,-) %doc doc/COPYING doc/history doc/relnotes.* doc/gnucap-tutorial doc/whatisit -%doc man/gnucap-man.pdf man/html +%doc man/gnucap-man.pdf examples %{_bindir}/%{name}* -%{_mandir}/man1/%{name}*.1.gz +%{_mandir}/man1/%{name}.1.gz %changelog +* Wed Feb 14 2007 Hans de Goede 0.35-1 +- New upstream release 0.35 +- Link with -lncurses instead of -ltermcap (bz 226771) + * Mon Aug 28 2006 Hans de Goede 0.34-3 - FE6 Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnucap/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 27 Apr 2006 19:29:32 -0000 1.2 +++ sources 14 Feb 2007 13:28:59 -0000 1.3 @@ -1 +1 @@ -0d346f02a38c544fda6f8d7ec4f8b45e gnucap-0.34.tar.gz +16fc7cacac987ea556753d030f2595b9 gnucap-0.35.tar.gz From fedora-extras-commits at redhat.com Wed Feb 14 13:35:24 2007 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Wed, 14 Feb 2007 08:35:24 -0500 Subject: rpms/uudeview/devel uudeview.spec,1.12,1.13 Message-ID: <200702141335.l1EDZOSf020092@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/uudeview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20060 Modified Files: uudeview.spec Log Message: * Wed Feb 14 2007 Adrian Reber - 0.5.20-11 - rebuilt - fix for multi-lib conflict (bz #228390) renamed uulib to uulib-devel Index: uudeview.spec =================================================================== RCS file: /cvs/extras/rpms/uudeview/devel/uudeview.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- uudeview.spec 5 Feb 2007 21:44:20 -0000 1.12 +++ uudeview.spec 14 Feb 2007 13:34:52 -0000 1.13 @@ -1,6 +1,6 @@ Name: uudeview Version: 0.5.20 -Release: 10 +Release: 11 License: GPL Group: Applications/File @@ -21,12 +21,14 @@ automatic splitting of large encodes, automatic posting. A must for anyone serious encoding/decoding. -%package -n uulib +%package -n uulib-devel Summary: Binary news message decoding library Group: Development/Libraries -Provides: uulib-devel = %{version}-%{release} +Provides: uulib = {version}-%{release} +Obsoletes: uulib < 0.5.20-11 -%description -n uulib + +%description -n uulib-devel uulib is a library of functions for decoding uuencoded, xxencoded, Base64-encoded, and BinHex-encoded data. It is also capable of encoding data in any of these formats except BinHex. @@ -76,13 +78,18 @@ %{_bindir}/xdeview %{_datadir}/applications/*.desktop -%files -n uulib +%files -n uulib-devel %defattr(-,root,root,-) %doc COPYING HISTORY doc/library.pdf %{_includedir}/*.h %{_libdir}/*.a %changelog +* Wed Feb 14 2007 Adrian Reber - 0.5.20-11 +- rebuilt +- fix for multi-lib conflict (bz #228390) + renamed uulib to uulib-devel + * Mon Feb 05 2007 Adrian Reber - 0.5.20-10 - rebuilt From fedora-extras-commits at redhat.com Wed Feb 14 13:41:30 2007 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Wed, 14 Feb 2007 08:41:30 -0500 Subject: rpms/gnubg/devel gnubg.spec,1.6,1.7 Message-ID: <200702141341.l1EDfUJq020214@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/extras/rpms/gnubg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20197 Modified Files: gnubg.spec Log Message: Buildrequires fix. Index: gnubg.spec =================================================================== RCS file: /cvs/extras/rpms/gnubg/devel/gnubg.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gnubg.spec 14 Feb 2007 13:09:37 -0000 1.6 +++ gnubg.spec 14 Feb 2007 13:40:58 -0000 1.7 @@ -3,7 +3,7 @@ Group: Amusements/Games Summary: A backgammon game and analyser Version: 20061119 -Release: 3%{?dist} +Release: 4%{?dist} Source0: http://www.gnubg.org/media/sources/%{name}-source-MAIN-%{version}.tar.gz Source1: gnubg.weights Source2: gnubg.desktop @@ -28,6 +28,11 @@ BuildRequires: audiofile-devel BuildRequires: cairo-devel BuildRequires: libxml2-devel +BuildRequires: atk-devel +BuildRequires: pango-devel +BuildRequires: libpng-devel +BuildRequires: readline-devel +BuildRequires: python-devel Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -132,6 +137,8 @@ %{_datadir}/gnubg/flags %changelog +* Wed Feb 14 2007 Jon Ciesla - 20061119-4 +- BuildRequires fix. * Wed Feb 14 2007 Jon Ciesla - 20061119-3 - BuildRequires fix. * Tue Feb 13 2007 Jon Ciesla - 20061119-2 From fedora-extras-commits at redhat.com Wed Feb 14 13:44:01 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb)) Date: Wed, 14 Feb 2007 08:44:01 -0500 Subject: rpms/qt4-qsa/FC-5 qt4-qsa-fhs.patch,NONE,1.1 qt4-qsa.spec,1.6,1.7 Message-ID: <200702141344.l1EDi1C9020282@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/qt4-qsa/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20255 Modified Files: qt4-qsa.spec Added Files: qt4-qsa-fhs.patch Log Message: fix Bug 210544 qt4-qsa-fhs.patch: --- NEW FILE qt4-qsa-fhs.patch --- --- qsa-x11-opensource-1.2.2/src/qsa/qsa.pro.prefix 2006-12-08 14:02:25.000000000 +0100 +++ qsa-x11-opensource-1.2.2/src/qsa/qsa.pro 2007-02-10 17:59:43.000000000 +0100 @@ -83,16 +83,16 @@ ..\ide\qsworkbench.h !isEmpty(QSA_INSTALL_PREFIX) { - headers.path = $$QSA_INSTALL_PREFIX/include + headers.path = $$(QTINC) win32 { target.path = $$QSA_INSTALL_PREFIX/bin } else { - target.path = $$QSA_INSTALL_PREFIX/lib + target.path = $$(QTLIB) } prf.files = qsa.prf - prf.path = $$QSA_INSTALL_PREFIX/mkspecs/features + prf.path = $$(QTDATA)/mkspecs/features documentation.files = ../../doc/html/* - documentation.path = $$QSA_INSTALL_PREFIX/doc/html + documentation.path = $$(QTDATA)/doc/html INSTALLS += headers target prf documentation } Index: qt4-qsa.spec =================================================================== RCS file: /cvs/extras/rpms/qt4-qsa/FC-5/qt4-qsa.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- qt4-qsa.spec 11 Jan 2007 09:45:33 -0000 1.6 +++ qt4-qsa.spec 14 Feb 2007 13:43:29 -0000 1.7 @@ -1,27 +1,20 @@ Name: qt4-qsa Summary: Qt Script for Applications Version: 1.2.2 -Release: 1%{?dist} +Release: 2%{?dist} BuildRequires: qt4-devel URL: http://www.trolltech.com/products/qt/addon/qsa License: GPL Group: Development/Libraries Source: ftp://ftp.trolltech.com/qsa/source/qsa-x11-opensource-%{version}.tar.gz +Patch0: qt4-qsa-fhs.patch Buildroot: %{_tmppath}/qsa-%{version}-%{release}-root-%(%{__id_u} -n) -%define qtdir %(qmake-qt4 -query QT_INSTALL_PREFIX) - -# fix the the broken include path -%define qtinc %{qtdir}/include -%ifarch x86_64 -%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS)/qt4/lib64 -%else -%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS)/qt4/lib -%endif - -#%%define qtinc %(qmake4 -query QT_INSTALL_HEADERS) -#%%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS) +%define qtdir %(qmake-qt4 -query QT_INSTALL_PREFIX) +%define qtinc %(qmake-qt4 -query QT_INSTALL_HEADERS) +%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS) +%define qtdata %(qmake-qt4 -query QT_INSTALL_DATA) %package devel @@ -40,22 +33,25 @@ %prep %setup -q -n qsa-x11-opensource-%{version} +%patch0 -p1 -z .fhs %build export QTDIR=%{qtdir} -export PATH=$QTDIR/bin:$PATH +export PATH=%{qtlib}/qt4/bin:$PATH export QTINC=%{qtinc} export QTLIB=%{qtlib} +export QTDATA=%{qtdata} + #without qt3support #./configure -release -new-editor -prefix %{qtdir} ./configure -release -prefix %{qtdir} #./configure -release -make %{?_smp_mflags} -e INSTALL_ROOT=$RPM_BUILD_ROOT sub-src +make %{?_smp_mflags} sub-src %install rm -rf $RPM_BUILD_ROOT -make %{?_smp_mflags} -e INSTALL_ROOT=$RPM_BUILD_ROOT install -rm -rf $RPM_BUILD_ROOT/%{qtdir}/doc +make -e INSTALL_ROOT=$RPM_BUILD_ROOT install +rm -rf $RPM_BUILD_ROOT/%{qtdata}/doc #remove uneeded files rm -f examples/qsa.prf find examples -name "Makefile.*" | xargs rm -f @@ -71,12 +67,6 @@ install -p -m 644 src/ide/qsworkbench.h $RPM_BUILD_ROOT%{qtinc}/ install -p -m 644 src/qsa/qsutilfactory.h $RPM_BUILD_ROOT%{qtinc}/ -%if "%{_lib}" != "lib" -test -d $RPM_BUILD_ROOT%{qtdir}/lib && \ -mkdir -p $RPM_BUILD_ROOT%{qtlib} && \ -mv $RPM_BUILD_ROOT%{qtdir}/lib/* $RPM_BUILD_ROOT%{qtlib}/ -%endif - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -94,12 +84,15 @@ %defattr(0644,root,root) %{qtinc}/* %{qtlib}/libqsa.so -%{qtdir}/mkspecs/features/qsa.prf +%{qtdata}/mkspecs/features/qsa.prf %defattr(0644,root,root,0755) %doc examples %doc doc/html %changelog +* Thu Feb 13 2007 Frank B??ttner - 1.2.2-2%{?dist} +- fix Bug 210544, thanks Hans de Goede + * Thu Jan 11 2007 Frank B??ttner - 1.2.2-1%{?dist} - update to 1.2.2 - add warning about end of life From fedora-extras-commits at redhat.com Wed Feb 14 14:01:13 2007 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Wed, 14 Feb 2007 09:01:13 -0500 Subject: rpms/gnubg/devel gnubg.spec,1.7,1.8 Message-ID: <200702141401.l1EE1DGo023821@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/extras/rpms/gnubg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20390 Modified Files: gnubg.spec Log Message: Buildrequires fix. Index: gnubg.spec =================================================================== RCS file: /cvs/extras/rpms/gnubg/devel/gnubg.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gnubg.spec 14 Feb 2007 13:40:58 -0000 1.7 +++ gnubg.spec 14 Feb 2007 14:00:41 -0000 1.8 @@ -3,7 +3,7 @@ Group: Amusements/Games Summary: A backgammon game and analyser Version: 20061119 -Release: 4%{?dist} +Release: 5%{?dist} Source0: http://www.gnubg.org/media/sources/%{name}-source-MAIN-%{version}.tar.gz Source1: gnubg.weights Source2: gnubg.desktop @@ -33,6 +33,7 @@ BuildRequires: libpng-devel BuildRequires: readline-devel BuildRequires: python-devel +BuildRequires: glib-devel Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -137,6 +138,8 @@ %{_datadir}/gnubg/flags %changelog +* Wed Feb 14 2007 Jon Ciesla - 20061119-5 +- BuildRequires fix. * Wed Feb 14 2007 Jon Ciesla - 20061119-4 - BuildRequires fix. * Wed Feb 14 2007 Jon Ciesla - 20061119-3 From fedora-extras-commits at redhat.com Wed Feb 14 14:17:31 2007 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Wed, 14 Feb 2007 09:17:31 -0500 Subject: rpms/gnubg/devel gnubg.spec,1.8,1.9 Message-ID: <200702141417.l1EEHVWr024147@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/extras/rpms/gnubg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24125 Modified Files: gnubg.spec Log Message: Buildrequires fix, hopefully the last. . . Index: gnubg.spec =================================================================== RCS file: /cvs/extras/rpms/gnubg/devel/gnubg.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gnubg.spec 14 Feb 2007 14:00:41 -0000 1.8 +++ gnubg.spec 14 Feb 2007 14:16:59 -0000 1.9 @@ -3,7 +3,7 @@ Group: Amusements/Games Summary: A backgammon game and analyser Version: 20061119 -Release: 5%{?dist} +Release: 6%{?dist} Source0: http://www.gnubg.org/media/sources/%{name}-source-MAIN-%{version}.tar.gz Source1: gnubg.weights Source2: gnubg.desktop @@ -34,6 +34,7 @@ BuildRequires: readline-devel BuildRequires: python-devel BuildRequires: glib-devel +BuildRequires: freetype-devel Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -138,6 +139,8 @@ %{_datadir}/gnubg/flags %changelog +* Wed Feb 14 2007 Jon Ciesla - 20061119-6 +- BuildRequires fix. * Wed Feb 14 2007 Jon Ciesla - 20061119-5 - BuildRequires fix. * Wed Feb 14 2007 Jon Ciesla - 20061119-4 From fedora-extras-commits at redhat.com Wed Feb 14 14:30:32 2007 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Wed, 14 Feb 2007 09:30:32 -0500 Subject: rpms/ppracer/devel ppracer.spec,1.18,1.19 Message-ID: <200702141430.l1EEUWg4024487@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/ppracer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24449 Modified Files: ppracer.spec Log Message: rebuild Index: ppracer.spec =================================================================== RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- ppracer.spec 2 Feb 2007 14:08:24 -0000 1.18 +++ ppracer.spec 14 Feb 2007 14:29:59 -0000 1.19 @@ -7,7 +7,7 @@ Summary: 3D racing game featuring Tux Name: ppracer Version: 0.3.1 -Release: 9%{?dist} +Release: 10%{?dist} License: GPL Group: Amusements/Games URL: http://racer.planetpenguin.de @@ -94,6 +94,9 @@ %{_datadir}/applications/%{desktop_vendor}-%{name}.desktop %changelog +* Wed Feb 14 2007 Nils Philippsen 0.3.1-10 +- rebuild + * Fri Feb 02 2007 Nils Philippsen 0.3.1-9 - rebuild From fedora-extras-commits at redhat.com Wed Feb 14 14:31:18 2007 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Wed, 14 Feb 2007 09:31:18 -0500 Subject: rpms/gnubg/devel gnubg.spec,1.9,1.10 Message-ID: <200702141431.l1EEVIaC024602@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/extras/rpms/gnubg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24495 Modified Files: gnubg.spec Log Message: Added flex. Index: gnubg.spec =================================================================== RCS file: /cvs/extras/rpms/gnubg/devel/gnubg.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gnubg.spec 14 Feb 2007 14:16:59 -0000 1.9 +++ gnubg.spec 14 Feb 2007 14:30:46 -0000 1.10 @@ -3,7 +3,7 @@ Group: Amusements/Games Summary: A backgammon game and analyser Version: 20061119 -Release: 6%{?dist} +Release: 7%{?dist} Source0: http://www.gnubg.org/media/sources/%{name}-source-MAIN-%{version}.tar.gz Source1: gnubg.weights Source2: gnubg.desktop @@ -35,6 +35,7 @@ BuildRequires: python-devel BuildRequires: glib-devel BuildRequires: freetype-devel +BuildRequires: flex Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -139,6 +140,8 @@ %{_datadir}/gnubg/flags %changelog +* Wed Feb 14 2007 Jon Ciesla - 20061119-7 +- BuildRequires fix. * Wed Feb 14 2007 Jon Ciesla - 20061119-6 - BuildRequires fix. * Wed Feb 14 2007 Jon Ciesla - 20061119-5 From fedora-extras-commits at redhat.com Wed Feb 14 14:51:55 2007 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Wed, 14 Feb 2007 09:51:55 -0500 Subject: rpms/gnubg/FC-5 .cvsignore, 1.2, 1.3 gnubg.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200702141451.l1EEptm5024976@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/extras/rpms/gnubg/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24952 Modified Files: .cvsignore gnubg.spec sources Log Message: Bumped to new upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnubg/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 6 Jun 2006 19:27:00 -0000 1.2 +++ .cvsignore 14 Feb 2007 14:51:23 -0000 1.3 @@ -1 +1 @@ -gnubg-20060530.tar.gz +gnubg-source-MAIN-20061119.tar.gz Index: gnubg.spec =================================================================== RCS file: /cvs/extras/rpms/gnubg/FC-5/gnubg.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnubg.spec 6 Jun 2006 19:27:00 -0000 1.1 +++ gnubg.spec 14 Feb 2007 14:51:23 -0000 1.2 @@ -2,9 +2,9 @@ License: GPL Group: Amusements/Games Summary: A backgammon game and analyser -Version: 20060530 -Release: 5%{?dist} -Source0: http://www.acepoint.de/GnuBG/sources/%{name}-%{version}.tar.gz +Version: 20061119 +Release: 7%{?dist} +Source0: http://www.gnubg.org/media/sources/%{name}-source-MAIN-%{version}.tar.gz Source1: gnubg.weights Source2: gnubg.desktop Source3: gnubg.png @@ -25,6 +25,17 @@ BuildRequires: ghostscript BuildRequires: info BuildRequires: desktop-file-utils +BuildRequires: audiofile-devel +BuildRequires: cairo-devel +BuildRequires: libxml2-devel +BuildRequires: atk-devel +BuildRequires: pango-devel +BuildRequires: libpng-devel +BuildRequires: readline-devel +BuildRequires: python-devel +BuildRequires: glib-devel +BuildRequires: freetype-devel +BuildRequires: flex Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -35,7 +46,7 @@ play GNU Backgammon using the command line or a graphical interface %prep -%setup -n %{name} +%setup -qn %{name} # convert man page from ISO-8859-1 to UTF8 /usr/bin/iconv -f ISO-8859-1 -t UTF8 gnubg.6 > gnubg.6.tmp /bin/mv gnubg.6.tmp gnubg.6 @@ -108,7 +119,7 @@ %{_datadir}/gnubg/doc %{_datadir}/gnubg/boards.xml %{_datadir}/gnubg/gnubg.game.sql -%{_datadir}/gnubg/gnubg.gtkrc +#%{_datadir}/gnubg/gnubg.gtkrc %{_datadir}/gnubg/gnubg_os0.bd %{_datadir}/gnubg/gnubg.weights %{_datadir}/gnubg/sounds @@ -119,9 +130,34 @@ %{_datadir}/icons/hicolor/32x32/apps/%{name}.png %{_datadir}/gnubg/scripts/*.py %{_datadir}/gnubg/scripts/*.pyc -%ghost %{_datadir}/gnubg/scripts/*.pyo +%{_datadir}/gnubg/scripts/*.py* +%{_datadir}/gnubg/flags/*.png +%dir %{_datadir}/gnubg/fonts +%{_datadir}/gnubg/fonts/* +%{_datadir}/gnubg/gnubg.gtkrc +%{_datadir}/gnubg/gnubg.wd +%{_datadir}/gnubg/scripts +%{_datadir}/gnubg/flags %changelog +* Wed Feb 14 2007 Jon Ciesla - 20061119-7 +- BuildRequires fix. +* Wed Feb 14 2007 Jon Ciesla - 20061119-6 +- BuildRequires fix. +* Wed Feb 14 2007 Jon Ciesla - 20061119-5 +- BuildRequires fix. +* Wed Feb 14 2007 Jon Ciesla - 20061119-4 +- BuildRequires fix. +* Wed Feb 14 2007 Jon Ciesla - 20061119-3 +- BuildRequires fix. +* Tue Feb 13 2007 Jon Ciesla - 20061119-2 +- Removed czech.png, added scripts, flags dirs. +* Tue Feb 13 2007 Jon Ciesla - 20061119-1 +- Bumped to upstream verion 20061119; Updated URL +* Wed Aug 30 2006 Joost Soeterbroek - 20060629-1 +- Rebuild for Fedora Extras 6; bumped to upstream version 20060629 +* Mon Jun 26 2006 - Joost Soeterbroek - 20060626-1 +- update to new upstream version * Tue Jun 6 2006 - Joost Soeterbroek - 20060530-5 - minor change in man file conversion, move from install to prep * Mon Jun 5 2006 - Joost Soeterbroek - 20060530-4 @@ -133,12 +169,12 @@ - remove /usr/share/info/dir - removed subpackages database- and sound- - removed configure option without-board3d -- sanitised %files section +- sanitised %%files section - ghost the .pyo files /usr/share/gnubg/scripts/ - added desktop file and icon * Thu Jun 1 2006 - Joost Soeterbroek - 20060530-2 -- moved autogen.sh from %build to %setup -- changed ./configure to %configure macro +- moved autogen.sh from %%build to %%setup +- changed ./configure to %%configure macro - removed install-strip - added directories to files sections - removed BuildReqs glib2 and autoconf Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnubg/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 Jun 2006 19:27:00 -0000 1.2 +++ sources 14 Feb 2007 14:51:23 -0000 1.3 @@ -1 +1 @@ -ae822f46286b2a719da4d84a3637b668 gnubg-20060530.tar.gz +e326528df95bdb68345c435d8df141a2 gnubg-source-MAIN-20061119.tar.gz From fedora-extras-commits at redhat.com Wed Feb 14 14:53:52 2007 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Wed, 14 Feb 2007 09:53:52 -0500 Subject: rpms/gnubg/FC-6 .cvsignore, 1.3, 1.4 gnubg.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200702141453.l1EErqIS025053@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/extras/rpms/gnubg/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25028 Modified Files: .cvsignore gnubg.spec sources Log Message: Bumped to new upstream. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnubg/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 30 Aug 2006 18:40:52 -0000 1.3 +++ .cvsignore 14 Feb 2007 14:53:20 -0000 1.4 @@ -1 +1 @@ -gnubg-20060629.tar.gz +gnubg-source-MAIN-20061119.tar.gz Index: gnubg.spec =================================================================== RCS file: /cvs/extras/rpms/gnubg/FC-6/gnubg.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gnubg.spec 30 Aug 2006 18:40:52 -0000 1.3 +++ gnubg.spec 14 Feb 2007 14:53:20 -0000 1.4 @@ -2,9 +2,9 @@ License: GPL Group: Amusements/Games Summary: A backgammon game and analyser -Version: 20060629 -Release: 1%{?dist} -Source0: http://www.acepoint.de/GnuBG/sources/%{name}-%{version}.tar.gz +Version: 20061119 +Release: 7%{?dist} +Source0: http://www.gnubg.org/media/sources/%{name}-source-MAIN-%{version}.tar.gz Source1: gnubg.weights Source2: gnubg.desktop Source3: gnubg.png @@ -25,6 +25,17 @@ BuildRequires: ghostscript BuildRequires: info BuildRequires: desktop-file-utils +BuildRequires: audiofile-devel +BuildRequires: cairo-devel +BuildRequires: libxml2-devel +BuildRequires: atk-devel +BuildRequires: pango-devel +BuildRequires: libpng-devel +BuildRequires: readline-devel +BuildRequires: python-devel +BuildRequires: glib-devel +BuildRequires: freetype-devel +BuildRequires: flex Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -35,7 +46,7 @@ play GNU Backgammon using the command line or a graphical interface %prep -%setup -n %{name} +%setup -qn %{name} # convert man page from ISO-8859-1 to UTF8 /usr/bin/iconv -f ISO-8859-1 -t UTF8 gnubg.6 > gnubg.6.tmp /bin/mv gnubg.6.tmp gnubg.6 @@ -119,9 +130,30 @@ %{_datadir}/icons/hicolor/32x32/apps/%{name}.png %{_datadir}/gnubg/scripts/*.py %{_datadir}/gnubg/scripts/*.pyc -%ghost %{_datadir}/gnubg/scripts/*.pyo +%{_datadir}/gnubg/scripts/*.py* +%{_datadir}/gnubg/flags/*.png +%dir %{_datadir}/gnubg/fonts +%{_datadir}/gnubg/fonts/* +%{_datadir}/gnubg/gnubg.gtkrc +%{_datadir}/gnubg/gnubg.wd +%{_datadir}/gnubg/scripts +%{_datadir}/gnubg/flags %changelog +* Wed Feb 14 2007 Jon Ciesla - 20061119-7 +- BuildRequires fix. +* Wed Feb 14 2007 Jon Ciesla - 20061119-6 +- BuildRequires fix. +* Wed Feb 14 2007 Jon Ciesla - 20061119-5 +- BuildRequires fix. +* Wed Feb 14 2007 Jon Ciesla - 20061119-4 +- BuildRequires fix. +* Wed Feb 14 2007 Jon Ciesla - 20061119-3 +- BuildRequires fix. +* Tue Feb 13 2007 Jon Ciesla - 20061119-2 +- Removed czech.png, added scripts, flags dirs. +* Tue Feb 13 2007 Jon Ciesla - 20061119-1 +- Bumped to upstream verion 20061119; Updated URL * Wed Aug 30 2006 Joost Soeterbroek - 20060629-1 - Rebuild for Fedora Extras 6; bumped to upstream version 20060629 * Mon Jun 26 2006 - Joost Soeterbroek - 20060626-1 @@ -137,12 +169,12 @@ - remove /usr/share/info/dir - removed subpackages database- and sound- - removed configure option without-board3d -- sanitised %files section +- sanitised %%files section - ghost the .pyo files /usr/share/gnubg/scripts/ - added desktop file and icon * Thu Jun 1 2006 - Joost Soeterbroek - 20060530-2 -- moved autogen.sh from %build to %setup -- changed ./configure to %configure macro +- moved autogen.sh from %%build to %%setup +- changed ./configure to %%configure macro - removed install-strip - added directories to files sections - removed BuildReqs glib2 and autoconf Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnubg/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Aug 2006 18:40:52 -0000 1.3 +++ sources 14 Feb 2007 14:53:20 -0000 1.4 @@ -1 +1 @@ -cd74f95712368e9d1edba25f5ad94996 gnubg-20060629.tar.gz +e326528df95bdb68345c435d8df141a2 gnubg-source-MAIN-20061119.tar.gz From fedora-extras-commits at redhat.com Wed Feb 14 15:22:01 2007 From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole)) Date: Wed, 14 Feb 2007 10:22:01 -0500 Subject: rpms/objectweb-anttask - New directory Message-ID: <200702141522.l1EFM1lW029666@cvs-int.fedora.redhat.com> Author: dbhole Update of /cvs/extras/rpms/objectweb-anttask In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29658/objectweb-anttask Log Message: Directory /cvs/extras/rpms/objectweb-anttask added to the repository From fedora-extras-commits at redhat.com Wed Feb 14 15:22:09 2007 From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole)) Date: Wed, 14 Feb 2007 10:22:09 -0500 Subject: rpms/objectweb-anttask/devel - New directory Message-ID: <200702141522.l1EFM9YV029690@cvs-int.fedora.redhat.com> Author: dbhole Update of /cvs/extras/rpms/objectweb-anttask/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29658/objectweb-anttask/devel Log Message: Directory /cvs/extras/rpms/objectweb-anttask/devel added to the repository From fedora-extras-commits at redhat.com Wed Feb 14 16:08:47 2007 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Wed, 14 Feb 2007 11:08:47 -0500 Subject: rpms/gnubg/devel gnubg.spec,1.10,1.11 Message-ID: <200702141608.l1EG8l7j001276@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/extras/rpms/gnubg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1257 Modified Files: gnubg.spec Log Message: Fixed dupes. Index: gnubg.spec =================================================================== RCS file: /cvs/extras/rpms/gnubg/devel/gnubg.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gnubg.spec 14 Feb 2007 14:30:46 -0000 1.10 +++ gnubg.spec 14 Feb 2007 16:08:15 -0000 1.11 @@ -3,7 +3,7 @@ Group: Amusements/Games Summary: A backgammon game and analyser Version: 20061119 -Release: 7%{?dist} +Release: 8%{?dist} Source0: http://www.gnubg.org/media/sources/%{name}-source-MAIN-%{version}.tar.gz Source1: gnubg.weights Source2: gnubg.desktop @@ -128,18 +128,16 @@ %{_mandir}/man6/gnubg.* %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/32x32/apps/%{name}.png -%{_datadir}/gnubg/scripts/*.py -%{_datadir}/gnubg/scripts/*.pyc -%{_datadir}/gnubg/scripts/*.py* -%{_datadir}/gnubg/flags/*.png %dir %{_datadir}/gnubg/fonts %{_datadir}/gnubg/fonts/* %{_datadir}/gnubg/gnubg.gtkrc %{_datadir}/gnubg/gnubg.wd -%{_datadir}/gnubg/scripts -%{_datadir}/gnubg/flags +%{_datadir}/gnubg/scripts/ +%{_datadir}/gnubg/flags/ %changelog +* Wed Feb 14 2007 Jon Ciesla - 20061119-8 +- Corrected some duplicate files * Wed Feb 14 2007 Jon Ciesla - 20061119-7 - BuildRequires fix. * Wed Feb 14 2007 Jon Ciesla - 20061119-6 From fedora-extras-commits at redhat.com Wed Feb 14 16:09:38 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 14 Feb 2007 11:09:38 -0500 Subject: rpms/sturmbahnfahrer/devel sturmbahnfahrer-1.2-fix-ode-assert.patch, NONE, 1.1 sturmbahnfahrer.spec, 1.4, 1.5 Message-ID: <200702141609.l1EG9chM001341@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/sturmbahnfahrer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1294 Modified Files: sturmbahnfahrer.spec Added Files: sturmbahnfahrer-1.2-fix-ode-assert.patch Log Message: * Wed Feb 14 2007 Hans de Goede 1.2-3 - Fix a bug triggering an assert in ode-0.8 sturmbahnfahrer-1.2-fix-ode-assert.patch: --- NEW FILE sturmbahnfahrer-1.2-fix-ode-assert.patch --- --- sturmbahnfahrer-1.2/doorstand.h~ 2007-02-14 16:59:48.000000000 +0100 +++ sturmbahnfahrer-1.2/doorstand.h 2007-02-14 16:59:48.000000000 +0100 @@ -61,6 +61,7 @@ dGeomSetPosition(trf_geom[i], initialpos[0],initialpos[1],initialpos[2]); dGeomSetPosition(box_geom[i], xlats[i][0], xlats[i][1], xlats[i][2]); } + dMassTranslate( &m_total, -m_total.c[0], -m_total.c[1], -m_total.c[2] ); dBodySetMass (chassis_body, &m_total); Index: sturmbahnfahrer.spec =================================================================== RCS file: /cvs/extras/rpms/sturmbahnfahrer/devel/sturmbahnfahrer.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sturmbahnfahrer.spec 29 Aug 2006 06:05:36 -0000 1.4 +++ sturmbahnfahrer.spec 14 Feb 2007 16:09:06 -0000 1.5 @@ -9,6 +9,7 @@ Source1: %{name}.desktop Source2: %{name}.png Patch0: sturmbahnfahrer-1.1-de-keyb.patch +Patch1: sturmbahnfahrer-1.2-fix-ode-assert.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: plib-devel ode-devel freeglut-devel desktop-file-utils BuildRequires: alsa-lib-devel @@ -21,6 +22,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 sed -i 's|$(ODEPREFIX)/lib/libode.a|-lode|' Makefile sed -i 's|/usr/share/games/sturmbahnfahrer|%{_datadir}/%{name}|' main.cxx @@ -73,6 +75,9 @@ %changelog +* Wed Feb 14 2007 Hans de Goede 1.2-3 +- Fix a bug triggering an assert in ode-0.8 + * Tue Aug 29 2006 Hans de Goede 1.2-2 - FE6 Rebuild From fedora-extras-commits at redhat.com Wed Feb 14 16:09:56 2007 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Wed, 14 Feb 2007 11:09:56 -0500 Subject: rpms/gnubg/FC-5 gnubg.spec,1.2,1.3 Message-ID: <200702141609.l1EG9u3a001412@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/extras/rpms/gnubg/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1321 Modified Files: gnubg.spec Log Message: Fixed dupes. Index: gnubg.spec =================================================================== RCS file: /cvs/extras/rpms/gnubg/FC-5/gnubg.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gnubg.spec 14 Feb 2007 14:51:23 -0000 1.2 +++ gnubg.spec 14 Feb 2007 16:09:24 -0000 1.3 @@ -3,7 +3,7 @@ Group: Amusements/Games Summary: A backgammon game and analyser Version: 20061119 -Release: 7%{?dist} +Release: 8%{?dist} Source0: http://www.gnubg.org/media/sources/%{name}-source-MAIN-%{version}.tar.gz Source1: gnubg.weights Source2: gnubg.desktop @@ -128,18 +128,16 @@ %{_mandir}/man6/gnubg.* %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/32x32/apps/%{name}.png -%{_datadir}/gnubg/scripts/*.py -%{_datadir}/gnubg/scripts/*.pyc -%{_datadir}/gnubg/scripts/*.py* -%{_datadir}/gnubg/flags/*.png %dir %{_datadir}/gnubg/fonts %{_datadir}/gnubg/fonts/* %{_datadir}/gnubg/gnubg.gtkrc %{_datadir}/gnubg/gnubg.wd -%{_datadir}/gnubg/scripts -%{_datadir}/gnubg/flags +%{_datadir}/gnubg/scripts/ +%{_datadir}/gnubg/flags/ %changelog +* Wed Feb 14 2007 Jon Ciesla - 20061119-8 +- Corrected some duplicate files * Wed Feb 14 2007 Jon Ciesla - 20061119-7 - BuildRequires fix. * Wed Feb 14 2007 Jon Ciesla - 20061119-6 From fedora-extras-commits at redhat.com Wed Feb 14 16:10:19 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 14 Feb 2007 11:10:19 -0500 Subject: rpms/ode/devel ode-0.8-install.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 ode.spec, 1.5, 1.6 sources, 1.3, 1.4 ode-0.6-lib64.patch, 1.2, NONE Message-ID: <200702141610.l1EGAJo7001421@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/ode/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1384 Modified Files: .cvsignore ode.spec sources Added Files: ode-0.8-install.patch Removed Files: ode-0.6-lib64.patch Log Message: * Wed Feb 14 2007 Hans de Goede 0.8-1 - New upstream release 0.8 ode-0.8-install.patch: --- NEW FILE ode-0.8-install.patch --- --- ode-0.8/Makefile.am.install 2007-02-07 22:15:35.000000000 +0100 +++ ode-0.8/Makefile.am 2007-02-14 15:17:36.000000000 +0100 @@ -25,13 +25,12 @@ if USE_SONAME install-exec-hook: - ln -s $(libdir)/@ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \ - $(libdir)/libode.so - ln -s $(libdir)/@ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \ - $(libdir)/@ODE_SONAME@ - ln -s $(libdir)/@ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \ - $(libdir)/@ODE_SONAME at .@ODE_REVISION@ - /sbin/ldconfig + ln -s @ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \ + $(DESTDIR)/$(libdir)/libode.so + ln -s @ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \ + $(DESTDIR)/$(libdir)/@ODE_SONAME@ + ln -s @ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \ + $(DESTDIR)/$(libdir)/@ODE_SONAME at .@ODE_REVISION@ else install-exec-hook: endif --- ode-0.8/Makefile.in.install 2007-02-11 16:40:20.000000000 +0100 +++ ode-0.8/Makefile.in 2007-02-14 15:17:43.000000000 +0100 @@ -660,13 +660,12 @@ rm -rf ${PACKAGE}-${VERSION} @USE_SONAME_TRUE at install-exec-hook: - at USE_SONAME_TRUE@ ln -s $(libdir)/@ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \ - at USE_SONAME_TRUE@ $(libdir)/libode.so - at USE_SONAME_TRUE@ ln -s $(libdir)/@ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \ - at USE_SONAME_TRUE@ $(libdir)/@ODE_SONAME@ - at USE_SONAME_TRUE@ ln -s $(libdir)/@ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \ - at USE_SONAME_TRUE@ $(libdir)/@ODE_SONAME at .@ODE_REVISION@ - at USE_SONAME_TRUE@ /sbin/ldconfig + at USE_SONAME_TRUE@ ln -s @ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \ + at USE_SONAME_TRUE@ $(DESTDIR)/$(libdir)/libode.so + at USE_SONAME_TRUE@ ln -s @ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \ + at USE_SONAME_TRUE@ $(DESTDIR)/$(libdir)/@ODE_SONAME@ + at USE_SONAME_TRUE@ ln -s @ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \ + at USE_SONAME_TRUE@ $(DESTDIR)/$(libdir)/@ODE_SONAME at .@ODE_REVISION@ @USE_SONAME_FALSE at install-exec-hook: # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ode/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 22 Sep 2006 12:33:04 -0000 1.3 +++ .cvsignore 14 Feb 2007 16:09:47 -0000 1.4 @@ -1 +1 @@ -ode-src-0.7.zip +ode-src-0.8.zip Index: ode.spec =================================================================== RCS file: /cvs/extras/rpms/ode/devel/ode.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ode.spec 4 Oct 2006 22:29:26 -0000 1.5 +++ ode.spec 14 Feb 2007 16:09:47 -0000 1.6 @@ -1,13 +1,13 @@ Name: ode -Version: 0.7 -Release: 2%{?dist} +Version: 0.8 +Release: 1%{?dist} Summary: High performance library for simulating rigid body dynamics Group: System Environment/Libraries License: BSD LGPL URL: http://www.ode.org Source0: http://dl.sourceforge.net/sourceforge/opende/ode-src-%{version}.zip Patch0: ode-0.6-configure.patch -Patch1: ode-0.6-lib64.patch +Patch1: ode-0.8-install.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libGL-devel libGLU-devel @@ -33,7 +33,7 @@ %prep %setup -q %patch0 -p1 -z .configure -%patch1 -p1 -z .lib64 +%patch1 -p1 -z .install # sigh stop autoxxx from rerunning because of our patches above. touch aclocal.m4 touch configure @@ -41,7 +41,7 @@ touch include/ode/config.h.in touch ode/src/Makefile.in # stop rpmlint from complaining about executable files in the debug package -chmod -x include/*/*.h ode/src/*.cpp +chmod -x ode/src/stepfast.cpp include/ode/collision_trimesh.h %build @@ -55,7 +55,6 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT%{_libdir}/libode.a -rm $RPM_BUILD_ROOT%{_libdir}/libode.so.0.6 %clean @@ -80,6 +79,9 @@ %changelog +* Wed Feb 14 2007 Hans de Goede 0.8-1 +- New upstream release 0.8 + * Thu Oct 05 2006 Christian Iseli 0.7-2 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ode/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 22 Sep 2006 12:33:04 -0000 1.3 +++ sources 14 Feb 2007 16:09:47 -0000 1.4 @@ -1 +1 @@ -b6727fef2cbb9ca812438bb774c9d6ec ode-src-0.7.zip +fb7462ba0af2fbc230cb1b3f79e0acbb ode-src-0.8.zip --- ode-0.6-lib64.patch DELETED --- From fedora-extras-commits at redhat.com Wed Feb 14 16:11:03 2007 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Wed, 14 Feb 2007 11:11:03 -0500 Subject: rpms/gnubg/FC-6 gnubg.spec,1.4,1.5 Message-ID: <200702141611.l1EGB3dN001489@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/extras/rpms/gnubg/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1459 Modified Files: gnubg.spec Log Message: Fixed dupes. Index: gnubg.spec =================================================================== RCS file: /cvs/extras/rpms/gnubg/FC-6/gnubg.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gnubg.spec 14 Feb 2007 14:53:20 -0000 1.4 +++ gnubg.spec 14 Feb 2007 16:10:31 -0000 1.5 @@ -3,7 +3,7 @@ Group: Amusements/Games Summary: A backgammon game and analyser Version: 20061119 -Release: 7%{?dist} +Release: 8%{?dist} Source0: http://www.gnubg.org/media/sources/%{name}-source-MAIN-%{version}.tar.gz Source1: gnubg.weights Source2: gnubg.desktop @@ -128,18 +128,16 @@ %{_mandir}/man6/gnubg.* %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/32x32/apps/%{name}.png -%{_datadir}/gnubg/scripts/*.py -%{_datadir}/gnubg/scripts/*.pyc -%{_datadir}/gnubg/scripts/*.py* -%{_datadir}/gnubg/flags/*.png %dir %{_datadir}/gnubg/fonts %{_datadir}/gnubg/fonts/* %{_datadir}/gnubg/gnubg.gtkrc %{_datadir}/gnubg/gnubg.wd -%{_datadir}/gnubg/scripts -%{_datadir}/gnubg/flags +%{_datadir}/gnubg/scripts/ +%{_datadir}/gnubg/flags/ %changelog +* Wed Feb 14 2007 Jon Ciesla - 20061119-8 +- Corrected some duplicate files * Wed Feb 14 2007 Jon Ciesla - 20061119-7 - BuildRequires fix. * Wed Feb 14 2007 Jon Ciesla - 20061119-6 From fedora-extras-commits at redhat.com Wed Feb 14 16:21:07 2007 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Wed, 14 Feb 2007 11:21:07 -0500 Subject: rpms/gnubg/FC-5 gnubg.spec,1.3,1.4 Message-ID: <200702141621.l1EGL7Rt001625@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/extras/rpms/gnubg/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1597 Modified Files: gnubg.spec Log Message: Possible FC5 build fix, gtkglext Index: gnubg.spec =================================================================== RCS file: /cvs/extras/rpms/gnubg/FC-5/gnubg.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gnubg.spec 14 Feb 2007 16:09:24 -0000 1.3 +++ gnubg.spec 14 Feb 2007 16:20:34 -0000 1.4 @@ -3,7 +3,7 @@ Group: Amusements/Games Summary: A backgammon game and analyser Version: 20061119 -Release: 8%{?dist} +Release: 8%{?dist}.1 Source0: http://www.gnubg.org/media/sources/%{name}-source-MAIN-%{version}.tar.gz Source1: gnubg.weights Source2: gnubg.desktop @@ -15,6 +15,7 @@ BuildRequires: arts-devel BuildRequires: gettext-devel BuildRequires: gtkglext-devel +BuildRequires: gtkglext BuildRequires: automake BuildRequires: bison BuildRequires: libtool @@ -136,6 +137,8 @@ %{_datadir}/gnubg/flags/ %changelog +* Wed Feb 14 2007 Jon Ciesla - 20061119-8.1 +- Added special Buildreq for FC5. * Wed Feb 14 2007 Jon Ciesla - 20061119-8 - Corrected some duplicate files * Wed Feb 14 2007 Jon Ciesla - 20061119-7 From fedora-extras-commits at redhat.com Wed Feb 14 16:22:42 2007 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 14 Feb 2007 11:22:42 -0500 Subject: rpms/gnu-smalltalk/devel gnu-smalltalk.spec, 1.8, 1.9 gst-2.3.2-am.patch, 1.1, 1.2 Message-ID: <200702141622.l1EGMgE0001701@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/gnu-smalltalk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1676 Modified Files: gnu-smalltalk.spec gst-2.3.2-am.patch Log Message: Solve multilib issue Index: gnu-smalltalk.spec =================================================================== RCS file: /cvs/extras/rpms/gnu-smalltalk/devel/gnu-smalltalk.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gnu-smalltalk.spec 11 Feb 2007 19:57:31 -0000 1.8 +++ gnu-smalltalk.spec 14 Feb 2007 16:22:10 -0000 1.9 @@ -1,7 +1,7 @@ Summary: GNU Smalltalk Name: gnu-smalltalk Version: 2.3.2 -Release: 5%{?dist} +Release: 6%{?dist} # Source: smalltalk-2.2b.tar.gz Source: ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-%{version}.tar.gz Patch1: gst-2.3.2-am.patch @@ -13,8 +13,8 @@ Requires(post): /sbin/install-info Requires(preun): /sbin/install-info -#BuildRequires: automake -#BuildRequires: autoconf >= 2.60 +BuildRequires: automake +BuildRequires: autoconf >= 2.60 BuildRequires: tk-devel BuildRequires: gtk2-devel BuildRequires: gdbm-devel @@ -117,7 +117,6 @@ %{_libdir}/libgst.so.* %{_libdir}/gnu-smalltalk/ -%{_datadir}/gnu-smalltalk/ %{_infodir}/gst.info* %{_infodir}/gst-*.info* @@ -134,6 +133,7 @@ %{_libdir}/pkgconfig/gnu-smalltalk.pc %{_datadir}/aclocal/*.m4 +%{_datadir}/gnu-smalltalk/ %{_includedir}/gst.h %{_includedir}/gstpub.h @@ -143,6 +143,9 @@ %{_datadir}/emacs/site-lisp/* %changelog +* Tue Feb 13 2007 Jochen Schmitt 2.3.2-6 +- Solve multilib issue (#228175) + * Sun Feb 11 2007 Jochen Schmitt 2.3.2-5 - Rebuild to fix broken deps. gst-2.3.2-am.patch: Index: gst-2.3.2-am.patch =================================================================== RCS file: /cvs/extras/rpms/gnu-smalltalk/devel/gst-2.3.2-am.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gst-2.3.2-am.patch 31 Jan 2007 15:45:05 -0000 1.1 +++ gst-2.3.2-am.patch 14 Feb 2007 16:22:10 -0000 1.2 @@ -1,5 +1,5 @@ --- smalltalk-2.3.2/configure.automake 2007-01-31 10:10:41.000000000 +0100 -+++ smalltalk-2.3.2/configure 2007-01-31 16:22:57.000000000 +0100 ++++ smalltalk-2.3.2/configure 2007-02-14 16:51:26.000000000 +0100 @@ -723,7 +723,7 @@ # Identity of this package. @@ -27,8 +27,8 @@ VERSION='2.3.2' ---- smalltalk-2.3.2/Makefile.in.automake 2007-01-31 10:10:38.000000000 +0100 -+++ smalltalk-2.3.2/Makefile.in 2007-01-31 16:23:00.000000000 +0100 +--- smalltalk-2.3.2/Makefile.in.automake 2007-02-14 16:49:32.000000000 +0100 ++++ smalltalk-2.3.2/Makefile.in 2007-02-14 16:51:33.000000000 +0100 @@ -274,7 +274,7 @@ NCURSES_DISABLED = @NCURSES_DISABLED@ OBJDUMP = @OBJDUMP@ @@ -38,8 +38,42 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ +@@ -394,6 +394,7 @@ + # + ########################################################### + pkgconfigdir = $(libdir)/pkgconfig ++imagedir = ${libdir}/@PACKAGE@ + nodist_pkgconfig_DATA = gnu-smalltalk.pc + pkglib_DATA = libc.la + noinst_DATA = gst.im +@@ -1130,20 +1131,20 @@ + # Build an image after installing the data; install-data runs after + # install-exec, so the gst executable is already in bindir. + install-data-hook: gst-package +- rm -f $(DESTDIR)$(pkgdatadir)/packages.xml ++ rm -f $(DESTDIR)$(imagedir)/packages.xml + ./gst-package --srcdir="$(srcdir)" --no-load --destdir="$(DESTDIR)" packages.xml + srcdir=`cd $(srcdir) && pwd`; \ +- cd $(DESTDIR)$(pkgdatadir); \ ++ cd $(DESTDIR)$(imagedir); \ + rm -f gst.im; \ + SMALLTALK_KERNEL="`pwd`/kernel" \ + SMALLTALK_IMAGE="`pwd`" \ + $(DESTDIR)$(bindir)/gst -f $$srcdir/scripts/Finish.st \ +- "$(DESTDIR)$(pkgdatadir)" "$(pkgdatadir)" $(MODULES) ++ "$(DESTDIR)$(imagedir)" "$(imagedir)" $(MODULES) + + uninstall-local:: gst-package + ./gst-package --uninstall --destdir="$(DESTDIR)" packages.xml +- -rm -f $(DESTDIR)$(pkgdatadir)/packages.xml +- -rm -f $(DESTDIR)$(pkgdatadir)/gst.im ++ -rm -f $(DESTDIR)$(imagedir)/packages.xml ++ -rm -f $(DESTDIR)$(imagedir)/gst.im + + installcheck-local: + if test -n "$(DESTDIR)"; then :; else \ --- smalltalk-2.3.2/Makefile.am.automake 2006-12-13 08:58:45.000000000 +0100 -+++ smalltalk-2.3.2/Makefile.am 2007-01-31 16:19:02.000000000 +0100 ++++ smalltalk-2.3.2/Makefile.am 2007-02-14 16:49:18.000000000 +0100 @@ -19,7 +19,7 @@ AUTOMAKE_OPTIONS = gnu 1.8 ACLOCAL_AMFLAGS = -I build-aux @@ -49,8 +83,53 @@ DIST_SUBDIRS = lib-src snprintfv lightning sigsegv libffi opcode libgst \ i18n tcp examples blox-tk . gtk tests doc +@@ -50,6 +50,7 @@ + ########################################################### + + pkgconfigdir = $(libdir)/pkgconfig ++imagedir = ${libdir}/@PACKAGE@ + nodist_pkgconfig_DATA = gnu-smalltalk.pc + + pkglib_DATA = libc.la +@@ -173,20 +174,20 @@ + # Build an image after installing the data; install-data runs after + # install-exec, so the gst executable is already in bindir. + install-data-hook: gst-package +- rm -f $(DESTDIR)$(pkgdatadir)/packages.xml ++ rm -f $(DESTDIR)$(imagedir)/packages.xml + ./gst-package --srcdir="$(srcdir)" --no-load --destdir="$(DESTDIR)" packages.xml + srcdir=`cd $(srcdir) && pwd`; \ +- cd $(DESTDIR)$(pkgdatadir); \ ++ cd $(DESTDIR)$(imagedir); \ + rm -f gst.im; \ + SMALLTALK_KERNEL="`pwd`/kernel" \ + SMALLTALK_IMAGE="`pwd`" \ + $(DESTDIR)$(bindir)/gst -f $$srcdir/scripts/Finish.st \ +- "$(DESTDIR)$(pkgdatadir)" "$(pkgdatadir)" $(MODULES) ++ "$(DESTDIR)$(imagedir)" "$(imagedir)" $(MODULES) + + uninstall-local:: gst-package + ./gst-package --uninstall --destdir="$(DESTDIR)" packages.xml +- -rm -f $(DESTDIR)$(pkgdatadir)/packages.xml +- -rm -f $(DESTDIR)$(pkgdatadir)/gst.im ++ -rm -f $(DESTDIR)$(imagedir)/packages.xml ++ -rm -f $(DESTDIR)$(imagedir)/gst.im + + installcheck-local: + if test -n "$(DESTDIR)"; then :; else \ +--- smalltalk-2.3.2/gst-package.in.automake 2006-12-06 19:36:01.000000000 +0100 ++++ smalltalk-2.3.2/gst-package.in 2007-02-14 16:49:18.000000000 +0100 +@@ -67,7 +67,7 @@ + set +e + } + +-IMAGE_PATH=${SMALLTALK_IMAGE:- at datadir@/@PACKAGE@} ++IMAGE_PATH=${SMALLTALK_IMAGE:- at libdir@/@PACKAGE@} + (cd $IMAGE_PATH 2> /dev/null && IMAGE_PATH=`pwd`) + + request_help=false --- smalltalk-2.3.2/configure.ac.automake 2007-01-31 10:10:04.000000000 +0100 -+++ smalltalk-2.3.2/configure.ac 2007-01-31 16:20:14.000000000 +0100 ++++ smalltalk-2.3.2/configure.ac 2007-02-14 16:49:18.000000000 +0100 @@ -7,7 +7,7 @@ dnl Process this file with autoconf to produce a configure script. @@ -60,3 +139,38 @@ MAINTAINER="bonzini at gnu.org" dnl CURRENT:REVISION:AGE means this is the REVISION-th version of +--- smalltalk-2.3.2/libgst/Makefile.in.automake 2007-02-14 16:50:04.000000000 +0100 ++++ smalltalk-2.3.2/libgst/Makefile.in 2007-02-14 16:51:32.000000000 +0100 +@@ -305,11 +305,12 @@ + subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++imagedir = $(libdir)/@PACKAGE@ + LEX_OUTPUT_ROOT = lex.yy + AM_LFLAGS = -Cfe -o$(LEX_OUTPUT_ROOT).c + AM_YFLAGS = -vy +-AM_CPPFLAGS = -DKERNEL_PATH=\"$(pkgdatadir)/kernel\" \ +- -DIMAGE_PATH=\"$(pkgdatadir)\" -DMODULE_PATH=\"$(pkglibdir)\" \ ++AM_CPPFLAGS = -DKERNEL_PATH=\"$(imagedir)/kernel\" \ ++ -DIMAGE_PATH=\"$(imagedir)\" -DMODULE_PATH=\"$(imagedir)\" \ + -I$(top_srcdir)/lib-src -I$(top_srcdir)/libffi/include \ + -I$(top_builddir)/libffi/include $(INCLIGHTNING) \ + @INCSNPRINTFV@ $(INCSIGSEGV) -I$(top_builddir)/lib-src \ +--- smalltalk-2.3.2/libgst/Makefile.am.automake 2006-02-05 19:41:34.000000000 +0100 ++++ smalltalk-2.3.2/libgst/Makefile.am 2007-02-14 16:49:18.000000000 +0100 +@@ -1,11 +1,13 @@ + LIBTOOL += --tag=LIBGST + ++imagedir = $(libdir)/@PACKAGE@ ++ + LEX_OUTPUT_ROOT = lex.yy + ## CFLAGS=-O0 -g + AM_LFLAGS = -Cfe -o$(LEX_OUTPUT_ROOT).c + AM_YFLAGS = -vy +-AM_CPPFLAGS = -DKERNEL_PATH=\"$(pkgdatadir)/kernel\" \ +- -DIMAGE_PATH=\"$(pkgdatadir)\" -DMODULE_PATH=\"$(pkglibdir)\" \ ++AM_CPPFLAGS = -DKERNEL_PATH=\"$(imagedir)/kernel\" \ ++ -DIMAGE_PATH=\"$(imagedir)\" -DMODULE_PATH=\"$(imagedir)\" \ + -I$(top_srcdir)/lib-src -I$(top_srcdir)/libffi/include \ + -I$(top_builddir)/libffi/include $(INCLIGHTNING) \ + @INCSNPRINTFV@ $(INCSIGSEGV) -I$(top_builddir)/lib-src From fedora-extras-commits at redhat.com Wed Feb 14 16:36:17 2007 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 14 Feb 2007 11:36:17 -0500 Subject: rpms/environment-modules/devel environment-modules.spec,1.7,1.8 Message-ID: <200702141636.l1EGaHFp002025@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/environment-modules/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2004 Modified Files: environment-modules.spec Log Message: Rebuild for Tcl downgrade Index: environment-modules.spec =================================================================== RCS file: /cvs/extras/rpms/environment-modules/devel/environment-modules.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- environment-modules.spec 9 Feb 2007 18:26:20 -0000 1.7 +++ environment-modules.spec 14 Feb 2007 16:35:45 -0000 1.8 @@ -1,6 +1,6 @@ Name: environment-modules Version: 3.2.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Provides dynamic modification of a user's environment Group: System Environment/Base @@ -67,6 +67,9 @@ %changelog +* Wed Feb 14 2007 - Orion Poplawski - 3.2.4-2 +- Rebuild for Tcl downgrade + * Fri Feb 09 2007 - Orion Poplawski - 3.2.4-1 - Update to 3.2.4 From fedora-extras-commits at redhat.com Wed Feb 14 16:41:58 2007 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 14 Feb 2007 11:41:58 -0500 Subject: rpms/python-matplotlib/devel python-matplotlib.spec,1.27,1.28 Message-ID: <200702141641.l1EGfwJh002159@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-matplotlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2140 Modified Files: python-matplotlib.spec Log Message: Rebuild for Tcl/Tk downgrade Index: python-matplotlib.spec =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/python-matplotlib.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- python-matplotlib.spec 10 Feb 2007 19:34:19 -0000 1.27 +++ python-matplotlib.spec 14 Feb 2007 16:41:26 -0000 1.28 @@ -2,7 +2,7 @@ Name: python-matplotlib Version: 0.90.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python plotting library Group: Development/Libraries @@ -75,6 +75,9 @@ %changelog +* Wed Feb 14 2007 Orion Poplawski 0.90.0-2 +- Rebuild for Tcl/Tk downgrade + * Sat Feb 10 2007 Jef Spaleta 0.90.0-2 - Release bump for rebuild against new tk From fedora-extras-commits at redhat.com Wed Feb 14 16:52:19 2007 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 14 Feb 2007 11:52:19 -0500 Subject: rpms/gnu-smalltalk/FC-6 gnu-smalltalk.spec, 1.3, 1.4 gst-2.3.2-am.patch, 1.1, 1.2 Message-ID: <200702141652.l1EGqJgT002388@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/gnu-smalltalk/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2364 Modified Files: gnu-smalltalk.spec gst-2.3.2-am.patch Log Message: Solve multilib issue Index: gnu-smalltalk.spec =================================================================== RCS file: /cvs/extras/rpms/gnu-smalltalk/FC-6/gnu-smalltalk.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gnu-smalltalk.spec 31 Jan 2007 16:16:45 -0000 1.3 +++ gnu-smalltalk.spec 14 Feb 2007 16:51:46 -0000 1.4 @@ -1,7 +1,7 @@ Summary: GNU Smalltalk Name: gnu-smalltalk Version: 2.3.2 -Release: 4%{?dist} +Release: 6%{?dist} # Source: smalltalk-2.2b.tar.gz Source: ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-%{version}.tar.gz Patch1: gst-2.3.2-am.patch @@ -117,7 +117,6 @@ %{_libdir}/libgst.so.* %{_libdir}/gnu-smalltalk/ -%{_datadir}/gnu-smalltalk/ %{_infodir}/gst.info* %{_infodir}/gst-*.info* @@ -134,6 +133,7 @@ %{_libdir}/pkgconfig/gnu-smalltalk.pc %{_datadir}/aclocal/*.m4 +%{_datadir}/gnu-smalltalk/ %{_includedir}/gst.h %{_includedir}/gstpub.h @@ -143,6 +143,12 @@ %{_datadir}/emacs/site-lisp/* %changelog +* Tue Feb 13 2007 Jochen Schmitt 2.3.2-6 +- Solve multilib issue (#228175) + +* Sun Feb 11 2007 Jochen Schmitt 2.3.2-5 +- Rebuild to fix broken deps. + * Wed Jan 31 2007 Jochen Schmitt 2.3.2-4 - New upstream release gst-2.3.2-am.patch: Index: gst-2.3.2-am.patch =================================================================== RCS file: /cvs/extras/rpms/gnu-smalltalk/FC-6/gst-2.3.2-am.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gst-2.3.2-am.patch 31 Jan 2007 16:16:45 -0000 1.1 +++ gst-2.3.2-am.patch 14 Feb 2007 16:51:46 -0000 1.2 @@ -1,5 +1,5 @@ --- smalltalk-2.3.2/configure.automake 2007-01-31 10:10:41.000000000 +0100 -+++ smalltalk-2.3.2/configure 2007-01-31 16:22:57.000000000 +0100 ++++ smalltalk-2.3.2/configure 2007-02-14 16:51:26.000000000 +0100 @@ -723,7 +723,7 @@ # Identity of this package. @@ -27,8 +27,8 @@ VERSION='2.3.2' ---- smalltalk-2.3.2/Makefile.in.automake 2007-01-31 10:10:38.000000000 +0100 -+++ smalltalk-2.3.2/Makefile.in 2007-01-31 16:23:00.000000000 +0100 +--- smalltalk-2.3.2/Makefile.in.automake 2007-02-14 16:49:32.000000000 +0100 ++++ smalltalk-2.3.2/Makefile.in 2007-02-14 16:51:33.000000000 +0100 @@ -274,7 +274,7 @@ NCURSES_DISABLED = @NCURSES_DISABLED@ OBJDUMP = @OBJDUMP@ @@ -38,8 +38,42 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ +@@ -394,6 +394,7 @@ + # + ########################################################### + pkgconfigdir = $(libdir)/pkgconfig ++imagedir = ${libdir}/@PACKAGE@ + nodist_pkgconfig_DATA = gnu-smalltalk.pc + pkglib_DATA = libc.la + noinst_DATA = gst.im +@@ -1130,20 +1131,20 @@ + # Build an image after installing the data; install-data runs after + # install-exec, so the gst executable is already in bindir. + install-data-hook: gst-package +- rm -f $(DESTDIR)$(pkgdatadir)/packages.xml ++ rm -f $(DESTDIR)$(imagedir)/packages.xml + ./gst-package --srcdir="$(srcdir)" --no-load --destdir="$(DESTDIR)" packages.xml + srcdir=`cd $(srcdir) && pwd`; \ +- cd $(DESTDIR)$(pkgdatadir); \ ++ cd $(DESTDIR)$(imagedir); \ + rm -f gst.im; \ + SMALLTALK_KERNEL="`pwd`/kernel" \ + SMALLTALK_IMAGE="`pwd`" \ + $(DESTDIR)$(bindir)/gst -f $$srcdir/scripts/Finish.st \ +- "$(DESTDIR)$(pkgdatadir)" "$(pkgdatadir)" $(MODULES) ++ "$(DESTDIR)$(imagedir)" "$(imagedir)" $(MODULES) + + uninstall-local:: gst-package + ./gst-package --uninstall --destdir="$(DESTDIR)" packages.xml +- -rm -f $(DESTDIR)$(pkgdatadir)/packages.xml +- -rm -f $(DESTDIR)$(pkgdatadir)/gst.im ++ -rm -f $(DESTDIR)$(imagedir)/packages.xml ++ -rm -f $(DESTDIR)$(imagedir)/gst.im + + installcheck-local: + if test -n "$(DESTDIR)"; then :; else \ --- smalltalk-2.3.2/Makefile.am.automake 2006-12-13 08:58:45.000000000 +0100 -+++ smalltalk-2.3.2/Makefile.am 2007-01-31 16:19:02.000000000 +0100 ++++ smalltalk-2.3.2/Makefile.am 2007-02-14 16:49:18.000000000 +0100 @@ -19,7 +19,7 @@ AUTOMAKE_OPTIONS = gnu 1.8 ACLOCAL_AMFLAGS = -I build-aux @@ -49,8 +83,53 @@ DIST_SUBDIRS = lib-src snprintfv lightning sigsegv libffi opcode libgst \ i18n tcp examples blox-tk . gtk tests doc +@@ -50,6 +50,7 @@ + ########################################################### + + pkgconfigdir = $(libdir)/pkgconfig ++imagedir = ${libdir}/@PACKAGE@ + nodist_pkgconfig_DATA = gnu-smalltalk.pc + + pkglib_DATA = libc.la +@@ -173,20 +174,20 @@ + # Build an image after installing the data; install-data runs after + # install-exec, so the gst executable is already in bindir. + install-data-hook: gst-package +- rm -f $(DESTDIR)$(pkgdatadir)/packages.xml ++ rm -f $(DESTDIR)$(imagedir)/packages.xml + ./gst-package --srcdir="$(srcdir)" --no-load --destdir="$(DESTDIR)" packages.xml + srcdir=`cd $(srcdir) && pwd`; \ +- cd $(DESTDIR)$(pkgdatadir); \ ++ cd $(DESTDIR)$(imagedir); \ + rm -f gst.im; \ + SMALLTALK_KERNEL="`pwd`/kernel" \ + SMALLTALK_IMAGE="`pwd`" \ + $(DESTDIR)$(bindir)/gst -f $$srcdir/scripts/Finish.st \ +- "$(DESTDIR)$(pkgdatadir)" "$(pkgdatadir)" $(MODULES) ++ "$(DESTDIR)$(imagedir)" "$(imagedir)" $(MODULES) + + uninstall-local:: gst-package + ./gst-package --uninstall --destdir="$(DESTDIR)" packages.xml +- -rm -f $(DESTDIR)$(pkgdatadir)/packages.xml +- -rm -f $(DESTDIR)$(pkgdatadir)/gst.im ++ -rm -f $(DESTDIR)$(imagedir)/packages.xml ++ -rm -f $(DESTDIR)$(imagedir)/gst.im + + installcheck-local: + if test -n "$(DESTDIR)"; then :; else \ +--- smalltalk-2.3.2/gst-package.in.automake 2006-12-06 19:36:01.000000000 +0100 ++++ smalltalk-2.3.2/gst-package.in 2007-02-14 16:49:18.000000000 +0100 +@@ -67,7 +67,7 @@ + set +e + } + +-IMAGE_PATH=${SMALLTALK_IMAGE:- at datadir@/@PACKAGE@} ++IMAGE_PATH=${SMALLTALK_IMAGE:- at libdir@/@PACKAGE@} + (cd $IMAGE_PATH 2> /dev/null && IMAGE_PATH=`pwd`) + + request_help=false --- smalltalk-2.3.2/configure.ac.automake 2007-01-31 10:10:04.000000000 +0100 -+++ smalltalk-2.3.2/configure.ac 2007-01-31 16:20:14.000000000 +0100 ++++ smalltalk-2.3.2/configure.ac 2007-02-14 16:49:18.000000000 +0100 @@ -7,7 +7,7 @@ dnl Process this file with autoconf to produce a configure script. @@ -60,3 +139,38 @@ MAINTAINER="bonzini at gnu.org" dnl CURRENT:REVISION:AGE means this is the REVISION-th version of +--- smalltalk-2.3.2/libgst/Makefile.in.automake 2007-02-14 16:50:04.000000000 +0100 ++++ smalltalk-2.3.2/libgst/Makefile.in 2007-02-14 16:51:32.000000000 +0100 +@@ -305,11 +305,12 @@ + subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++imagedir = $(libdir)/@PACKAGE@ + LEX_OUTPUT_ROOT = lex.yy + AM_LFLAGS = -Cfe -o$(LEX_OUTPUT_ROOT).c + AM_YFLAGS = -vy +-AM_CPPFLAGS = -DKERNEL_PATH=\"$(pkgdatadir)/kernel\" \ +- -DIMAGE_PATH=\"$(pkgdatadir)\" -DMODULE_PATH=\"$(pkglibdir)\" \ ++AM_CPPFLAGS = -DKERNEL_PATH=\"$(imagedir)/kernel\" \ ++ -DIMAGE_PATH=\"$(imagedir)\" -DMODULE_PATH=\"$(imagedir)\" \ + -I$(top_srcdir)/lib-src -I$(top_srcdir)/libffi/include \ + -I$(top_builddir)/libffi/include $(INCLIGHTNING) \ + @INCSNPRINTFV@ $(INCSIGSEGV) -I$(top_builddir)/lib-src \ +--- smalltalk-2.3.2/libgst/Makefile.am.automake 2006-02-05 19:41:34.000000000 +0100 ++++ smalltalk-2.3.2/libgst/Makefile.am 2007-02-14 16:49:18.000000000 +0100 +@@ -1,11 +1,13 @@ + LIBTOOL += --tag=LIBGST + ++imagedir = $(libdir)/@PACKAGE@ ++ + LEX_OUTPUT_ROOT = lex.yy + ## CFLAGS=-O0 -g + AM_LFLAGS = -Cfe -o$(LEX_OUTPUT_ROOT).c + AM_YFLAGS = -vy +-AM_CPPFLAGS = -DKERNEL_PATH=\"$(pkgdatadir)/kernel\" \ +- -DIMAGE_PATH=\"$(pkgdatadir)\" -DMODULE_PATH=\"$(pkglibdir)\" \ ++AM_CPPFLAGS = -DKERNEL_PATH=\"$(imagedir)/kernel\" \ ++ -DIMAGE_PATH=\"$(imagedir)\" -DMODULE_PATH=\"$(imagedir)\" \ + -I$(top_srcdir)/lib-src -I$(top_srcdir)/libffi/include \ + -I$(top_builddir)/libffi/include $(INCLIGHTNING) \ + @INCSNPRINTFV@ $(INCSIGSEGV) -I$(top_builddir)/lib-src From fedora-extras-commits at redhat.com Wed Feb 14 16:53:20 2007 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 14 Feb 2007 11:53:20 -0500 Subject: rpms/gnu-smalltalk/FC-5 gnu-smalltalk.spec, 1.3, 1.4 gst-2.3.2-am.patch, 1.1, 1.2 Message-ID: <200702141653.l1EGrKQ6002460@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/gnu-smalltalk/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2432 Modified Files: gnu-smalltalk.spec gst-2.3.2-am.patch Log Message: Solve multilib issue Index: gnu-smalltalk.spec =================================================================== RCS file: /cvs/extras/rpms/gnu-smalltalk/FC-5/gnu-smalltalk.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gnu-smalltalk.spec 31 Jan 2007 16:19:25 -0000 1.3 +++ gnu-smalltalk.spec 14 Feb 2007 16:52:48 -0000 1.4 @@ -1,7 +1,7 @@ Summary: GNU Smalltalk Name: gnu-smalltalk Version: 2.3.2 -Release: 4%{?dist} +Release: 6%{?dist} # Source: smalltalk-2.2b.tar.gz Source: ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-%{version}.tar.gz Patch1: gst-2.3.2-am.patch @@ -117,7 +117,6 @@ %{_libdir}/libgst.so.* %{_libdir}/gnu-smalltalk/ -%{_datadir}/gnu-smalltalk/ %{_infodir}/gst.info* %{_infodir}/gst-*.info* @@ -134,6 +133,7 @@ %{_libdir}/pkgconfig/gnu-smalltalk.pc %{_datadir}/aclocal/*.m4 +%{_datadir}/gnu-smalltalk/ %{_includedir}/gst.h %{_includedir}/gstpub.h @@ -143,6 +143,12 @@ %{_datadir}/emacs/site-lisp/* %changelog +* Tue Feb 13 2007 Jochen Schmitt 2.3.2-6 +- Solve multilib issue (#228175) + +* Sun Feb 11 2007 Jochen Schmitt 2.3.2-5 +- Rebuild to fix broken deps. + * Wed Jan 31 2007 Jochen Schmitt 2.3.2-4 - New upstream release gst-2.3.2-am.patch: Index: gst-2.3.2-am.patch =================================================================== RCS file: /cvs/extras/rpms/gnu-smalltalk/FC-5/gst-2.3.2-am.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gst-2.3.2-am.patch 31 Jan 2007 16:19:25 -0000 1.1 +++ gst-2.3.2-am.patch 14 Feb 2007 16:52:48 -0000 1.2 @@ -1,5 +1,5 @@ --- smalltalk-2.3.2/configure.automake 2007-01-31 10:10:41.000000000 +0100 -+++ smalltalk-2.3.2/configure 2007-01-31 16:22:57.000000000 +0100 ++++ smalltalk-2.3.2/configure 2007-02-14 16:51:26.000000000 +0100 @@ -723,7 +723,7 @@ # Identity of this package. @@ -27,8 +27,8 @@ VERSION='2.3.2' ---- smalltalk-2.3.2/Makefile.in.automake 2007-01-31 10:10:38.000000000 +0100 -+++ smalltalk-2.3.2/Makefile.in 2007-01-31 16:23:00.000000000 +0100 +--- smalltalk-2.3.2/Makefile.in.automake 2007-02-14 16:49:32.000000000 +0100 ++++ smalltalk-2.3.2/Makefile.in 2007-02-14 16:51:33.000000000 +0100 @@ -274,7 +274,7 @@ NCURSES_DISABLED = @NCURSES_DISABLED@ OBJDUMP = @OBJDUMP@ @@ -38,8 +38,42 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ +@@ -394,6 +394,7 @@ + # + ########################################################### + pkgconfigdir = $(libdir)/pkgconfig ++imagedir = ${libdir}/@PACKAGE@ + nodist_pkgconfig_DATA = gnu-smalltalk.pc + pkglib_DATA = libc.la + noinst_DATA = gst.im +@@ -1130,20 +1131,20 @@ + # Build an image after installing the data; install-data runs after + # install-exec, so the gst executable is already in bindir. + install-data-hook: gst-package +- rm -f $(DESTDIR)$(pkgdatadir)/packages.xml ++ rm -f $(DESTDIR)$(imagedir)/packages.xml + ./gst-package --srcdir="$(srcdir)" --no-load --destdir="$(DESTDIR)" packages.xml + srcdir=`cd $(srcdir) && pwd`; \ +- cd $(DESTDIR)$(pkgdatadir); \ ++ cd $(DESTDIR)$(imagedir); \ + rm -f gst.im; \ + SMALLTALK_KERNEL="`pwd`/kernel" \ + SMALLTALK_IMAGE="`pwd`" \ + $(DESTDIR)$(bindir)/gst -f $$srcdir/scripts/Finish.st \ +- "$(DESTDIR)$(pkgdatadir)" "$(pkgdatadir)" $(MODULES) ++ "$(DESTDIR)$(imagedir)" "$(imagedir)" $(MODULES) + + uninstall-local:: gst-package + ./gst-package --uninstall --destdir="$(DESTDIR)" packages.xml +- -rm -f $(DESTDIR)$(pkgdatadir)/packages.xml +- -rm -f $(DESTDIR)$(pkgdatadir)/gst.im ++ -rm -f $(DESTDIR)$(imagedir)/packages.xml ++ -rm -f $(DESTDIR)$(imagedir)/gst.im + + installcheck-local: + if test -n "$(DESTDIR)"; then :; else \ --- smalltalk-2.3.2/Makefile.am.automake 2006-12-13 08:58:45.000000000 +0100 -+++ smalltalk-2.3.2/Makefile.am 2007-01-31 16:19:02.000000000 +0100 ++++ smalltalk-2.3.2/Makefile.am 2007-02-14 16:49:18.000000000 +0100 @@ -19,7 +19,7 @@ AUTOMAKE_OPTIONS = gnu 1.8 ACLOCAL_AMFLAGS = -I build-aux @@ -49,8 +83,53 @@ DIST_SUBDIRS = lib-src snprintfv lightning sigsegv libffi opcode libgst \ i18n tcp examples blox-tk . gtk tests doc +@@ -50,6 +50,7 @@ + ########################################################### + + pkgconfigdir = $(libdir)/pkgconfig ++imagedir = ${libdir}/@PACKAGE@ + nodist_pkgconfig_DATA = gnu-smalltalk.pc + + pkglib_DATA = libc.la +@@ -173,20 +174,20 @@ + # Build an image after installing the data; install-data runs after + # install-exec, so the gst executable is already in bindir. + install-data-hook: gst-package +- rm -f $(DESTDIR)$(pkgdatadir)/packages.xml ++ rm -f $(DESTDIR)$(imagedir)/packages.xml + ./gst-package --srcdir="$(srcdir)" --no-load --destdir="$(DESTDIR)" packages.xml + srcdir=`cd $(srcdir) && pwd`; \ +- cd $(DESTDIR)$(pkgdatadir); \ ++ cd $(DESTDIR)$(imagedir); \ + rm -f gst.im; \ + SMALLTALK_KERNEL="`pwd`/kernel" \ + SMALLTALK_IMAGE="`pwd`" \ + $(DESTDIR)$(bindir)/gst -f $$srcdir/scripts/Finish.st \ +- "$(DESTDIR)$(pkgdatadir)" "$(pkgdatadir)" $(MODULES) ++ "$(DESTDIR)$(imagedir)" "$(imagedir)" $(MODULES) + + uninstall-local:: gst-package + ./gst-package --uninstall --destdir="$(DESTDIR)" packages.xml +- -rm -f $(DESTDIR)$(pkgdatadir)/packages.xml +- -rm -f $(DESTDIR)$(pkgdatadir)/gst.im ++ -rm -f $(DESTDIR)$(imagedir)/packages.xml ++ -rm -f $(DESTDIR)$(imagedir)/gst.im + + installcheck-local: + if test -n "$(DESTDIR)"; then :; else \ +--- smalltalk-2.3.2/gst-package.in.automake 2006-12-06 19:36:01.000000000 +0100 ++++ smalltalk-2.3.2/gst-package.in 2007-02-14 16:49:18.000000000 +0100 +@@ -67,7 +67,7 @@ + set +e + } + +-IMAGE_PATH=${SMALLTALK_IMAGE:- at datadir@/@PACKAGE@} ++IMAGE_PATH=${SMALLTALK_IMAGE:- at libdir@/@PACKAGE@} + (cd $IMAGE_PATH 2> /dev/null && IMAGE_PATH=`pwd`) + + request_help=false --- smalltalk-2.3.2/configure.ac.automake 2007-01-31 10:10:04.000000000 +0100 -+++ smalltalk-2.3.2/configure.ac 2007-01-31 16:20:14.000000000 +0100 ++++ smalltalk-2.3.2/configure.ac 2007-02-14 16:49:18.000000000 +0100 @@ -7,7 +7,7 @@ dnl Process this file with autoconf to produce a configure script. @@ -60,3 +139,38 @@ MAINTAINER="bonzini at gnu.org" dnl CURRENT:REVISION:AGE means this is the REVISION-th version of +--- smalltalk-2.3.2/libgst/Makefile.in.automake 2007-02-14 16:50:04.000000000 +0100 ++++ smalltalk-2.3.2/libgst/Makefile.in 2007-02-14 16:51:32.000000000 +0100 +@@ -305,11 +305,12 @@ + subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++imagedir = $(libdir)/@PACKAGE@ + LEX_OUTPUT_ROOT = lex.yy + AM_LFLAGS = -Cfe -o$(LEX_OUTPUT_ROOT).c + AM_YFLAGS = -vy +-AM_CPPFLAGS = -DKERNEL_PATH=\"$(pkgdatadir)/kernel\" \ +- -DIMAGE_PATH=\"$(pkgdatadir)\" -DMODULE_PATH=\"$(pkglibdir)\" \ ++AM_CPPFLAGS = -DKERNEL_PATH=\"$(imagedir)/kernel\" \ ++ -DIMAGE_PATH=\"$(imagedir)\" -DMODULE_PATH=\"$(imagedir)\" \ + -I$(top_srcdir)/lib-src -I$(top_srcdir)/libffi/include \ + -I$(top_builddir)/libffi/include $(INCLIGHTNING) \ + @INCSNPRINTFV@ $(INCSIGSEGV) -I$(top_builddir)/lib-src \ +--- smalltalk-2.3.2/libgst/Makefile.am.automake 2006-02-05 19:41:34.000000000 +0100 ++++ smalltalk-2.3.2/libgst/Makefile.am 2007-02-14 16:49:18.000000000 +0100 +@@ -1,11 +1,13 @@ + LIBTOOL += --tag=LIBGST + ++imagedir = $(libdir)/@PACKAGE@ ++ + LEX_OUTPUT_ROOT = lex.yy + ## CFLAGS=-O0 -g + AM_LFLAGS = -Cfe -o$(LEX_OUTPUT_ROOT).c + AM_YFLAGS = -vy +-AM_CPPFLAGS = -DKERNEL_PATH=\"$(pkgdatadir)/kernel\" \ +- -DIMAGE_PATH=\"$(pkgdatadir)\" -DMODULE_PATH=\"$(pkglibdir)\" \ ++AM_CPPFLAGS = -DKERNEL_PATH=\"$(imagedir)/kernel\" \ ++ -DIMAGE_PATH=\"$(imagedir)\" -DMODULE_PATH=\"$(imagedir)\" \ + -I$(top_srcdir)/lib-src -I$(top_srcdir)/libffi/include \ + -I$(top_builddir)/libffi/include $(INCLIGHTNING) \ + @INCSNPRINTFV@ $(INCSIGSEGV) -I$(top_builddir)/lib-src From fedora-extras-commits at redhat.com Wed Feb 14 17:04:34 2007 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 14 Feb 2007 12:04:34 -0500 Subject: rpms/gnu-smalltalk/FC-6 gnu-smalltalk.spec,1.4,1.5 Message-ID: <200702141704.l1EH4YaZ006059@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/gnu-smalltalk/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6039 Modified Files: gnu-smalltalk.spec Log Message: Try to build again Index: gnu-smalltalk.spec =================================================================== RCS file: /cvs/extras/rpms/gnu-smalltalk/FC-6/gnu-smalltalk.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gnu-smalltalk.spec 14 Feb 2007 16:51:46 -0000 1.4 +++ gnu-smalltalk.spec 14 Feb 2007 17:04:02 -0000 1.5 @@ -1,7 +1,7 @@ Summary: GNU Smalltalk Name: gnu-smalltalk Version: 2.3.2 -Release: 6%{?dist} +Release: 6%{?dist}.1 # Source: smalltalk-2.2b.tar.gz Source: ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-%{version}.tar.gz Patch1: gst-2.3.2-am.patch @@ -143,7 +143,7 @@ %{_datadir}/emacs/site-lisp/* %changelog -* Tue Feb 13 2007 Jochen Schmitt 2.3.2-6 +* Tue Feb 13 2007 Jochen Schmitt 2.3.2-6.1 - Solve multilib issue (#228175) * Sun Feb 11 2007 Jochen Schmitt 2.3.2-5 From fedora-extras-commits at redhat.com Wed Feb 14 17:32:31 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos)) Date: Wed, 14 Feb 2007 12:32:31 -0500 Subject: rpms/python-imaging/devel python-imaging.spec,1.13,1.14 Message-ID: <200702141732.l1EHWV5n006576@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/python-imaging/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6519 Modified Files: python-imaging.spec Log Message: * Wed Feb 14 2007 Jos?? Matos - 1.1.6-2 - Rebuild for Tcl/Tk downgrade (F7) Index: python-imaging.spec =================================================================== RCS file: /cvs/extras/rpms/python-imaging/devel/python-imaging.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- python-imaging.spec 5 Feb 2007 19:38:57 -0000 1.13 +++ python-imaging.spec 14 Feb 2007 17:31:59 -0000 1.14 @@ -5,7 +5,7 @@ Summary: Python's own image processing library Name: python-imaging Version: 1.1.6 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: Development/Languages @@ -101,6 +101,9 @@ %changelog +* Wed Feb 14 2007 Jos?? Matos - 1.1.6-2 +- Rebuild for Tcl/Tk downgrade (F7) + * Mon Feb 5 2007 Jos?? Matos - 1.1.6-1 - New upstream version. - Clean spec file and specify license as BSD. From fedora-extras-commits at redhat.com Wed Feb 14 17:48:27 2007 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Wed, 14 Feb 2007 12:48:27 -0500 Subject: rpms/gnubg/FC-5 gnubg.spec,1.4,1.5 Message-ID: <200702141748.l1EHmRtI006873@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/extras/rpms/gnubg/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6854 Modified Files: gnubg.spec Log Message: BR: libXt-devel, gtkglext workaround. Index: gnubg.spec =================================================================== RCS file: /cvs/extras/rpms/gnubg/FC-5/gnubg.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gnubg.spec 14 Feb 2007 16:20:34 -0000 1.4 +++ gnubg.spec 14 Feb 2007 17:47:55 -0000 1.5 @@ -3,7 +3,7 @@ Group: Amusements/Games Summary: A backgammon game and analyser Version: 20061119 -Release: 8%{?dist}.1 +Release: 8%{?dist}.2 Source0: http://www.gnubg.org/media/sources/%{name}-source-MAIN-%{version}.tar.gz Source1: gnubg.weights Source2: gnubg.desktop @@ -15,7 +15,7 @@ BuildRequires: arts-devel BuildRequires: gettext-devel BuildRequires: gtkglext-devel -BuildRequires: gtkglext +BuildRequires: libXt-devel BuildRequires: automake BuildRequires: bison BuildRequires: libtool @@ -137,6 +137,8 @@ %{_datadir}/gnubg/flags/ %changelog +* Wed Feb 14 2007 Jon Ciesla - 20061119-8.2 +- BR: libXt-devel, gtkglext-devel workaround. * Wed Feb 14 2007 Jon Ciesla - 20061119-8.1 - Added special Buildreq for FC5. * Wed Feb 14 2007 Jon Ciesla - 20061119-8 From fedora-extras-commits at redhat.com Wed Feb 14 18:22:20 2007 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 14 Feb 2007 13:22:20 -0500 Subject: rpms/em8300-kmod/FC-5 em8300-kmod.spec,1.9,1.10 Message-ID: <200702141822.l1EIMKWQ010677@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/em8300-kmod/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10658 Modified Files: em8300-kmod.spec Log Message: * Wed Feb 14 2007 Ville Skytt?? - Rebuild for kernel 2.6.19-1.2288.fc5. Index: em8300-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/em8300-kmod/FC-5/em8300-kmod.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- em8300-kmod.spec 18 Dec 2006 20:57:32 -0000 1.9 +++ em8300-kmod.spec 14 Feb 2007 18:21:48 -0000 1.10 @@ -4,7 +4,7 @@ # end stuff to be ... # hardcode for now: -%{!?kversion: %define kversion 2.6.18-1.2257.fc5} +%{!?kversion: %define kversion 2.6.19-1.2288.fc5} %define kmod_name em8300 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null) @@ -75,6 +75,9 @@ %changelog +* Wed Feb 14 2007 Ville Skytt?? +- Rebuild for kernel 2.6.19-1.2288.fc5. + * Mon Dec 18 2006 Ville Skytt?? - 0.16.0-1 - 0.16.0, build for kernel 2.6.18-1.2257.fc5. - Let rpmbuild strip modules. From fedora-extras-commits at redhat.com Wed Feb 14 18:44:36 2007 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 14 Feb 2007 13:44:36 -0500 Subject: rpms/xine-lib/devel xine-lib.spec,1.9,1.10 Message-ID: <200702141844.l1EIiakQ010942@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xine-lib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10921 Modified Files: xine-lib.spec Log Message: * Wed Feb 14 2007 Ville Skytt?? - 1.1.4-2 - Rebuild. Index: xine-lib.spec =================================================================== RCS file: /cvs/extras/rpms/xine-lib/devel/xine-lib.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xine-lib.spec 31 Jan 2007 19:58:30 -0000 1.9 +++ xine-lib.spec 14 Feb 2007 18:44:03 -0000 1.10 @@ -8,7 +8,7 @@ Summary: Xine library Name: xine-lib Version: 1.1.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Libraries URL: http://xinehq.de/ @@ -284,6 +284,9 @@ %changelog +* Wed Feb 14 2007 Ville Skytt?? - 1.1.4-2 +- Rebuild. + * Wed Jan 31 2007 Ville Skytt?? - 1.1.4-1 - 1.1.4, with wavpack and system libmpcdec support. From fedora-extras-commits at redhat.com Wed Feb 14 19:13:52 2007 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 14 Feb 2007 14:13:52 -0500 Subject: rpms/amarok/FC-5 amarok-1.4.5-CVE-2006-6979.patch, NONE, 1.1 amarok.spec, 1.66, 1.67 Message-ID: <200702141913.l1EJDq8m014660@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14600/FC-5 Modified Files: amarok.spec Added Files: amarok-1.4.5-CVE-2006-6979.patch Log Message: add patch to fix CVE-2006-6979 (bug 228138) amarok-1.4.5-CVE-2006-6979.patch: --- NEW FILE amarok-1.4.5-CVE-2006-6979.patch --- Index: src/magnatunebrowser/magnatunealbumdownloader.cpp =================================================================== --- amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp (revision 633106) +++ amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp (working copy) @@ -89,7 +89,7 @@ //ok, now we have the .zip file downloaded. All we need is to unpack it to the desired location and add it to the collection. - QString unzipString = "unzip \""+m_tempDir.name() + m_currentAlbumFileName + "\" -d \"" + m_currentAlbumUnpackLocation + "\" &"; + QString unzipString = KProcess::quote( "unzip \""+m_tempDir.name() + m_currentAlbumFileName + "\" -d \"" + m_currentAlbumUnpackLocation + "\" &" ); debug() << "unpacking: " << unzipString << endl; Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-5/amarok.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- amarok.spec 7 Feb 2007 22:25:05 -0000 1.66 +++ amarok.spec 14 Feb 2007 19:13:19 -0000 1.67 @@ -4,13 +4,14 @@ Name: amarok Summary: Media player for KDE Version: 1.4.5 -Release: 1%{?dist}.1 +Release: 2%{?dist} Group: Applications/Multimedia License: GPL Url: http://amarok.kde.org # http://download.kde.org/download.php?url=stable/amarok/1.4.3/src Source0: http://mirrors.isc.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2 +Patch0: amarok-1.4.5-CVE-2006-6979.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdemultimedia-devel >= 6:3.2 @@ -80,6 +81,7 @@ %prep %setup -q +%patch0 -p0 -b .CVE-2006-6979 @@ -193,11 +195,9 @@ # SMB %{_datadir}/services/amarok_smb-device.desktop %{_libdir}/kde3/libamarok_smb-device.* -%if "%fedora" >= "6" # IPod %{_datadir}/services/amarok_ipod-mediadevice.desktop %{_libdir}/kde3/libamarok_ipod-mediadevice.* -%endif # VFAT %{_datadir}/services/amarok_generic-mediadevice.desktop %{_libdir}/kde3/libamarok_generic-mediadevice.* @@ -235,8 +235,8 @@ %changelog -* Wed Feb 07 2007 Aurelien Bompard 1.4.5-1.1 -- libgpod is not recent enough in FC5 +* Wed Feb 14 2007 Aurelien Bompard 1.4.5-2 +- add patch to fix CVE-2006-6979 (bug 228138) * Sat Feb 03 2007 Aurelien Bompard 1.4.5-1 - version 1.4.5 From fedora-extras-commits at redhat.com Wed Feb 14 19:13:57 2007 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 14 Feb 2007 14:13:57 -0500 Subject: rpms/amarok/devel amarok-1.4.5-CVE-2006-6979.patch, NONE, 1.1 amarok.spec, 1.73, 1.74 Message-ID: <200702141913.l1EJDvoM014666@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14600/devel Modified Files: amarok.spec Added Files: amarok-1.4.5-CVE-2006-6979.patch Log Message: add patch to fix CVE-2006-6979 (bug 228138) amarok-1.4.5-CVE-2006-6979.patch: --- NEW FILE amarok-1.4.5-CVE-2006-6979.patch --- Index: src/magnatunebrowser/magnatunealbumdownloader.cpp =================================================================== --- amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp (revision 633106) +++ amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp (working copy) @@ -89,7 +89,7 @@ //ok, now we have the .zip file downloaded. All we need is to unpack it to the desired location and add it to the collection. - QString unzipString = "unzip \""+m_tempDir.name() + m_currentAlbumFileName + "\" -d \"" + m_currentAlbumUnpackLocation + "\" &"; + QString unzipString = KProcess::quote( "unzip \""+m_tempDir.name() + m_currentAlbumFileName + "\" -d \"" + m_currentAlbumUnpackLocation + "\" &" ); debug() << "unpacking: " << unzipString << endl; Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- amarok.spec 5 Feb 2007 20:33:06 -0000 1.73 +++ amarok.spec 14 Feb 2007 19:13:24 -0000 1.74 @@ -4,13 +4,14 @@ Name: amarok Summary: Media player for KDE Version: 1.4.5 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Multimedia License: GPL Url: http://amarok.kde.org # http://download.kde.org/download.php?url=stable/amarok/1.4.3/src Source0: http://mirrors.isc.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2 +Patch0: amarok-1.4.5-CVE-2006-6979.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdemultimedia-devel >= 6:3.2 @@ -80,6 +81,7 @@ %prep %setup -q +%patch0 -p0 -b .CVE-2006-6979 @@ -233,6 +235,9 @@ %changelog +* Wed Feb 14 2007 Aurelien Bompard 1.4.5-2 +- add patch to fix CVE-2006-6979 (bug 228138) + * Sat Feb 03 2007 Aurelien Bompard 1.4.5-1 - version 1.4.5 - drop patch0 and patch1 (merged upstream) From fedora-extras-commits at redhat.com Wed Feb 14 19:13:54 2007 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 14 Feb 2007 14:13:54 -0500 Subject: rpms/amarok/FC-6 amarok-1.4.5-CVE-2006-6979.patch, NONE, 1.1 amarok.spec, 1.71, 1.72 Message-ID: <200702141913.l1EJDsjT014663@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14600/FC-6 Modified Files: amarok.spec Added Files: amarok-1.4.5-CVE-2006-6979.patch Log Message: add patch to fix CVE-2006-6979 (bug 228138) amarok-1.4.5-CVE-2006-6979.patch: --- NEW FILE amarok-1.4.5-CVE-2006-6979.patch --- Index: src/magnatunebrowser/magnatunealbumdownloader.cpp =================================================================== --- amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp (revision 633106) +++ amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp (working copy) @@ -89,7 +89,7 @@ //ok, now we have the .zip file downloaded. All we need is to unpack it to the desired location and add it to the collection. - QString unzipString = "unzip \""+m_tempDir.name() + m_currentAlbumFileName + "\" -d \"" + m_currentAlbumUnpackLocation + "\" &"; + QString unzipString = KProcess::quote( "unzip \""+m_tempDir.name() + m_currentAlbumFileName + "\" -d \"" + m_currentAlbumUnpackLocation + "\" &" ); debug() << "unpacking: " << unzipString << endl; Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-6/amarok.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- amarok.spec 7 Feb 2007 18:27:50 -0000 1.71 +++ amarok.spec 14 Feb 2007 19:13:22 -0000 1.72 @@ -4,13 +4,14 @@ Name: amarok Summary: Media player for KDE Version: 1.4.5 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Multimedia License: GPL Url: http://amarok.kde.org # http://download.kde.org/download.php?url=stable/amarok/1.4.3/src Source0: http://mirrors.isc.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2 +Patch0: amarok-1.4.5-CVE-2006-6979.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdemultimedia-devel >= 6:3.2 @@ -80,6 +81,7 @@ %prep %setup -q +%patch0 -p0 -b .CVE-2006-6979 @@ -233,6 +235,9 @@ %changelog +* Wed Feb 14 2007 Aurelien Bompard 1.4.5-2 +- add patch to fix CVE-2006-6979 (bug 228138) + * Sat Feb 03 2007 Aurelien Bompard 1.4.5-1 - version 1.4.5 - drop patch0 and patch1 (merged upstream) From fedora-extras-commits at redhat.com Wed Feb 14 19:25:49 2007 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 14 Feb 2007 14:25:49 -0500 Subject: rpms/kid3/devel kid3.spec,1.14,1.15 Message-ID: <200702141925.l1EJPn2L014908@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/kid3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14887 Modified Files: kid3.spec Log Message: * Wed Feb 14 2007 Ville Skytt?? - 0.8.1-2 - Rebuild, drop workaround for #216783. Index: kid3.spec =================================================================== RCS file: /cvs/extras/rpms/kid3/devel/kid3.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- kid3.spec 22 Nov 2006 16:46:02 -0000 1.14 +++ kid3.spec 14 Feb 2007 19:25:17 -0000 1.15 @@ -1,6 +1,6 @@ Name: kid3 Version: 0.8.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Efficient ID3 tag editor Group: Applications/Multimedia @@ -27,7 +27,6 @@ %setup -q sed -i -e 's/\r//' LICENSE sed -i -e 's|/lib /usr/lib\b|/%{_lib} %{_libdir}|g' configure # lib64 rpaths -sed -i -e 's/-lid3/-lid3 -lz/' configure #216783 workaround %build @@ -78,6 +77,9 @@ %changelog +* Wed Feb 14 2007 Ville Skytt?? - 0.8.1-2 +- Rebuild, drop workaround for #216783. + * Wed Nov 22 2006 Ville Skytt?? - 0.8.1-1 - 0.8.1, desktop entry fixes applied upstream. - Re-enable musicbrainz support. From fedora-extras-commits at redhat.com Wed Feb 14 20:00:29 2007 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 14 Feb 2007 15:00:29 -0500 Subject: rpms/libtunepimp/devel libtunepimp.spec,1.26,1.27 Message-ID: <200702142000.l1EK0TUc015335@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libtunepimp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15304 Modified Files: libtunepimp.spec Log Message: * Wed Feb 14 2007 Rex Dieter 0.5.3-3 - respin (for flac) Index: libtunepimp.spec =================================================================== RCS file: /cvs/extras/rpms/libtunepimp/devel/libtunepimp.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- libtunepimp.spec 8 Dec 2006 17:58:31 -0000 1.26 +++ libtunepimp.spec 14 Feb 2007 19:59:57 -0000 1.27 @@ -2,7 +2,7 @@ Summary: A library for creating MusicBrainz enabled tagging applications Name: libtunepimp Version: 0.5.3 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL Group: System Environment/Libraries @@ -134,6 +134,9 @@ %changelog +* Wed Feb 14 2007 Rex Dieter 0.5.3-3 +- respin (for flac) + * Fri Dec 08 2006 Rex Dieter 0.5.3-2 - respin (for python) From fedora-extras-commits at redhat.com Wed Feb 14 20:23:23 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 14 Feb 2007 15:23:23 -0500 Subject: rpms/fedora-ds - New directory Message-ID: <200702142023.l1EKNNJA019043@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/fedora-ds In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19038/fedora-ds Log Message: Directory /cvs/extras/rpms/fedora-ds added to the repository From fedora-extras-commits at redhat.com Wed Feb 14 20:23:30 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 14 Feb 2007 15:23:30 -0500 Subject: rpms/fedora-ds/devel - New directory Message-ID: <200702142023.l1EKNUgx019059@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/fedora-ds/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19038/fedora-ds/devel Log Message: Directory /cvs/extras/rpms/fedora-ds/devel added to the repository From fedora-extras-commits at redhat.com Wed Feb 14 20:23:44 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 14 Feb 2007 15:23:44 -0500 Subject: rpms/fedora-ds Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702142023.l1EKNilD019092@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/fedora-ds In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19083 Added Files: Makefile import.log pkg.acl Log Message: Setup of module fedora-ds --- NEW FILE Makefile --- # Top level Makefile for module fedora-ds all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Wed Feb 14 20:23:52 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 14 Feb 2007 15:23:52 -0500 Subject: rpms/fedora-ds/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702142023.l1EKNqKo019109@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/fedora-ds/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19083/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module fedora-ds --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Feb 14 20:35:47 2007 From: fedora-extras-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 14 Feb 2007 15:35:47 -0500 Subject: rpms/fedora-ds import.log,1.1,1.2 Message-ID: <200702142035.l1EKZlo9019674@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/extras/rpms/fedora-ds In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19627 Modified Files: import.log Log Message: auto-import fedora-ds-1.1.0-0.1.20070213 on branch devel from fedora-ds-1.1.0-0.1.20070213.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fedora-ds/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 Feb 2007 20:23:42 -0000 1.1 +++ import.log 14 Feb 2007 20:35:15 -0000 1.2 @@ -0,0 +1 @@ +fedora-ds-1_1_0-0_1_20070213:HEAD:fedora-ds-1.1.0-0.1.20070213.src.rpm:1171485214 From fedora-extras-commits at redhat.com Wed Feb 14 20:35:49 2007 From: fedora-extras-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 14 Feb 2007 15:35:49 -0500 Subject: rpms/fedora-ds/devel fedora-ds-cvs.sh, NONE, 1.1 fedora-ds-devel.README, NONE, 1.1 fedora-ds.spec, NONE, 1.1 install.inf, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702142035.l1EKZnqM019678@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/extras/rpms/fedora-ds/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19627/devel Modified Files: .cvsignore sources Added Files: fedora-ds-cvs.sh fedora-ds-devel.README fedora-ds.spec install.inf Log Message: auto-import fedora-ds-1.1.0-0.1.20070213 on branch devel from fedora-ds-1.1.0-0.1.20070213.src.rpm --- NEW FILE fedora-ds-cvs.sh --- #!/bin/bash DATE=`date +%Y%m%d` CVSTAG=FedoraDirSvr110a1 VERSION=1.1.0 export CVSROOT=:pserver:anonymous at cvs.fedora.redhat.com:/cvs/dirsec cvs -z3 export -r$CVSTAG -d fedora-ds-$VERSION-$DATE ldapserver tar -cjf fedora-ds-$VERSION-$DATE.tar.bz2 fedora-ds-$VERSION-$DATE rm -rf fedora-ds-$VERSION-$DATE --- NEW FILE fedora-ds-devel.README --- For detailed information on developing plugins for Fedora Directory Server visit. http://www.redhat.com/docs/manuals/dir-server/plugin/contents.htm http://directory.fedora.redhat.com/wiki/Plugins --- NEW FILE fedora-ds.spec --- # cvsdate should correspond to the cvsdate in the fedora-ds-cvs.sh script %{!?cvsdate:%define cvsdate 20070213} Summary: Fedora Directory Server Name: fedora-ds Version: 1.1.0 Release: 0.1.%{?cvsdate}%{?dist} License: GPL plus extensions URL: http://directory.fedora.redhat.com/ Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: nspr-devel >= 4.6.4 BuildRequires: nss-devel >= 3.11.4 BuildRequires: svrcore-devel >= 4.0.3 BuildRequires: mozldap-devel >= 6.0.2 BuildRequires: db4-devel >= 4.2.52 BuildRequires: cyrus-sasl-devel >= 2.1.19 BuildRequires: icu >= 3.4 BuildRequires: libicu-devel >= 3.4 # The following are needed to build the snmp ldap-agent BuildRequires: net-snmp-devel >= 5.1.2 %ifnarch sparc sparc64 ppc ppc64 BuildRequires: lm_sensors-devel %endif BuildRequires: bzip2-devel BuildRequires: zlib-devel BuildRequires: openssl-devel BuildRequires: tcp_wrappers BuildRequires: libselinux-devel # the following is for the pam passthru auth plug-in BuildRequires: pam-devel # for the init script Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service Source0: %{name}-%{version}-%{cvsdate}.tar.bz2 # fedora-ds-cvs.sh should be used to generate the source tarball from CVS Source1: fedora-ds-cvs.sh Source2: install.inf Source3: fedora-ds-devel.README %description Fedora Directory Server is an LDAPv3 compliant server. %package devel Summary: Development libraries for Fedora Directory Server Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel Development Libraries and heades for Fedora Directory Server. %prep %setup -q -n %{name}-%{version}-%{cvsdate} cp %{SOURCE2} install.inf cp %{SOURCE3} README.devel %build %configure # Generate symbolic info for debuggers export XCFLAGS=$RPM_OPT_FLAGS %ifarch x86_64 ppc64 ia64 s390x sparc64 export USE_64=1 %endif make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR="$RPM_BUILD_ROOT" install mkdir -p $RPM_BUILD_ROOT/var/log/%{name} mkdir -p $RPM_BUILD_ROOT/var/lib/%{name} mkdir -p $RPM_BUILD_ROOT/var/lock/%{name} mkdir -p $RPM_BUILD_ROOT/var/tmp/%{name} mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name} #remove libtool and static libs rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.la install -p -m 644 ldap/servers/slapd/slapi-plugin.h $RPM_BUILD_ROOT%{_includedir}/%{name}/ # make sure perl scripts have a proper shebang sed -i -e 's|#{{PERL-EXEC}}|#!/usr/bin/perl|' $RPM_BUILD_ROOT%{_datadir}/%{name}/script-templates/template-*.pl sed -i -e 's|#{{PERL-EXEC}}|#!/usr/bin/perl|' $RPM_BUILD_ROOT%{_datadir}/%{name}/script-templates/template-migrate* %clean rm -rf $RPM_BUILD_ROOT %post /sbin/chkconfig --add fedora-ds /sbin/ldconfig %preun if [ $1 = 0 ]; then /sbin/service fedora-ds stop >/dev/null 2>&1 || : /sbin/chkconfig --del fedora-ds fi %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc LICENSE EXCEPTION install.inf %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/schema %config(noreplace)%{_sysconfdir}/%{name}/schema/*.ldif %dir %{_sysconfdir}/%{name}/property %config(noreplace)%{_sysconfdir}/%{name}/property/ns-slapd.properties %dir %{_sysconfdir}/%{name}/config %config(noreplace)%{_sysconfdir}/%{name}/config/slapd-collations.conf %config(noreplace)%{_sysconfdir}/%{name}/config/certmap.conf %{_datadir}/%{name} %{_initrddir}/fedora-ds %{_bindir}/* %{_sbindir}/ns-slapd %dir %{_libdir}/%{name} %{_libdir}/%{name}/*.so.* %dir %{_libdir}/%{name}/plugins %{_libdir}/%{name}/plugins/*.so %dir %{_localstatedir}/lib/%{name} %dir %{_localstatedir}/log/%{name} %dir %{_localstatedir}/lock/%{name} %dir %{_localstatedir}/tmp/%{name} %files devel %defattr(-,root,root,-) %doc LICENSE EXCEPTION README.devel %{_includedir}/%{name} %{_libdir}/%{name}/*.so %changelog * Tue Feb 13 2007 Rich Megginson - 1.1.0-0.1.20070213 - More cleanup suggested by Dennis Gilmore - This is the fedora extras candidate based on cvs tag FedoraDirSvr110a1 * Fri Feb 9 2007 Rich Megginson - 1.1.0-1.el4.20070209 - latest sources - added init scripts - use /etc as instconfigdir * Wed Feb 7 2007 Rich Megginson - 1.1.0-1.el4.20070207 - latest sources - moved all executables to _bindir * Mon Jan 29 2007 Rich Megginson - 1.1.0-1.el4.20070129 - latest sources - added /var/tmp/fedora-ds to dirs * Fri Jan 26 2007 Rich Megginson - 1.1.0-8.el4.20070125 - added logconv.pl - added slapi-plugin.h to devel package - added explicit dirs for /var/log/fedora-ds et. al. * Thu Jan 25 2007 Rich Megginson - 1.1.0-7.el4.20070125 - just move all .so files into the base package from the devel package * Thu Jan 25 2007 Rich Megginson - 1.1.0-6.el4.20070125 - Move the plugin *.so files into the main package instead of the devel - package because they are loaded directly by name via dlopen * Fri Jan 19 2007 Rich Megginson - 1.1.0-5.el4.20070125 - Move the script-templates directory to datadir/fedora-ds * Fri Jan 19 2007 Rich Megginson - 1.1.0-4.el4.20070119 - change mozldap to mozldap6 * Fri Jan 19 2007 Rich Megginson - 1.1.0-3.el4.20070119 - remove . from cvsdate define * Fri Jan 19 2007 Rich Megginson - 1.1.0-2.el4.20070119 - Having a problem building in Brew - may be Release format * Fri Jan 19 2007 Rich Megginson - 1.1.0-1.el4.cvs20070119 - Changed version to 1.1.0 and added Release 1.el4.cvs20070119 - merged in changes from Fedora Extras candidate spec file * Mon Jan 15 2007 Rich Megginson - 1.1-0.1.cvs20070115 - Bump component versions (nspr, nss, svrcore, mozldap) to their latest - remove unneeded patches * Tue Jan 09 2007 Dennis Gilmore - 1.1-0.1.cvs20070108 - update to a cvs snapshot - fedorafy the spec - create -devel subpackage - apply a patch to use mozldap not mozldap6 - apply a patch to allow --prefix to work correctly * Mon Dec 4 2006 Rich Megginson - 1.0.99-16 - Fixed the problem where the server would crash upon shutdown in dblayer - due to a race condition among the database housekeeping threads - Fix a problem with normalized absolute paths for db directories * Tue Nov 28 2006 Rich Megginson - 1.0.99-15 - Touch all of the ldap/admin/src/scripts/*.in files so that they - will be newer than their corresponding script template files, so - that make will rebuild them. * Mon Nov 27 2006 Rich Megginson - 1.0.99-14 - Chown new schema files when copying during instance creation * Tue Nov 21 2006 Rich Megginson - 1.0.99-13 - Configure will get ldapsdk_bindir from pkg-config, or $libdir/mozldap6 * Tue Nov 21 2006 Rich Megginson - 1.0.99-12 - use eval to sed ./configure into ../configure * Tue Nov 21 2006 Rich Megginson - 1.0.99-11 - jump through hoops to be able to run ../configure * Tue Nov 21 2006 Rich Megginson - 1.0.99-10 - Need to make built dir in setup section * Tue Nov 21 2006 Rich Megginson - 1.0.99-9 - The template scripts needed to use @libdir@ instead of hardcoding - /usr/lib - Use make DESTDIR=$RPM_BUILD_ROOT install instead of % makeinstall - do the actual build in a "built" subdirectory, until we remove - the old script templates * Thu Nov 16 2006 Rich Megginson - 1.0.99-8 - Make replication plugin link with libdb * Wed Nov 15 2006 Rich Megginson - 1.0.99-7 - Have make define LIBDIR, BINDIR, etc. for C code to use - especially for create_instance.h * Tue Nov 14 2006 Rich Megginson - 1.0.99-6 - Forgot to checkin new config.h.in for AC_CONFIG_HEADERS * Tue Nov 14 2006 Rich Megginson - 1.0.99-5 - Add perldap as a Requires; update sources * Thu Nov 9 2006 Rich Megginson - 1.0.99-4 - Fix ds_newinst.pl - Remove obsolete #defines * Thu Nov 9 2006 Rich Megginson - 1.0.99-3 - Update sources; rebuild to populate brew yum repo with dirsec-nss * Tue Nov 7 2006 Rich Megginson - 1.0.99-2 - Update sources * Thu Nov 2 2006 Rich Megginson - 1.0.99-1 - initial revision --- NEW FILE install.inf --- [General] FullMachineName= localhost.localdomain SuiteSpotUserID= nobody ServerRoot= /usr/lib/fedora-ds [slapd] ServerPort= 389 ServerIdentifier= localhost Suffix= dc=example,dc=com RootDN= cn=Directory Manager # If you attempt to use this file with RootDNPwd commented # out, you will get an error. You must supply a real # protected password instead of PutAPasswordHere # and uncomment the following line in order to use this # to create an instance with ds_newinst.pl #RootDNPwd= PutAPasswordHere Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fedora-ds/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Feb 2007 20:23:49 -0000 1.1 +++ .cvsignore 14 Feb 2007 20:35:17 -0000 1.2 @@ -0,0 +1 @@ +fedora-ds-1.1.0-20070213.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/fedora-ds/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Feb 2007 20:23:49 -0000 1.1 +++ sources 14 Feb 2007 20:35:17 -0000 1.2 @@ -0,0 +1 @@ +967afc85267cd68298c6136ae8485b70 fedora-ds-1.1.0-20070213.tar.bz2 From fedora-extras-commits at redhat.com Wed Feb 14 20:40:15 2007 From: fedora-extras-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 14 Feb 2007 15:40:15 -0500 Subject: rpms/fedora-ds import.log,1.2,1.3 Message-ID: <200702142040.l1EKeFL8019813@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/extras/rpms/fedora-ds In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19770 Modified Files: import.log Log Message: auto-import fedora-ds-1.1.0-0.1.20070213 on branch FC-5 from fedora-ds-1.1.0-0.1.20070213.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fedora-ds/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 14 Feb 2007 20:35:15 -0000 1.2 +++ import.log 14 Feb 2007 20:39:43 -0000 1.3 @@ -1 +1,2 @@ fedora-ds-1_1_0-0_1_20070213:HEAD:fedora-ds-1.1.0-0.1.20070213.src.rpm:1171485214 +fedora-ds-1_1_0-0_1_20070213:FC-5:fedora-ds-1.1.0-0.1.20070213.src.rpm:1171485482 From fedora-extras-commits at redhat.com Wed Feb 14 20:40:18 2007 From: fedora-extras-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 14 Feb 2007 15:40:18 -0500 Subject: rpms/fedora-ds/FC-5 fedora-ds-cvs.sh, NONE, 1.1 fedora-ds-devel.README, NONE, 1.1 fedora-ds.spec, NONE, 1.1 install.inf, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702142040.l1EKeIIV019817@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/extras/rpms/fedora-ds/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19770/FC-5 Modified Files: .cvsignore sources Added Files: fedora-ds-cvs.sh fedora-ds-devel.README fedora-ds.spec install.inf Log Message: auto-import fedora-ds-1.1.0-0.1.20070213 on branch FC-5 from fedora-ds-1.1.0-0.1.20070213.src.rpm --- NEW FILE fedora-ds-cvs.sh --- #!/bin/bash DATE=`date +%Y%m%d` CVSTAG=FedoraDirSvr110a1 VERSION=1.1.0 export CVSROOT=:pserver:anonymous at cvs.fedora.redhat.com:/cvs/dirsec cvs -z3 export -r$CVSTAG -d fedora-ds-$VERSION-$DATE ldapserver tar -cjf fedora-ds-$VERSION-$DATE.tar.bz2 fedora-ds-$VERSION-$DATE rm -rf fedora-ds-$VERSION-$DATE --- NEW FILE fedora-ds-devel.README --- For detailed information on developing plugins for Fedora Directory Server visit. http://www.redhat.com/docs/manuals/dir-server/plugin/contents.htm http://directory.fedora.redhat.com/wiki/Plugins --- NEW FILE fedora-ds.spec --- # cvsdate should correspond to the cvsdate in the fedora-ds-cvs.sh script %{!?cvsdate:%define cvsdate 20070213} Summary: Fedora Directory Server Name: fedora-ds Version: 1.1.0 Release: 0.1.%{?cvsdate}%{?dist} License: GPL plus extensions URL: http://directory.fedora.redhat.com/ Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: nspr-devel >= 4.6.4 BuildRequires: nss-devel >= 3.11.4 BuildRequires: svrcore-devel >= 4.0.3 BuildRequires: mozldap-devel >= 6.0.2 BuildRequires: db4-devel >= 4.2.52 BuildRequires: cyrus-sasl-devel >= 2.1.19 BuildRequires: icu >= 3.4 BuildRequires: libicu-devel >= 3.4 # The following are needed to build the snmp ldap-agent BuildRequires: net-snmp-devel >= 5.1.2 %ifnarch sparc sparc64 ppc ppc64 BuildRequires: lm_sensors-devel %endif BuildRequires: bzip2-devel BuildRequires: zlib-devel BuildRequires: openssl-devel BuildRequires: tcp_wrappers BuildRequires: libselinux-devel # the following is for the pam passthru auth plug-in BuildRequires: pam-devel # for the init script Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service Source0: %{name}-%{version}-%{cvsdate}.tar.bz2 # fedora-ds-cvs.sh should be used to generate the source tarball from CVS Source1: fedora-ds-cvs.sh Source2: install.inf Source3: fedora-ds-devel.README %description Fedora Directory Server is an LDAPv3 compliant server. %package devel Summary: Development libraries for Fedora Directory Server Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel Development Libraries and heades for Fedora Directory Server. %prep %setup -q -n %{name}-%{version}-%{cvsdate} cp %{SOURCE2} install.inf cp %{SOURCE3} README.devel %build %configure # Generate symbolic info for debuggers export XCFLAGS=$RPM_OPT_FLAGS %ifarch x86_64 ppc64 ia64 s390x sparc64 export USE_64=1 %endif make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR="$RPM_BUILD_ROOT" install mkdir -p $RPM_BUILD_ROOT/var/log/%{name} mkdir -p $RPM_BUILD_ROOT/var/lib/%{name} mkdir -p $RPM_BUILD_ROOT/var/lock/%{name} mkdir -p $RPM_BUILD_ROOT/var/tmp/%{name} mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name} #remove libtool and static libs rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.la install -p -m 644 ldap/servers/slapd/slapi-plugin.h $RPM_BUILD_ROOT%{_includedir}/%{name}/ # make sure perl scripts have a proper shebang sed -i -e 's|#{{PERL-EXEC}}|#!/usr/bin/perl|' $RPM_BUILD_ROOT%{_datadir}/%{name}/script-templates/template-*.pl sed -i -e 's|#{{PERL-EXEC}}|#!/usr/bin/perl|' $RPM_BUILD_ROOT%{_datadir}/%{name}/script-templates/template-migrate* %clean rm -rf $RPM_BUILD_ROOT %post /sbin/chkconfig --add fedora-ds /sbin/ldconfig %preun if [ $1 = 0 ]; then /sbin/service fedora-ds stop >/dev/null 2>&1 || : /sbin/chkconfig --del fedora-ds fi %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc LICENSE EXCEPTION install.inf %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/schema %config(noreplace)%{_sysconfdir}/%{name}/schema/*.ldif %dir %{_sysconfdir}/%{name}/property %config(noreplace)%{_sysconfdir}/%{name}/property/ns-slapd.properties %dir %{_sysconfdir}/%{name}/config %config(noreplace)%{_sysconfdir}/%{name}/config/slapd-collations.conf %config(noreplace)%{_sysconfdir}/%{name}/config/certmap.conf %{_datadir}/%{name} %{_initrddir}/fedora-ds %{_bindir}/* %{_sbindir}/ns-slapd %dir %{_libdir}/%{name} %{_libdir}/%{name}/*.so.* %dir %{_libdir}/%{name}/plugins %{_libdir}/%{name}/plugins/*.so %dir %{_localstatedir}/lib/%{name} %dir %{_localstatedir}/log/%{name} %dir %{_localstatedir}/lock/%{name} %dir %{_localstatedir}/tmp/%{name} %files devel %defattr(-,root,root,-) %doc LICENSE EXCEPTION README.devel %{_includedir}/%{name} %{_libdir}/%{name}/*.so %changelog * Tue Feb 13 2007 Rich Megginson - 1.1.0-0.1.20070213 - More cleanup suggested by Dennis Gilmore - This is the fedora extras candidate based on cvs tag FedoraDirSvr110a1 * Fri Feb 9 2007 Rich Megginson - 1.1.0-1.el4.20070209 - latest sources - added init scripts - use /etc as instconfigdir * Wed Feb 7 2007 Rich Megginson - 1.1.0-1.el4.20070207 - latest sources - moved all executables to _bindir * Mon Jan 29 2007 Rich Megginson - 1.1.0-1.el4.20070129 - latest sources - added /var/tmp/fedora-ds to dirs * Fri Jan 26 2007 Rich Megginson - 1.1.0-8.el4.20070125 - added logconv.pl - added slapi-plugin.h to devel package - added explicit dirs for /var/log/fedora-ds et. al. * Thu Jan 25 2007 Rich Megginson - 1.1.0-7.el4.20070125 - just move all .so files into the base package from the devel package * Thu Jan 25 2007 Rich Megginson - 1.1.0-6.el4.20070125 - Move the plugin *.so files into the main package instead of the devel - package because they are loaded directly by name via dlopen * Fri Jan 19 2007 Rich Megginson - 1.1.0-5.el4.20070125 - Move the script-templates directory to datadir/fedora-ds * Fri Jan 19 2007 Rich Megginson - 1.1.0-4.el4.20070119 - change mozldap to mozldap6 * Fri Jan 19 2007 Rich Megginson - 1.1.0-3.el4.20070119 - remove . from cvsdate define * Fri Jan 19 2007 Rich Megginson - 1.1.0-2.el4.20070119 - Having a problem building in Brew - may be Release format * Fri Jan 19 2007 Rich Megginson - 1.1.0-1.el4.cvs20070119 - Changed version to 1.1.0 and added Release 1.el4.cvs20070119 - merged in changes from Fedora Extras candidate spec file * Mon Jan 15 2007 Rich Megginson - 1.1-0.1.cvs20070115 - Bump component versions (nspr, nss, svrcore, mozldap) to their latest - remove unneeded patches * Tue Jan 09 2007 Dennis Gilmore - 1.1-0.1.cvs20070108 - update to a cvs snapshot - fedorafy the spec - create -devel subpackage - apply a patch to use mozldap not mozldap6 - apply a patch to allow --prefix to work correctly * Mon Dec 4 2006 Rich Megginson - 1.0.99-16 - Fixed the problem where the server would crash upon shutdown in dblayer - due to a race condition among the database housekeeping threads - Fix a problem with normalized absolute paths for db directories * Tue Nov 28 2006 Rich Megginson - 1.0.99-15 - Touch all of the ldap/admin/src/scripts/*.in files so that they - will be newer than their corresponding script template files, so - that make will rebuild them. * Mon Nov 27 2006 Rich Megginson - 1.0.99-14 - Chown new schema files when copying during instance creation * Tue Nov 21 2006 Rich Megginson - 1.0.99-13 - Configure will get ldapsdk_bindir from pkg-config, or $libdir/mozldap6 * Tue Nov 21 2006 Rich Megginson - 1.0.99-12 - use eval to sed ./configure into ../configure * Tue Nov 21 2006 Rich Megginson - 1.0.99-11 - jump through hoops to be able to run ../configure * Tue Nov 21 2006 Rich Megginson - 1.0.99-10 - Need to make built dir in setup section * Tue Nov 21 2006 Rich Megginson - 1.0.99-9 - The template scripts needed to use @libdir@ instead of hardcoding - /usr/lib - Use make DESTDIR=$RPM_BUILD_ROOT install instead of % makeinstall - do the actual build in a "built" subdirectory, until we remove - the old script templates * Thu Nov 16 2006 Rich Megginson - 1.0.99-8 - Make replication plugin link with libdb * Wed Nov 15 2006 Rich Megginson - 1.0.99-7 - Have make define LIBDIR, BINDIR, etc. for C code to use - especially for create_instance.h * Tue Nov 14 2006 Rich Megginson - 1.0.99-6 - Forgot to checkin new config.h.in for AC_CONFIG_HEADERS * Tue Nov 14 2006 Rich Megginson - 1.0.99-5 - Add perldap as a Requires; update sources * Thu Nov 9 2006 Rich Megginson - 1.0.99-4 - Fix ds_newinst.pl - Remove obsolete #defines * Thu Nov 9 2006 Rich Megginson - 1.0.99-3 - Update sources; rebuild to populate brew yum repo with dirsec-nss * Tue Nov 7 2006 Rich Megginson - 1.0.99-2 - Update sources * Thu Nov 2 2006 Rich Megginson - 1.0.99-1 - initial revision --- NEW FILE install.inf --- [General] FullMachineName= localhost.localdomain SuiteSpotUserID= nobody ServerRoot= /usr/lib/fedora-ds [slapd] ServerPort= 389 ServerIdentifier= localhost Suffix= dc=example,dc=com RootDN= cn=Directory Manager # If you attempt to use this file with RootDNPwd commented # out, you will get an error. You must supply a real # protected password instead of PutAPasswordHere # and uncomment the following line in order to use this # to create an instance with ds_newinst.pl #RootDNPwd= PutAPasswordHere Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fedora-ds/FC-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Feb 2007 20:23:49 -0000 1.1 +++ .cvsignore 14 Feb 2007 20:39:45 -0000 1.2 @@ -0,0 +1 @@ +fedora-ds-1.1.0-20070213.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/fedora-ds/FC-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Feb 2007 20:23:49 -0000 1.1 +++ sources 14 Feb 2007 20:39:45 -0000 1.2 @@ -0,0 +1 @@ +967afc85267cd68298c6136ae8485b70 fedora-ds-1.1.0-20070213.tar.bz2 From fedora-extras-commits at redhat.com Wed Feb 14 20:43:24 2007 From: fedora-extras-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 14 Feb 2007 15:43:24 -0500 Subject: rpms/fedora-ds/FC-6 fedora-ds-cvs.sh, NONE, 1.1 fedora-ds-devel.README, NONE, 1.1 fedora-ds.spec, NONE, 1.1 install.inf, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702142043.l1EKhO2w020115@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/extras/rpms/fedora-ds/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20059/FC-6 Modified Files: .cvsignore sources Added Files: fedora-ds-cvs.sh fedora-ds-devel.README fedora-ds.spec install.inf Log Message: auto-import fedora-ds-1.1.0-0.1.20070213 on branch FC-6 from fedora-ds-1.1.0-0.1.20070213.src.rpm --- NEW FILE fedora-ds-cvs.sh --- #!/bin/bash DATE=`date +%Y%m%d` CVSTAG=FedoraDirSvr110a1 VERSION=1.1.0 export CVSROOT=:pserver:anonymous at cvs.fedora.redhat.com:/cvs/dirsec cvs -z3 export -r$CVSTAG -d fedora-ds-$VERSION-$DATE ldapserver tar -cjf fedora-ds-$VERSION-$DATE.tar.bz2 fedora-ds-$VERSION-$DATE rm -rf fedora-ds-$VERSION-$DATE --- NEW FILE fedora-ds-devel.README --- For detailed information on developing plugins for Fedora Directory Server visit. http://www.redhat.com/docs/manuals/dir-server/plugin/contents.htm http://directory.fedora.redhat.com/wiki/Plugins --- NEW FILE fedora-ds.spec --- # cvsdate should correspond to the cvsdate in the fedora-ds-cvs.sh script %{!?cvsdate:%define cvsdate 20070213} Summary: Fedora Directory Server Name: fedora-ds Version: 1.1.0 Release: 0.1.%{?cvsdate}%{?dist} License: GPL plus extensions URL: http://directory.fedora.redhat.com/ Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: nspr-devel >= 4.6.4 BuildRequires: nss-devel >= 3.11.4 BuildRequires: svrcore-devel >= 4.0.3 BuildRequires: mozldap-devel >= 6.0.2 BuildRequires: db4-devel >= 4.2.52 BuildRequires: cyrus-sasl-devel >= 2.1.19 BuildRequires: icu >= 3.4 BuildRequires: libicu-devel >= 3.4 # The following are needed to build the snmp ldap-agent BuildRequires: net-snmp-devel >= 5.1.2 %ifnarch sparc sparc64 ppc ppc64 BuildRequires: lm_sensors-devel %endif BuildRequires: bzip2-devel BuildRequires: zlib-devel BuildRequires: openssl-devel BuildRequires: tcp_wrappers BuildRequires: libselinux-devel # the following is for the pam passthru auth plug-in BuildRequires: pam-devel # for the init script Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service Source0: %{name}-%{version}-%{cvsdate}.tar.bz2 # fedora-ds-cvs.sh should be used to generate the source tarball from CVS Source1: fedora-ds-cvs.sh Source2: install.inf Source3: fedora-ds-devel.README %description Fedora Directory Server is an LDAPv3 compliant server. %package devel Summary: Development libraries for Fedora Directory Server Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel Development Libraries and heades for Fedora Directory Server. %prep %setup -q -n %{name}-%{version}-%{cvsdate} cp %{SOURCE2} install.inf cp %{SOURCE3} README.devel %build %configure # Generate symbolic info for debuggers export XCFLAGS=$RPM_OPT_FLAGS %ifarch x86_64 ppc64 ia64 s390x sparc64 export USE_64=1 %endif make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR="$RPM_BUILD_ROOT" install mkdir -p $RPM_BUILD_ROOT/var/log/%{name} mkdir -p $RPM_BUILD_ROOT/var/lib/%{name} mkdir -p $RPM_BUILD_ROOT/var/lock/%{name} mkdir -p $RPM_BUILD_ROOT/var/tmp/%{name} mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name} #remove libtool and static libs rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.la install -p -m 644 ldap/servers/slapd/slapi-plugin.h $RPM_BUILD_ROOT%{_includedir}/%{name}/ # make sure perl scripts have a proper shebang sed -i -e 's|#{{PERL-EXEC}}|#!/usr/bin/perl|' $RPM_BUILD_ROOT%{_datadir}/%{name}/script-templates/template-*.pl sed -i -e 's|#{{PERL-EXEC}}|#!/usr/bin/perl|' $RPM_BUILD_ROOT%{_datadir}/%{name}/script-templates/template-migrate* %clean rm -rf $RPM_BUILD_ROOT %post /sbin/chkconfig --add fedora-ds /sbin/ldconfig %preun if [ $1 = 0 ]; then /sbin/service fedora-ds stop >/dev/null 2>&1 || : /sbin/chkconfig --del fedora-ds fi %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc LICENSE EXCEPTION install.inf %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/schema %config(noreplace)%{_sysconfdir}/%{name}/schema/*.ldif %dir %{_sysconfdir}/%{name}/property %config(noreplace)%{_sysconfdir}/%{name}/property/ns-slapd.properties %dir %{_sysconfdir}/%{name}/config %config(noreplace)%{_sysconfdir}/%{name}/config/slapd-collations.conf %config(noreplace)%{_sysconfdir}/%{name}/config/certmap.conf %{_datadir}/%{name} %{_initrddir}/fedora-ds %{_bindir}/* %{_sbindir}/ns-slapd %dir %{_libdir}/%{name} %{_libdir}/%{name}/*.so.* %dir %{_libdir}/%{name}/plugins %{_libdir}/%{name}/plugins/*.so %dir %{_localstatedir}/lib/%{name} %dir %{_localstatedir}/log/%{name} %dir %{_localstatedir}/lock/%{name} %dir %{_localstatedir}/tmp/%{name} %files devel %defattr(-,root,root,-) %doc LICENSE EXCEPTION README.devel %{_includedir}/%{name} %{_libdir}/%{name}/*.so %changelog * Tue Feb 13 2007 Rich Megginson - 1.1.0-0.1.20070213 - More cleanup suggested by Dennis Gilmore - This is the fedora extras candidate based on cvs tag FedoraDirSvr110a1 * Fri Feb 9 2007 Rich Megginson - 1.1.0-1.el4.20070209 - latest sources - added init scripts - use /etc as instconfigdir * Wed Feb 7 2007 Rich Megginson - 1.1.0-1.el4.20070207 - latest sources - moved all executables to _bindir * Mon Jan 29 2007 Rich Megginson - 1.1.0-1.el4.20070129 - latest sources - added /var/tmp/fedora-ds to dirs * Fri Jan 26 2007 Rich Megginson - 1.1.0-8.el4.20070125 - added logconv.pl - added slapi-plugin.h to devel package - added explicit dirs for /var/log/fedora-ds et. al. * Thu Jan 25 2007 Rich Megginson - 1.1.0-7.el4.20070125 - just move all .so files into the base package from the devel package * Thu Jan 25 2007 Rich Megginson - 1.1.0-6.el4.20070125 - Move the plugin *.so files into the main package instead of the devel - package because they are loaded directly by name via dlopen * Fri Jan 19 2007 Rich Megginson - 1.1.0-5.el4.20070125 - Move the script-templates directory to datadir/fedora-ds * Fri Jan 19 2007 Rich Megginson - 1.1.0-4.el4.20070119 - change mozldap to mozldap6 * Fri Jan 19 2007 Rich Megginson - 1.1.0-3.el4.20070119 - remove . from cvsdate define * Fri Jan 19 2007 Rich Megginson - 1.1.0-2.el4.20070119 - Having a problem building in Brew - may be Release format * Fri Jan 19 2007 Rich Megginson - 1.1.0-1.el4.cvs20070119 - Changed version to 1.1.0 and added Release 1.el4.cvs20070119 - merged in changes from Fedora Extras candidate spec file * Mon Jan 15 2007 Rich Megginson - 1.1-0.1.cvs20070115 - Bump component versions (nspr, nss, svrcore, mozldap) to their latest - remove unneeded patches * Tue Jan 09 2007 Dennis Gilmore - 1.1-0.1.cvs20070108 - update to a cvs snapshot - fedorafy the spec - create -devel subpackage - apply a patch to use mozldap not mozldap6 - apply a patch to allow --prefix to work correctly * Mon Dec 4 2006 Rich Megginson - 1.0.99-16 - Fixed the problem where the server would crash upon shutdown in dblayer - due to a race condition among the database housekeeping threads - Fix a problem with normalized absolute paths for db directories * Tue Nov 28 2006 Rich Megginson - 1.0.99-15 - Touch all of the ldap/admin/src/scripts/*.in files so that they - will be newer than their corresponding script template files, so - that make will rebuild them. * Mon Nov 27 2006 Rich Megginson - 1.0.99-14 - Chown new schema files when copying during instance creation * Tue Nov 21 2006 Rich Megginson - 1.0.99-13 - Configure will get ldapsdk_bindir from pkg-config, or $libdir/mozldap6 * Tue Nov 21 2006 Rich Megginson - 1.0.99-12 - use eval to sed ./configure into ../configure * Tue Nov 21 2006 Rich Megginson - 1.0.99-11 - jump through hoops to be able to run ../configure * Tue Nov 21 2006 Rich Megginson - 1.0.99-10 - Need to make built dir in setup section * Tue Nov 21 2006 Rich Megginson - 1.0.99-9 - The template scripts needed to use @libdir@ instead of hardcoding - /usr/lib - Use make DESTDIR=$RPM_BUILD_ROOT install instead of % makeinstall - do the actual build in a "built" subdirectory, until we remove - the old script templates * Thu Nov 16 2006 Rich Megginson - 1.0.99-8 - Make replication plugin link with libdb * Wed Nov 15 2006 Rich Megginson - 1.0.99-7 - Have make define LIBDIR, BINDIR, etc. for C code to use - especially for create_instance.h * Tue Nov 14 2006 Rich Megginson - 1.0.99-6 - Forgot to checkin new config.h.in for AC_CONFIG_HEADERS * Tue Nov 14 2006 Rich Megginson - 1.0.99-5 - Add perldap as a Requires; update sources * Thu Nov 9 2006 Rich Megginson - 1.0.99-4 - Fix ds_newinst.pl - Remove obsolete #defines * Thu Nov 9 2006 Rich Megginson - 1.0.99-3 - Update sources; rebuild to populate brew yum repo with dirsec-nss * Tue Nov 7 2006 Rich Megginson - 1.0.99-2 - Update sources * Thu Nov 2 2006 Rich Megginson - 1.0.99-1 - initial revision --- NEW FILE install.inf --- [General] FullMachineName= localhost.localdomain SuiteSpotUserID= nobody ServerRoot= /usr/lib/fedora-ds [slapd] ServerPort= 389 ServerIdentifier= localhost Suffix= dc=example,dc=com RootDN= cn=Directory Manager # If you attempt to use this file with RootDNPwd commented # out, you will get an error. You must supply a real # protected password instead of PutAPasswordHere # and uncomment the following line in order to use this # to create an instance with ds_newinst.pl #RootDNPwd= PutAPasswordHere Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fedora-ds/FC-6/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Feb 2007 20:23:49 -0000 1.1 +++ .cvsignore 14 Feb 2007 20:42:52 -0000 1.2 @@ -0,0 +1 @@ +fedora-ds-1.1.0-20070213.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/fedora-ds/FC-6/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Feb 2007 20:23:49 -0000 1.1 +++ sources 14 Feb 2007 20:42:52 -0000 1.2 @@ -0,0 +1 @@ +967afc85267cd68298c6136ae8485b70 fedora-ds-1.1.0-20070213.tar.bz2 From fedora-extras-commits at redhat.com Wed Feb 14 20:43:21 2007 From: fedora-extras-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 14 Feb 2007 15:43:21 -0500 Subject: rpms/fedora-ds import.log,1.3,1.4 Message-ID: <200702142043.l1EKhLYY020111@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/extras/rpms/fedora-ds In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20059 Modified Files: import.log Log Message: auto-import fedora-ds-1.1.0-0.1.20070213 on branch FC-6 from fedora-ds-1.1.0-0.1.20070213.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fedora-ds/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 14 Feb 2007 20:39:43 -0000 1.3 +++ import.log 14 Feb 2007 20:42:49 -0000 1.4 @@ -1,2 +1,3 @@ fedora-ds-1_1_0-0_1_20070213:HEAD:fedora-ds-1.1.0-0.1.20070213.src.rpm:1171485214 fedora-ds-1_1_0-0_1_20070213:FC-5:fedora-ds-1.1.0-0.1.20070213.src.rpm:1171485482 +fedora-ds-1_1_0-0_1_20070213:FC-6:fedora-ds-1.1.0-0.1.20070213.src.rpm:1171485668 From fedora-extras-commits at redhat.com Wed Feb 14 20:43:41 2007 From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann)) Date: Wed, 14 Feb 2007 15:43:41 -0500 Subject: fedora-security/audit fc5,1.450,1.451 Message-ID: <200702142043.l1EKhfip020165@cvs-int.fedora.redhat.com> Author: holtmann Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20107/audit Modified Files: fc5 Log Message: Update with FEDORA-2007-225 (kernel) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.450 retrieving revision 1.451 diff -u -r1.450 -r1.451 --- fc5 13 Feb 2007 18:21:32 -0000 1.450 +++ fc5 14 Feb 2007 20:43:39 -0000 1.451 @@ -14,7 +14,7 @@ CVE-2007-0104 ignore (poppler) only client DoS CVE-2007-0104 ignore (kdegraphics) only client DoS CVE-2007-0086 ignore (apache) not a security issue -CVE-2007-0006 VULNERABLE (kernel, fixed in -mm) +CVE-2007-0006 backport (kernel, fixed in -mm) [since FEDORA-2007-225] CVE-2006-6939 VULNERABLE (ed, fixed 0.3) #223075 CVE-2006-6870 backport (avahi, fixed 0.6.16) #221726 [since FEDORA-2007-018] CVE-2006-6899 version (bluez-utils, fixed 2.23) From fedora-extras-commits at redhat.com Wed Feb 14 20:48:07 2007 From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann)) Date: Wed, 14 Feb 2007 15:48:07 -0500 Subject: fedora-security/audit fc6,1.204,1.205 Message-ID: <200702142048.l1EKm79V020366@cvs-int.fedora.redhat.com> Author: holtmann Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20347/audit Modified Files: fc6 Log Message: Update with FEDORA-2007-226 (kernel) Index: fc6 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc6,v retrieving revision 1.204 retrieving revision 1.205 diff -u -r1.204 -r1.205 --- fc6 13 Feb 2007 18:21:32 -0000 1.204 +++ fc6 14 Feb 2007 20:48:05 -0000 1.205 @@ -21,7 +21,7 @@ CVE-2007-0104 ignore (poppler) only client DoS CVE-2007-0104 ignore (kdegraphics) only client DoS CVE-2007-0086 ignore (apache) not a security issue -CVE-2007-0006 VULNERABLE (kernel, fixed in -mm) +CVE-2007-0006 backport (kernel, fixed in -mm) [since FEDORA-2007-226] CVE-2006-6939 VULNERABLE (ed, fixed 0.3) #223075 CVE-2006-6899 version (bluez-utils, fixed 2.23) CVE-2006-6870 version (avahi, fixed 0.6.16) #221440 [since FEDORA-2007-019] From fedora-extras-commits at redhat.com Wed Feb 14 20:58:12 2007 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 14 Feb 2007 15:58:12 -0500 Subject: fedora-security/audit fe5,1.156,1.157 fe6,1.70,1.71 Message-ID: <200702142058.l1EKwCT2020464@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20445 Modified Files: fe5 fe6 Log Message: ejabberd, moin, mediawiki, moin, GraphicsMagick, amarok status update Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.156 retrieving revision 1.157 diff -u -r1.156 -r1.157 --- fe5 12 Feb 2007 17:09:18 -0000 1.156 +++ fe5 14 Feb 2007 20:58:10 -0000 1.157 @@ -2,7 +2,13 @@ ** are items that need attention +CVE-2007-0903 version (ejabberd, fixed 1.1.3) +CVE-2007-0902 ** (moin) #228764 +CVE-2007-0901 ** (moin) #228764 +CVE-2007-0894 ** (mediawiki, fixed 1.9.2) #228763 +CVE-2007-0884 ** (mimedefang, fixed 2.6.1) #228757 CVE-2007-0857 version (moin, fixed 1.5.7) #228139 +CVE-2007-0770 ** (GraphicsMagick) #228758 CVE-2007-0657 ignore (nexuiz, 2.2.2 only (not shipped), fixed 2.2.3) CVE-2007-0619 version (chmlib, fixed 0.3.9) #225919 CVE-2007-0541 version (wordpress, fixed 2.1-0) #225469 @@ -23,7 +29,7 @@ CVE-2007-0107 version (wordpress, fixed 2.1-0) #223101 CVE-2007-0106 version (wordpress, fixed 2.1-0) #223101 CVE-2007-0095 VULNERABLE (phpMyAdmin) #221694 -CVE-2006-6979 ** (amarok) #228138 +CVE-2006-6979 backport (amarok, fixed 1.4.5-2) #228138 CVE-2006-6944 version (phpMyAdmin, fixed 2.9.1.1) CVE-2006-6943 version (phpMyAdmin, fixed 2.9.1.1) CVE-2006-6942 version (phpMyAdmin, fixed 2.9.1.1) Index: fe6 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe6,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- fe6 12 Feb 2007 17:09:18 -0000 1.70 +++ fe6 14 Feb 2007 20:58:10 -0000 1.71 @@ -2,7 +2,13 @@ ** are items that need attention +CVE-2007-0903 version (ejabberd, fixed 1.1.3) +CVE-2007-0902 ** (moin) #228764 +CVE-2007-0901 ** (moin) #228764 +CVE-2007-0894 ** (mediawiki, fixed 1.9.2) #228763 +CVE-2007-0884 ** (mimedefang, fixed 2.6.1) #228757 CVE-2007-0857 version (moin, fixed 1.5.7) #228139 +CVE-2007-0770 ** (GraphicsMagick) #228758 CVE-2007-0657 ignore (nexuiz, 2.2.2 only (not shipped), fixed 2.2.3) CVE-2007-0619 version (chmlib, fixed 0.3.9) #225919 CVE-2007-0541 version (wordpress, fixed 2.1-0) #225469 @@ -23,7 +29,7 @@ CVE-2007-0107 version (wordpress, fixed 2.1-0) #223101 CVE-2007-0106 version (wordpress, fixed 2.1-0) #223101 CVE-2007-0095 VULNERABLE (phpMyAdmin) #221694 -CVE-2006-6979 ** (amarok) #228138 +CVE-2006-6979 backport (amarok, fixed 1.4.5-2) #228138 CVE-2006-6944 version (phpMyAdmin, fixed 2.9.1.1) CVE-2006-6943 version (phpMyAdmin, fixed 2.9.1.1) CVE-2006-6942 version (phpMyAdmin, fixed 2.9.1.1) From fedora-extras-commits at redhat.com Wed Feb 14 21:06:07 2007 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Wed, 14 Feb 2007 16:06:07 -0500 Subject: rpms/mimedefang/devel .cvsignore, 1.3, 1.4 mimedefang.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200702142106.l1EL67JC024021@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/extras/rpms/mimedefang/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23994 Modified Files: .cvsignore mimedefang.spec sources Log Message: Upgrade to 2.61 (#228757) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mimedefang/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2006 22:09:04 -0000 1.3 +++ .cvsignore 14 Feb 2007 21:05:35 -0000 1.4 @@ -1 +1 @@ -mimedefang-2.58.tar.gz +mimedefang-2.61.tar.gz Index: mimedefang.spec =================================================================== RCS file: /cvs/extras/rpms/mimedefang/devel/mimedefang.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mimedefang.spec 19 Dec 2006 13:50:05 -0000 1.5 +++ mimedefang.spec 14 Feb 2007 21:05:35 -0000 1.6 @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang -Version: 2.58 -Release: 3%{?dist} +Version: 2.61 +Release: 1%{?dist} License: GPL Group: System Environment/Daemons URL: http://www.mimedefang.org/ @@ -95,6 +95,9 @@ %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Wed Feb 14 2007 Robert Scheck 2.61-1 +- Upgrade to 2.61 (#228757) + * Tue Dec 19 2006 Robert Scheck 2.58-3 - Use Unix::Syslog over deprecated Sys::Syslog support (#219988) Index: sources =================================================================== RCS file: /cvs/extras/rpms/mimedefang/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2006 22:09:04 -0000 1.3 +++ sources 14 Feb 2007 21:05:35 -0000 1.4 @@ -1 +1 @@ -6424dd840f1a8251181bffb042e01961 mimedefang-2.58.tar.gz +3da2d687a40bd8ed2ef4b1db3a5ea863 mimedefang-2.61.tar.gz From fedora-extras-commits at redhat.com Wed Feb 14 21:07:08 2007 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Wed, 14 Feb 2007 16:07:08 -0500 Subject: rpms/mimedefang/EL-4 .cvsignore, 1.3, 1.4 mimedefang.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200702142107.l1EL78L9024058@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/extras/rpms/mimedefang/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24032 Modified Files: .cvsignore mimedefang.spec sources Log Message: Upgrade to 2.61 (#228757) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mimedefang/EL-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2006 22:09:04 -0000 1.3 +++ .cvsignore 14 Feb 2007 21:06:36 -0000 1.4 @@ -1 +1 @@ -mimedefang-2.58.tar.gz +mimedefang-2.61.tar.gz Index: mimedefang.spec =================================================================== RCS file: /cvs/extras/rpms/mimedefang/EL-4/mimedefang.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mimedefang.spec 19 Dec 2006 13:50:05 -0000 1.5 +++ mimedefang.spec 14 Feb 2007 21:06:36 -0000 1.6 @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang -Version: 2.58 -Release: 3%{?dist} +Version: 2.61 +Release: 1%{?dist} License: GPL Group: System Environment/Daemons URL: http://www.mimedefang.org/ @@ -95,6 +95,9 @@ %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Wed Feb 14 2007 Robert Scheck 2.61-1 +- Upgrade to 2.61 (#228757) + * Tue Dec 19 2006 Robert Scheck 2.58-3 - Use Unix::Syslog over deprecated Sys::Syslog support (#219988) Index: sources =================================================================== RCS file: /cvs/extras/rpms/mimedefang/EL-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2006 22:09:04 -0000 1.3 +++ sources 14 Feb 2007 21:06:36 -0000 1.4 @@ -1 +1 @@ -6424dd840f1a8251181bffb042e01961 mimedefang-2.58.tar.gz +3da2d687a40bd8ed2ef4b1db3a5ea863 mimedefang-2.61.tar.gz From fedora-extras-commits at redhat.com Wed Feb 14 21:08:16 2007 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Wed, 14 Feb 2007 16:08:16 -0500 Subject: rpms/mimedefang/EL-5 .cvsignore, 1.3, 1.4 mimedefang.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200702142108.l1EL8GS9024101@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/extras/rpms/mimedefang/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24073 Modified Files: .cvsignore mimedefang.spec sources Log Message: Upgrade to 2.61 (#228757) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mimedefang/EL-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2006 22:09:04 -0000 1.3 +++ .cvsignore 14 Feb 2007 21:07:43 -0000 1.4 @@ -1 +1 @@ -mimedefang-2.58.tar.gz +mimedefang-2.61.tar.gz Index: mimedefang.spec =================================================================== RCS file: /cvs/extras/rpms/mimedefang/EL-5/mimedefang.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mimedefang.spec 19 Dec 2006 13:50:05 -0000 1.5 +++ mimedefang.spec 14 Feb 2007 21:07:43 -0000 1.6 @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang -Version: 2.58 -Release: 3%{?dist} +Version: 2.61 +Release: 1%{?dist} License: GPL Group: System Environment/Daemons URL: http://www.mimedefang.org/ @@ -95,6 +95,9 @@ %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Wed Feb 14 2007 Robert Scheck 2.61-1 +- Upgrade to 2.61 (#228757) + * Tue Dec 19 2006 Robert Scheck 2.58-3 - Use Unix::Syslog over deprecated Sys::Syslog support (#219988) Index: sources =================================================================== RCS file: /cvs/extras/rpms/mimedefang/EL-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2006 22:09:04 -0000 1.3 +++ sources 14 Feb 2007 21:07:43 -0000 1.4 @@ -1 +1 @@ -6424dd840f1a8251181bffb042e01961 mimedefang-2.58.tar.gz +3da2d687a40bd8ed2ef4b1db3a5ea863 mimedefang-2.61.tar.gz From fedora-extras-commits at redhat.com Wed Feb 14 21:09:15 2007 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Wed, 14 Feb 2007 16:09:15 -0500 Subject: rpms/mimedefang/FC-5 .cvsignore, 1.3, 1.4 mimedefang.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200702142109.l1EL9FI9024144@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/extras/rpms/mimedefang/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24119 Modified Files: .cvsignore mimedefang.spec sources Log Message: Upgrade to 2.61 (#228757) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mimedefang/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2006 22:11:22 -0000 1.3 +++ .cvsignore 14 Feb 2007 21:08:42 -0000 1.4 @@ -1 +1 @@ -mimedefang-2.58.tar.gz +mimedefang-2.61.tar.gz Index: mimedefang.spec =================================================================== RCS file: /cvs/extras/rpms/mimedefang/FC-5/mimedefang.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mimedefang.spec 19 Dec 2006 13:51:31 -0000 1.5 +++ mimedefang.spec 14 Feb 2007 21:08:42 -0000 1.6 @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang -Version: 2.58 -Release: 3%{?dist} +Version: 2.61 +Release: 1%{?dist} License: GPL Group: System Environment/Daemons URL: http://www.mimedefang.org/ @@ -95,6 +95,9 @@ %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Wed Feb 14 2007 Robert Scheck 2.61-1 +- Upgrade to 2.61 (#228757) + * Tue Dec 19 2006 Robert Scheck 2.58-3 - Use Unix::Syslog over deprecated Sys::Syslog support (#219988) Index: sources =================================================================== RCS file: /cvs/extras/rpms/mimedefang/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2006 22:11:22 -0000 1.3 +++ sources 14 Feb 2007 21:08:42 -0000 1.4 @@ -1 +1 @@ -6424dd840f1a8251181bffb042e01961 mimedefang-2.58.tar.gz +3da2d687a40bd8ed2ef4b1db3a5ea863 mimedefang-2.61.tar.gz From fedora-extras-commits at redhat.com Wed Feb 14 21:10:09 2007 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Wed, 14 Feb 2007 16:10:09 -0500 Subject: rpms/mimedefang/FC-6 .cvsignore, 1.3, 1.4 mimedefang.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200702142110.l1ELA9fD024178@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/extras/rpms/mimedefang/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24155 Modified Files: .cvsignore mimedefang.spec sources Log Message: Upgrade to 2.61 (#228757) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mimedefang/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2006 22:10:24 -0000 1.3 +++ .cvsignore 14 Feb 2007 21:09:37 -0000 1.4 @@ -1 +1 @@ -mimedefang-2.58.tar.gz +mimedefang-2.61.tar.gz Index: mimedefang.spec =================================================================== RCS file: /cvs/extras/rpms/mimedefang/FC-6/mimedefang.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mimedefang.spec 19 Dec 2006 13:50:48 -0000 1.5 +++ mimedefang.spec 14 Feb 2007 21:09:37 -0000 1.6 @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang -Version: 2.58 -Release: 3%{?dist} +Version: 2.61 +Release: 1%{?dist} License: GPL Group: System Environment/Daemons URL: http://www.mimedefang.org/ @@ -95,6 +95,9 @@ %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Wed Feb 14 2007 Robert Scheck 2.61-1 +- Upgrade to 2.61 (#228757) + * Tue Dec 19 2006 Robert Scheck 2.58-3 - Use Unix::Syslog over deprecated Sys::Syslog support (#219988) Index: sources =================================================================== RCS file: /cvs/extras/rpms/mimedefang/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2006 22:10:24 -0000 1.3 +++ sources 14 Feb 2007 21:09:37 -0000 1.4 @@ -1 +1 @@ -6424dd840f1a8251181bffb042e01961 mimedefang-2.58.tar.gz +3da2d687a40bd8ed2ef4b1db3a5ea863 mimedefang-2.61.tar.gz From fedora-extras-commits at redhat.com Wed Feb 14 21:34:14 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 14 Feb 2007 16:34:14 -0500 Subject: rpms/hunspell-hr - New directory Message-ID: <200702142134.l1ELYE9m024668@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-hr In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24663/hunspell-hr Log Message: Directory /cvs/extras/rpms/hunspell-hr added to the repository From fedora-extras-commits at redhat.com Wed Feb 14 21:34:21 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 14 Feb 2007 16:34:21 -0500 Subject: rpms/hunspell-hr/devel - New directory Message-ID: <200702142134.l1ELYLN5024682@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-hr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24663/hunspell-hr/devel Log Message: Directory /cvs/extras/rpms/hunspell-hr/devel added to the repository From fedora-extras-commits at redhat.com Wed Feb 14 21:34:33 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 14 Feb 2007 16:34:33 -0500 Subject: rpms/hunspell-hr Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702142134.l1ELYXb0024716@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-hr In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24706 Added Files: Makefile import.log pkg.acl Log Message: Setup of module hunspell-hr --- NEW FILE Makefile --- # Top level Makefile for module hunspell-hr all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Wed Feb 14 21:34:41 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 14 Feb 2007 16:34:41 -0500 Subject: rpms/hunspell-hr/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702142134.l1ELYffM024734@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-hr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24706/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module hunspell-hr --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Feb 14 21:35:41 2007 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 14 Feb 2007 16:35:41 -0500 Subject: rpms/gnu-smalltalk/devel .cvsignore, 1.4, 1.5 gnu-smalltalk.spec, 1.9, 1.10 sources, 1.4, 1.5 gst-2.3.2-am.patch, 1.2, NONE Message-ID: <200702142135.l1ELZfBR024792@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/gnu-smalltalk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24757 Modified Files: .cvsignore gnu-smalltalk.spec sources Removed Files: gst-2.3.2-am.patch Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnu-smalltalk/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 31 Jan 2007 15:32:18 -0000 1.4 +++ .cvsignore 14 Feb 2007 21:35:09 -0000 1.5 @@ -1 +1 @@ -smalltalk-2.3.2.tar.gz +smalltalk-2.3.3.tar.gz Index: gnu-smalltalk.spec =================================================================== RCS file: /cvs/extras/rpms/gnu-smalltalk/devel/gnu-smalltalk.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gnu-smalltalk.spec 14 Feb 2007 16:22:10 -0000 1.9 +++ gnu-smalltalk.spec 14 Feb 2007 21:35:09 -0000 1.10 @@ -1,10 +1,9 @@ Summary: GNU Smalltalk Name: gnu-smalltalk -Version: 2.3.2 -Release: 6%{?dist} -# Source: smalltalk-2.2b.tar.gz +Version: 2.3.3 +Release: 1%{?dist} Source: ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-%{version}.tar.gz -Patch1: gst-2.3.2-am.patch +Patch1: gst-2.3.3-am.patch License: GPL Group: Development/Languages URL: http://www.gnu.org/software/smalltalk/smalltalk.html @@ -65,11 +64,12 @@ %patch1 -p1 -b .automake %build -#automake -#autoreconf +automake +autoreconf %configure --with-tcl=%{_libdir} --with-tk=%{_libdir} \ - --enable-static=no --enable-shared=yes --disable-rpath + --enable-static=no --enable-shared=yes --disable-rpath \ + --with-imagedir=%{_libdir}/%{name} make %{?_smp_mflags} LIBTOOL="%{_bindir}/libtool" @@ -133,7 +133,6 @@ %{_libdir}/pkgconfig/gnu-smalltalk.pc %{_datadir}/aclocal/*.m4 -%{_datadir}/gnu-smalltalk/ %{_includedir}/gst.h %{_includedir}/gstpub.h @@ -143,6 +142,9 @@ %{_datadir}/emacs/site-lisp/* %changelog +* Wed Feb 14 2007 Jochen Schmitt 2.3.3-1 +- New upstream release + * Tue Feb 13 2007 Jochen Schmitt 2.3.2-6 - Solve multilib issue (#228175) Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnu-smalltalk/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 31 Jan 2007 15:32:18 -0000 1.4 +++ sources 14 Feb 2007 21:35:09 -0000 1.5 @@ -1 +1 @@ -2a4237e1d9b6296b290f5b5fe8d8efd7 smalltalk-2.3.2.tar.gz +79eaff2e19b82b5da08ac5a939317a49 smalltalk-2.3.3.tar.gz --- gst-2.3.2-am.patch DELETED --- From fedora-extras-commits at redhat.com Wed Feb 14 21:38:07 2007 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 14 Feb 2007 16:38:07 -0500 Subject: rpms/gnu-smalltalk/devel gst-2.3.3-am.patch, NONE, 1.1 gnu-smalltalk.spec, 1.10, 1.11 Message-ID: <200702142138.l1ELc7or024925@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/gnu-smalltalk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24899 Modified Files: gnu-smalltalk.spec Added Files: gst-2.3.3-am.patch Log Message: Add forgotten file gst-2.3.3-am.patch: --- NEW FILE gst-2.3.3-am.patch --- --- smalltalk-2.3.3/configure.automake 2007-02-13 09:25:30.000000000 +0100 +++ smalltalk-2.3.3/configure 2007-02-14 22:12:54.000000000 +0100 @@ -723,7 +723,7 @@ # Identity of this package. PACKAGE_NAME='GNU Smalltalk' -PACKAGE_TARNAME='smalltalk' +PACKAGE_TARNAME='gnu-smalltalk' PACKAGE_VERSION='2.3.3' PACKAGE_STRING='GNU Smalltalk 2.3.3' PACKAGE_BUGREPORT='help-smalltalk at gnu.org' @@ -1497,7 +1497,7 @@ --infodir=DIR info documentation [DATAROOTDIR/info] --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/smalltalk] + --docdir=DIR documentation root [DATAROOTDIR/doc/gnu-smalltalk] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -2427,7 +2427,7 @@ # Define the identity of the package. - PACKAGE='smalltalk' + PACKAGE='gnu-smalltalk' VERSION='2.3.3' --- smalltalk-2.3.3/Makefile.in.automake 2007-02-13 16:13:32.000000000 +0100 +++ smalltalk-2.3.3/Makefile.in 2007-02-14 22:17:49.000000000 +0100 @@ -274,7 +274,7 @@ NCURSES_DISABLED = @NCURSES_DISABLED@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -PACKAGE = smalltalk +PACKAGE = gnu-smalltalk PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ @@ -322,7 +322,7 @@ host_os = @host_os@ host_vendor = @host_vendor@ htmldir = @htmldir@ -imagedir = @imagedir@ +imagedir = ${libdir}/@PACKAGE@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -1133,20 +1133,20 @@ install-data-hook: gst-package rm -f $(DESTDIR)$(pkgdatadir)/packages.xml ./gst-package --srcdir="$(srcdir)" --no-load --destdir="$(DESTDIR)" \ - --target-dir="$(pkgdatadir)" packages.xml + --target-dir="$(imagedir)" packages.xml $(mkdir_p) $(DESTDIR)$(imagedir) rm -f $(DESTDIR)$(imagedir)/gst.im srcdir=`cd $(srcdir) && pwd`; \ cd $(DESTDIR)$(imagedir) && \ - SMALLTALK_KERNEL=$(DESTDIR)$(pkgdatadir)/kernel \ + SMALLTALK_KERNEL=$(DESTDIR)$(imagedir)/kernel \ SMALLTALK_IMAGE=$(DESTDIR)$(imagedir) \ $(DESTDIR)$(bindir)/gst -f $$srcdir/scripts/Finish.st \ - "$(pkgdatadir)" "$(imagedir)" $(MODULES) + "$(imagedir)" "$(imagedir)" $(MODULES) uninstall-local:: gst-package ./gst-package --uninstall --destdir="$(DESTDIR)" packages.xml - -rm -f $(DESTDIR)$(pkgdatadir)/packages.xml - -rm -f $(DESTDIR)$(pkgdatadir)/gst.im + -rm -f $(DESTDIR)$(imagedir)/packages.xml + -rm -f $(DESTDIR)$(imagedir)/gst.im installcheck-local: if test -n "$(DESTDIR)"; then :; else \ --- smalltalk-2.3.3/Makefile.am.automake 2007-02-13 16:13:22.000000000 +0100 +++ smalltalk-2.3.3/Makefile.am 2007-02-14 22:12:25.000000000 +0100 @@ -19,7 +19,7 @@ AUTOMAKE_OPTIONS = gnu 1.8 ACLOCAL_AMFLAGS = -I build-aux -PACKAGE=smalltalk +PACKAGE=gnu-smalltalk DIST_SUBDIRS = lib-src snprintfv lightning sigsegv libffi opcode libgst \ i18n tcp examples blox-tk . gtk tests doc @@ -50,6 +50,7 @@ ########################################################### pkgconfigdir = $(libdir)/pkgconfig +imagedir = ${libdir}/@PACKAGE@ nodist_pkgconfig_DATA = gnu-smalltalk.pc pkglib_DATA = libc.la @@ -175,20 +176,20 @@ install-data-hook: gst-package rm -f $(DESTDIR)$(pkgdatadir)/packages.xml ./gst-package --srcdir="$(srcdir)" --no-load --destdir="$(DESTDIR)" \ - --target-dir="$(pkgdatadir)" packages.xml + --target-dir="$(imagedir)" packages.xml $(mkdir_p) $(DESTDIR)$(imagedir) rm -f $(DESTDIR)$(imagedir)/gst.im srcdir=`cd $(srcdir) && pwd`; \ cd $(DESTDIR)$(imagedir) && \ - SMALLTALK_KERNEL=$(DESTDIR)$(pkgdatadir)/kernel \ + SMALLTALK_KERNEL=$(DESTDIR)$(imagedir)/kernel \ SMALLTALK_IMAGE=$(DESTDIR)$(imagedir) \ $(DESTDIR)$(bindir)/gst -f $$srcdir/scripts/Finish.st \ - "$(pkgdatadir)" "$(imagedir)" $(MODULES) + "$(imagedir)" "$(imagedir)" $(MODULES) uninstall-local:: gst-package ./gst-package --uninstall --destdir="$(DESTDIR)" packages.xml - -rm -f $(DESTDIR)$(pkgdatadir)/packages.xml - -rm -f $(DESTDIR)$(pkgdatadir)/gst.im + -rm -f $(DESTDIR)$(imagedir)/packages.xml + -rm -f $(DESTDIR)$(imagedir)/gst.im installcheck-local: if test -n "$(DESTDIR)"; then :; else \ --- smalltalk-2.3.3/configure.ac.automake 2007-02-13 09:25:00.000000000 +0100 +++ smalltalk-2.3.3/configure.ac 2007-02-14 22:12:25.000000000 +0100 @@ -7,7 +7,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.60) -AC_INIT([GNU Smalltalk], 2.3.3, help-smalltalk at gnu.org, smalltalk) +AC_INIT([GNU Smalltalk], 2.3.3, help-smalltalk at gnu.org, gnu-smalltalk) MAINTAINER="bonzini at gnu.org" dnl CURRENT:REVISION:AGE means this is the REVISION-th version of --- smalltalk-2.3.3/examples/Makefile.in.automake 2007-02-14 22:17:01.000000000 +0100 +++ smalltalk-2.3.3/examples/Makefile.in 2007-02-14 22:17:48.000000000 +0100 @@ -277,7 +277,7 @@ subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -examplemodulesdir = $(pkgdatadir)/examples/modules +examplemodulesdir = $(imagedir)/examples/modules dist_examplemodules_DATA = gdbm.st gdbm-c.st md5.st EXTRA_LTLIBRARIES = gdbm.la pkglib_LTLIBRARIES = @MODULES_EXAMPLE@ md5.la --- smalltalk-2.3.3/examples/Makefile.am.automake 2007-02-14 22:16:46.000000000 +0100 +++ smalltalk-2.3.3/examples/Makefile.am 2007-02-14 22:17:43.000000000 +0100 @@ -1,4 +1,4 @@ -examplemodulesdir = $(pkgdatadir)/examples/modules +examplemodulesdir = $(imagedir)/examples/modules dist_examplemodules_DATA = gdbm.st gdbm-c.st md5.st --- smalltalk-2.3.3/libgst/Makefile.am.automake 2007-02-13 17:32:35.000000000 +0100 +++ smalltalk-2.3.3/libgst/Makefile.am 2007-02-14 22:12:25.000000000 +0100 @@ -113,6 +113,7 @@ @echo timestamp > $(srcdir)/match.stamp + # rules for invoking genprims # Try to economize in the rebuilds, by avoiding unnecessary # changes to the timestamp of prims.inl Index: gnu-smalltalk.spec =================================================================== RCS file: /cvs/extras/rpms/gnu-smalltalk/devel/gnu-smalltalk.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gnu-smalltalk.spec 14 Feb 2007 21:35:09 -0000 1.10 +++ gnu-smalltalk.spec 14 Feb 2007 21:37:35 -0000 1.11 @@ -1,7 +1,7 @@ Summary: GNU Smalltalk Name: gnu-smalltalk Version: 2.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Source: ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-%{version}.tar.gz Patch1: gst-2.3.3-am.patch License: GPL @@ -142,7 +142,7 @@ %{_datadir}/emacs/site-lisp/* %changelog -* Wed Feb 14 2007 Jochen Schmitt 2.3.3-1 +* Wed Feb 14 2007 Jochen Schmitt 2.3.3-2 - New upstream release * Tue Feb 13 2007 Jochen Schmitt 2.3.2-6 From fedora-extras-commits at redhat.com Wed Feb 14 21:39:12 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 14 Feb 2007 16:39:12 -0500 Subject: rpms/hunspell-th - New directory Message-ID: <200702142139.l1ELdCJa025023@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-th In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25018/hunspell-th Log Message: Directory /cvs/extras/rpms/hunspell-th added to the repository From fedora-extras-commits at redhat.com Wed Feb 14 21:39:19 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 14 Feb 2007 16:39:19 -0500 Subject: rpms/hunspell-th/devel - New directory Message-ID: <200702142139.l1ELdJKg025037@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-th/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25018/hunspell-th/devel Log Message: Directory /cvs/extras/rpms/hunspell-th/devel added to the repository From fedora-extras-commits at redhat.com Wed Feb 14 21:39:32 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 14 Feb 2007 16:39:32 -0500 Subject: rpms/hunspell-th Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702142139.l1ELdWNP025075@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-th In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25063 Added Files: Makefile import.log pkg.acl Log Message: Setup of module hunspell-th --- NEW FILE Makefile --- # Top level Makefile for module hunspell-th all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Wed Feb 14 21:39:40 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 14 Feb 2007 16:39:40 -0500 Subject: rpms/hunspell-th/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702142139.l1ELdeEw025096@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-th/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25063/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module hunspell-th --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Feb 14 21:41:43 2007 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 14 Feb 2007 16:41:43 -0500 Subject: rpms/gnu-smalltalk/FC-6 gst-2.3.3-am.patch, NONE, 1.1 gnu-smalltalk.spec, 1.5, 1.6 sources, 1.3, 1.4 gst-2.3.2-am.patch, 1.2, NONE Message-ID: <200702142141.l1ELfhn7025160@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/gnu-smalltalk/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25133 Modified Files: gnu-smalltalk.spec sources Added Files: gst-2.3.3-am.patch Removed Files: gst-2.3.2-am.patch Log Message: New upstream release gst-2.3.3-am.patch: --- NEW FILE gst-2.3.3-am.patch --- --- smalltalk-2.3.3/configure.automake 2007-02-13 09:25:30.000000000 +0100 +++ smalltalk-2.3.3/configure 2007-02-14 22:12:54.000000000 +0100 @@ -723,7 +723,7 @@ # Identity of this package. PACKAGE_NAME='GNU Smalltalk' -PACKAGE_TARNAME='smalltalk' +PACKAGE_TARNAME='gnu-smalltalk' PACKAGE_VERSION='2.3.3' PACKAGE_STRING='GNU Smalltalk 2.3.3' PACKAGE_BUGREPORT='help-smalltalk at gnu.org' @@ -1497,7 +1497,7 @@ --infodir=DIR info documentation [DATAROOTDIR/info] --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/smalltalk] + --docdir=DIR documentation root [DATAROOTDIR/doc/gnu-smalltalk] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -2427,7 +2427,7 @@ # Define the identity of the package. - PACKAGE='smalltalk' + PACKAGE='gnu-smalltalk' VERSION='2.3.3' --- smalltalk-2.3.3/Makefile.in.automake 2007-02-13 16:13:32.000000000 +0100 +++ smalltalk-2.3.3/Makefile.in 2007-02-14 22:17:49.000000000 +0100 @@ -274,7 +274,7 @@ NCURSES_DISABLED = @NCURSES_DISABLED@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -PACKAGE = smalltalk +PACKAGE = gnu-smalltalk PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ @@ -322,7 +322,7 @@ host_os = @host_os@ host_vendor = @host_vendor@ htmldir = @htmldir@ -imagedir = @imagedir@ +imagedir = ${libdir}/@PACKAGE@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -1133,20 +1133,20 @@ install-data-hook: gst-package rm -f $(DESTDIR)$(pkgdatadir)/packages.xml ./gst-package --srcdir="$(srcdir)" --no-load --destdir="$(DESTDIR)" \ - --target-dir="$(pkgdatadir)" packages.xml + --target-dir="$(imagedir)" packages.xml $(mkdir_p) $(DESTDIR)$(imagedir) rm -f $(DESTDIR)$(imagedir)/gst.im srcdir=`cd $(srcdir) && pwd`; \ cd $(DESTDIR)$(imagedir) && \ - SMALLTALK_KERNEL=$(DESTDIR)$(pkgdatadir)/kernel \ + SMALLTALK_KERNEL=$(DESTDIR)$(imagedir)/kernel \ SMALLTALK_IMAGE=$(DESTDIR)$(imagedir) \ $(DESTDIR)$(bindir)/gst -f $$srcdir/scripts/Finish.st \ - "$(pkgdatadir)" "$(imagedir)" $(MODULES) + "$(imagedir)" "$(imagedir)" $(MODULES) uninstall-local:: gst-package ./gst-package --uninstall --destdir="$(DESTDIR)" packages.xml - -rm -f $(DESTDIR)$(pkgdatadir)/packages.xml - -rm -f $(DESTDIR)$(pkgdatadir)/gst.im + -rm -f $(DESTDIR)$(imagedir)/packages.xml + -rm -f $(DESTDIR)$(imagedir)/gst.im installcheck-local: if test -n "$(DESTDIR)"; then :; else \ --- smalltalk-2.3.3/Makefile.am.automake 2007-02-13 16:13:22.000000000 +0100 +++ smalltalk-2.3.3/Makefile.am 2007-02-14 22:12:25.000000000 +0100 @@ -19,7 +19,7 @@ AUTOMAKE_OPTIONS = gnu 1.8 ACLOCAL_AMFLAGS = -I build-aux -PACKAGE=smalltalk +PACKAGE=gnu-smalltalk DIST_SUBDIRS = lib-src snprintfv lightning sigsegv libffi opcode libgst \ i18n tcp examples blox-tk . gtk tests doc @@ -50,6 +50,7 @@ ########################################################### pkgconfigdir = $(libdir)/pkgconfig +imagedir = ${libdir}/@PACKAGE@ nodist_pkgconfig_DATA = gnu-smalltalk.pc pkglib_DATA = libc.la @@ -175,20 +176,20 @@ install-data-hook: gst-package rm -f $(DESTDIR)$(pkgdatadir)/packages.xml ./gst-package --srcdir="$(srcdir)" --no-load --destdir="$(DESTDIR)" \ - --target-dir="$(pkgdatadir)" packages.xml + --target-dir="$(imagedir)" packages.xml $(mkdir_p) $(DESTDIR)$(imagedir) rm -f $(DESTDIR)$(imagedir)/gst.im srcdir=`cd $(srcdir) && pwd`; \ cd $(DESTDIR)$(imagedir) && \ - SMALLTALK_KERNEL=$(DESTDIR)$(pkgdatadir)/kernel \ + SMALLTALK_KERNEL=$(DESTDIR)$(imagedir)/kernel \ SMALLTALK_IMAGE=$(DESTDIR)$(imagedir) \ $(DESTDIR)$(bindir)/gst -f $$srcdir/scripts/Finish.st \ - "$(pkgdatadir)" "$(imagedir)" $(MODULES) + "$(imagedir)" "$(imagedir)" $(MODULES) uninstall-local:: gst-package ./gst-package --uninstall --destdir="$(DESTDIR)" packages.xml - -rm -f $(DESTDIR)$(pkgdatadir)/packages.xml - -rm -f $(DESTDIR)$(pkgdatadir)/gst.im + -rm -f $(DESTDIR)$(imagedir)/packages.xml + -rm -f $(DESTDIR)$(imagedir)/gst.im installcheck-local: if test -n "$(DESTDIR)"; then :; else \ --- smalltalk-2.3.3/configure.ac.automake 2007-02-13 09:25:00.000000000 +0100 +++ smalltalk-2.3.3/configure.ac 2007-02-14 22:12:25.000000000 +0100 @@ -7,7 +7,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.60) -AC_INIT([GNU Smalltalk], 2.3.3, help-smalltalk at gnu.org, smalltalk) +AC_INIT([GNU Smalltalk], 2.3.3, help-smalltalk at gnu.org, gnu-smalltalk) MAINTAINER="bonzini at gnu.org" dnl CURRENT:REVISION:AGE means this is the REVISION-th version of --- smalltalk-2.3.3/examples/Makefile.in.automake 2007-02-14 22:17:01.000000000 +0100 +++ smalltalk-2.3.3/examples/Makefile.in 2007-02-14 22:17:48.000000000 +0100 @@ -277,7 +277,7 @@ subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -examplemodulesdir = $(pkgdatadir)/examples/modules +examplemodulesdir = $(imagedir)/examples/modules dist_examplemodules_DATA = gdbm.st gdbm-c.st md5.st EXTRA_LTLIBRARIES = gdbm.la pkglib_LTLIBRARIES = @MODULES_EXAMPLE@ md5.la --- smalltalk-2.3.3/examples/Makefile.am.automake 2007-02-14 22:16:46.000000000 +0100 +++ smalltalk-2.3.3/examples/Makefile.am 2007-02-14 22:17:43.000000000 +0100 @@ -1,4 +1,4 @@ -examplemodulesdir = $(pkgdatadir)/examples/modules +examplemodulesdir = $(imagedir)/examples/modules dist_examplemodules_DATA = gdbm.st gdbm-c.st md5.st --- smalltalk-2.3.3/libgst/Makefile.am.automake 2007-02-13 17:32:35.000000000 +0100 +++ smalltalk-2.3.3/libgst/Makefile.am 2007-02-14 22:12:25.000000000 +0100 @@ -113,6 +113,7 @@ @echo timestamp > $(srcdir)/match.stamp + # rules for invoking genprims # Try to economize in the rebuilds, by avoiding unnecessary # changes to the timestamp of prims.inl Index: gnu-smalltalk.spec =================================================================== RCS file: /cvs/extras/rpms/gnu-smalltalk/FC-6/gnu-smalltalk.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gnu-smalltalk.spec 14 Feb 2007 17:04:02 -0000 1.5 +++ gnu-smalltalk.spec 14 Feb 2007 21:41:11 -0000 1.6 @@ -1,10 +1,9 @@ Summary: GNU Smalltalk Name: gnu-smalltalk -Version: 2.3.2 -Release: 6%{?dist}.1 -# Source: smalltalk-2.2b.tar.gz +Version: 2.3.3 +Release: 2%{?dist} Source: ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-%{version}.tar.gz -Patch1: gst-2.3.2-am.patch +Patch1: gst-2.3.3-am.patch License: GPL Group: Development/Languages URL: http://www.gnu.org/software/smalltalk/smalltalk.html @@ -69,7 +68,8 @@ #autoreconf %configure --with-tcl=%{_libdir} --with-tk=%{_libdir} \ - --enable-static=no --enable-shared=yes --disable-rpath + --enable-static=no --enable-shared=yes --disable-rpath \ + --with-imagedir=%{_libdir}/%{name} make %{?_smp_mflags} LIBTOOL="%{_bindir}/libtool" @@ -133,7 +133,6 @@ %{_libdir}/pkgconfig/gnu-smalltalk.pc %{_datadir}/aclocal/*.m4 -%{_datadir}/gnu-smalltalk/ %{_includedir}/gst.h %{_includedir}/gstpub.h @@ -143,7 +142,10 @@ %{_datadir}/emacs/site-lisp/* %changelog -* Tue Feb 13 2007 Jochen Schmitt 2.3.2-6.1 +* Wed Feb 14 2007 Jochen Schmitt 2.3.3-2 +- New upstream release + +* Tue Feb 13 2007 Jochen Schmitt 2.3.2-6 - Solve multilib issue (#228175) * Sun Feb 11 2007 Jochen Schmitt 2.3.2-5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnu-smalltalk/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 Jan 2007 16:16:45 -0000 1.3 +++ sources 14 Feb 2007 21:41:11 -0000 1.4 @@ -1 +1 @@ -2a4237e1d9b6296b290f5b5fe8d8efd7 smalltalk-2.3.2.tar.gz +79eaff2e19b82b5da08ac5a939317a49 smalltalk-2.3.3.tar.gz --- gst-2.3.2-am.patch DELETED --- From fedora-extras-commits at redhat.com Wed Feb 14 21:43:39 2007 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 14 Feb 2007 16:43:39 -0500 Subject: rpms/gnu-smalltalk/FC-5 gst-2.3.3-am.patch, NONE, 1.1 gnu-smalltalk.spec, 1.4, 1.5 sources, 1.3, 1.4 gst-2.3.2-am.patch, 1.2, NONE Message-ID: <200702142143.l1ELhdCj025268@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/gnu-smalltalk/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25239 Modified Files: gnu-smalltalk.spec sources Added Files: gst-2.3.3-am.patch Removed Files: gst-2.3.2-am.patch Log Message: New upstream release gst-2.3.3-am.patch: --- NEW FILE gst-2.3.3-am.patch --- --- smalltalk-2.3.3/configure.automake 2007-02-13 09:25:30.000000000 +0100 +++ smalltalk-2.3.3/configure 2007-02-14 22:12:54.000000000 +0100 @@ -723,7 +723,7 @@ # Identity of this package. PACKAGE_NAME='GNU Smalltalk' -PACKAGE_TARNAME='smalltalk' +PACKAGE_TARNAME='gnu-smalltalk' PACKAGE_VERSION='2.3.3' PACKAGE_STRING='GNU Smalltalk 2.3.3' PACKAGE_BUGREPORT='help-smalltalk at gnu.org' @@ -1497,7 +1497,7 @@ --infodir=DIR info documentation [DATAROOTDIR/info] --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/smalltalk] + --docdir=DIR documentation root [DATAROOTDIR/doc/gnu-smalltalk] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -2427,7 +2427,7 @@ # Define the identity of the package. - PACKAGE='smalltalk' + PACKAGE='gnu-smalltalk' VERSION='2.3.3' --- smalltalk-2.3.3/Makefile.in.automake 2007-02-13 16:13:32.000000000 +0100 +++ smalltalk-2.3.3/Makefile.in 2007-02-14 22:17:49.000000000 +0100 @@ -274,7 +274,7 @@ NCURSES_DISABLED = @NCURSES_DISABLED@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -PACKAGE = smalltalk +PACKAGE = gnu-smalltalk PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ @@ -322,7 +322,7 @@ host_os = @host_os@ host_vendor = @host_vendor@ htmldir = @htmldir@ -imagedir = @imagedir@ +imagedir = ${libdir}/@PACKAGE@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -1133,20 +1133,20 @@ install-data-hook: gst-package rm -f $(DESTDIR)$(pkgdatadir)/packages.xml ./gst-package --srcdir="$(srcdir)" --no-load --destdir="$(DESTDIR)" \ - --target-dir="$(pkgdatadir)" packages.xml + --target-dir="$(imagedir)" packages.xml $(mkdir_p) $(DESTDIR)$(imagedir) rm -f $(DESTDIR)$(imagedir)/gst.im srcdir=`cd $(srcdir) && pwd`; \ cd $(DESTDIR)$(imagedir) && \ - SMALLTALK_KERNEL=$(DESTDIR)$(pkgdatadir)/kernel \ + SMALLTALK_KERNEL=$(DESTDIR)$(imagedir)/kernel \ SMALLTALK_IMAGE=$(DESTDIR)$(imagedir) \ $(DESTDIR)$(bindir)/gst -f $$srcdir/scripts/Finish.st \ - "$(pkgdatadir)" "$(imagedir)" $(MODULES) + "$(imagedir)" "$(imagedir)" $(MODULES) uninstall-local:: gst-package ./gst-package --uninstall --destdir="$(DESTDIR)" packages.xml - -rm -f $(DESTDIR)$(pkgdatadir)/packages.xml - -rm -f $(DESTDIR)$(pkgdatadir)/gst.im + -rm -f $(DESTDIR)$(imagedir)/packages.xml + -rm -f $(DESTDIR)$(imagedir)/gst.im installcheck-local: if test -n "$(DESTDIR)"; then :; else \ --- smalltalk-2.3.3/Makefile.am.automake 2007-02-13 16:13:22.000000000 +0100 +++ smalltalk-2.3.3/Makefile.am 2007-02-14 22:12:25.000000000 +0100 @@ -19,7 +19,7 @@ AUTOMAKE_OPTIONS = gnu 1.8 ACLOCAL_AMFLAGS = -I build-aux -PACKAGE=smalltalk +PACKAGE=gnu-smalltalk DIST_SUBDIRS = lib-src snprintfv lightning sigsegv libffi opcode libgst \ i18n tcp examples blox-tk . gtk tests doc @@ -50,6 +50,7 @@ ########################################################### pkgconfigdir = $(libdir)/pkgconfig +imagedir = ${libdir}/@PACKAGE@ nodist_pkgconfig_DATA = gnu-smalltalk.pc pkglib_DATA = libc.la @@ -175,20 +176,20 @@ install-data-hook: gst-package rm -f $(DESTDIR)$(pkgdatadir)/packages.xml ./gst-package --srcdir="$(srcdir)" --no-load --destdir="$(DESTDIR)" \ - --target-dir="$(pkgdatadir)" packages.xml + --target-dir="$(imagedir)" packages.xml $(mkdir_p) $(DESTDIR)$(imagedir) rm -f $(DESTDIR)$(imagedir)/gst.im srcdir=`cd $(srcdir) && pwd`; \ cd $(DESTDIR)$(imagedir) && \ - SMALLTALK_KERNEL=$(DESTDIR)$(pkgdatadir)/kernel \ + SMALLTALK_KERNEL=$(DESTDIR)$(imagedir)/kernel \ SMALLTALK_IMAGE=$(DESTDIR)$(imagedir) \ $(DESTDIR)$(bindir)/gst -f $$srcdir/scripts/Finish.st \ - "$(pkgdatadir)" "$(imagedir)" $(MODULES) + "$(imagedir)" "$(imagedir)" $(MODULES) uninstall-local:: gst-package ./gst-package --uninstall --destdir="$(DESTDIR)" packages.xml - -rm -f $(DESTDIR)$(pkgdatadir)/packages.xml - -rm -f $(DESTDIR)$(pkgdatadir)/gst.im + -rm -f $(DESTDIR)$(imagedir)/packages.xml + -rm -f $(DESTDIR)$(imagedir)/gst.im installcheck-local: if test -n "$(DESTDIR)"; then :; else \ --- smalltalk-2.3.3/configure.ac.automake 2007-02-13 09:25:00.000000000 +0100 +++ smalltalk-2.3.3/configure.ac 2007-02-14 22:12:25.000000000 +0100 @@ -7,7 +7,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.60) -AC_INIT([GNU Smalltalk], 2.3.3, help-smalltalk at gnu.org, smalltalk) +AC_INIT([GNU Smalltalk], 2.3.3, help-smalltalk at gnu.org, gnu-smalltalk) MAINTAINER="bonzini at gnu.org" dnl CURRENT:REVISION:AGE means this is the REVISION-th version of --- smalltalk-2.3.3/examples/Makefile.in.automake 2007-02-14 22:17:01.000000000 +0100 +++ smalltalk-2.3.3/examples/Makefile.in 2007-02-14 22:17:48.000000000 +0100 @@ -277,7 +277,7 @@ subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -examplemodulesdir = $(pkgdatadir)/examples/modules +examplemodulesdir = $(imagedir)/examples/modules dist_examplemodules_DATA = gdbm.st gdbm-c.st md5.st EXTRA_LTLIBRARIES = gdbm.la pkglib_LTLIBRARIES = @MODULES_EXAMPLE@ md5.la --- smalltalk-2.3.3/examples/Makefile.am.automake 2007-02-14 22:16:46.000000000 +0100 +++ smalltalk-2.3.3/examples/Makefile.am 2007-02-14 22:17:43.000000000 +0100 @@ -1,4 +1,4 @@ -examplemodulesdir = $(pkgdatadir)/examples/modules +examplemodulesdir = $(imagedir)/examples/modules dist_examplemodules_DATA = gdbm.st gdbm-c.st md5.st --- smalltalk-2.3.3/libgst/Makefile.am.automake 2007-02-13 17:32:35.000000000 +0100 +++ smalltalk-2.3.3/libgst/Makefile.am 2007-02-14 22:12:25.000000000 +0100 @@ -113,6 +113,7 @@ @echo timestamp > $(srcdir)/match.stamp + # rules for invoking genprims # Try to economize in the rebuilds, by avoiding unnecessary # changes to the timestamp of prims.inl Index: gnu-smalltalk.spec =================================================================== RCS file: /cvs/extras/rpms/gnu-smalltalk/FC-5/gnu-smalltalk.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gnu-smalltalk.spec 14 Feb 2007 16:52:48 -0000 1.4 +++ gnu-smalltalk.spec 14 Feb 2007 21:43:06 -0000 1.5 @@ -1,10 +1,9 @@ Summary: GNU Smalltalk Name: gnu-smalltalk -Version: 2.3.2 -Release: 6%{?dist} -# Source: smalltalk-2.2b.tar.gz +Version: 2.3.3 +Release: 2%{?dist} Source: ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-%{version}.tar.gz -Patch1: gst-2.3.2-am.patch +Patch1: gst-2.3.3-am.patch License: GPL Group: Development/Languages URL: http://www.gnu.org/software/smalltalk/smalltalk.html @@ -69,7 +68,8 @@ #autoreconf %configure --with-tcl=%{_libdir} --with-tk=%{_libdir} \ - --enable-static=no --enable-shared=yes --disable-rpath + --enable-static=no --enable-shared=yes --disable-rpath \ + --with-imagedir=%{_libdir}/%{name} make %{?_smp_mflags} LIBTOOL="%{_bindir}/libtool" @@ -133,7 +133,6 @@ %{_libdir}/pkgconfig/gnu-smalltalk.pc %{_datadir}/aclocal/*.m4 -%{_datadir}/gnu-smalltalk/ %{_includedir}/gst.h %{_includedir}/gstpub.h @@ -143,6 +142,9 @@ %{_datadir}/emacs/site-lisp/* %changelog +* Wed Feb 14 2007 Jochen Schmitt 2.3.3-2 +- New upstream release + * Tue Feb 13 2007 Jochen Schmitt 2.3.2-6 - Solve multilib issue (#228175) Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnu-smalltalk/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 Jan 2007 16:19:25 -0000 1.3 +++ sources 14 Feb 2007 21:43:06 -0000 1.4 @@ -1 +1 @@ -2a4237e1d9b6296b290f5b5fe8d8efd7 smalltalk-2.3.2.tar.gz +79eaff2e19b82b5da08ac5a939317a49 smalltalk-2.3.3.tar.gz --- gst-2.3.2-am.patch DELETED --- From fedora-extras-commits at redhat.com Wed Feb 14 21:54:05 2007 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 14 Feb 2007 16:54:05 -0500 Subject: fedora-security/audit fe5,1.157,1.158 fe6,1.71,1.72 Message-ID: <200702142154.l1ELs5Ih025480@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25461 Modified Files: fe5 fe6 Log Message: mimedefang 2.58 not affected by CVE-2007-0884 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.157 retrieving revision 1.158 diff -u -r1.157 -r1.158 --- fe5 14 Feb 2007 20:58:10 -0000 1.157 +++ fe5 14 Feb 2007 21:54:02 -0000 1.158 @@ -6,7 +6,7 @@ CVE-2007-0902 ** (moin) #228764 CVE-2007-0901 ** (moin) #228764 CVE-2007-0894 ** (mediawiki, fixed 1.9.2) #228763 -CVE-2007-0884 ** (mimedefang, fixed 2.6.1) #228757 +CVE-2007-0884 ignore (mimedefang 2.59/2.60 not shipped) #228757 CVE-2007-0857 version (moin, fixed 1.5.7) #228139 CVE-2007-0770 ** (GraphicsMagick) #228758 CVE-2007-0657 ignore (nexuiz, 2.2.2 only (not shipped), fixed 2.2.3) Index: fe6 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe6,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- fe6 14 Feb 2007 20:58:10 -0000 1.71 +++ fe6 14 Feb 2007 21:54:02 -0000 1.72 @@ -6,7 +6,7 @@ CVE-2007-0902 ** (moin) #228764 CVE-2007-0901 ** (moin) #228764 CVE-2007-0894 ** (mediawiki, fixed 1.9.2) #228763 -CVE-2007-0884 ** (mimedefang, fixed 2.6.1) #228757 +CVE-2007-0884 ignore (mimedefang 2.59/2.60 not shipped) #228757 CVE-2007-0857 version (moin, fixed 1.5.7) #228139 CVE-2007-0770 ** (GraphicsMagick) #228758 CVE-2007-0657 ignore (nexuiz, 2.2.2 only (not shipped), fixed 2.2.3) From fedora-extras-commits at redhat.com Wed Feb 14 21:54:19 2007 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 14 Feb 2007 16:54:19 -0500 Subject: rpms/gnu-smalltalk/devel gnu-smalltalk.spec,1.11,1.12 Message-ID: <200702142154.l1ELsJYr025483@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/gnu-smalltalk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25439 Modified Files: gnu-smalltalk.spec Log Message: Comment out automake call Index: gnu-smalltalk.spec =================================================================== RCS file: /cvs/extras/rpms/gnu-smalltalk/devel/gnu-smalltalk.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gnu-smalltalk.spec 14 Feb 2007 21:37:35 -0000 1.11 +++ gnu-smalltalk.spec 14 Feb 2007 21:53:46 -0000 1.12 @@ -1,7 +1,7 @@ Summary: GNU Smalltalk Name: gnu-smalltalk Version: 2.3.3 -Release: 2%{?dist} +Release: 3%{?dist} Source: ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-%{version}.tar.gz Patch1: gst-2.3.3-am.patch License: GPL @@ -12,8 +12,8 @@ Requires(post): /sbin/install-info Requires(preun): /sbin/install-info -BuildRequires: automake -BuildRequires: autoconf >= 2.60 +#BuildRequires: automake +#BuildRequires: autoconf >= 2.60 BuildRequires: tk-devel BuildRequires: gtk2-devel BuildRequires: gdbm-devel @@ -64,8 +64,8 @@ %patch1 -p1 -b .automake %build -automake -autoreconf +#automake +#autoreconf %configure --with-tcl=%{_libdir} --with-tk=%{_libdir} \ --enable-static=no --enable-shared=yes --disable-rpath \ @@ -142,7 +142,7 @@ %{_datadir}/emacs/site-lisp/* %changelog -* Wed Feb 14 2007 Jochen Schmitt 2.3.3-2 +* Wed Feb 14 2007 Jochen Schmitt 2.3.3-3 - New upstream release * Tue Feb 13 2007 Jochen Schmitt 2.3.2-6 From fedora-extras-commits at redhat.com Wed Feb 14 21:58:50 2007 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Wed, 14 Feb 2007 16:58:50 -0500 Subject: rpms/eggdrop/devel eggdrop.spec,1.6,1.7 Message-ID: <200702142158.l1ELwodc025615@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/extras/rpms/eggdrop/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25582 Modified Files: eggdrop.spec Log Message: Rebuild for tcl 8.4 Index: eggdrop.spec =================================================================== RCS file: /cvs/extras/rpms/eggdrop/devel/eggdrop.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- eggdrop.spec 3 Feb 2007 15:13:10 -0000 1.6 +++ eggdrop.spec 14 Feb 2007 21:58:18 -0000 1.7 @@ -1,7 +1,7 @@ Summary: The world's most popular Open Source IRC bot Name: eggdrop Version: 1.6.18 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: Applications/Communications URL: http://www.eggheads.org/ @@ -62,6 +62,9 @@ %{_mandir}/man?/* %changelog +* Wed Feb 14 2007 Robert Scheck 1.6.18-6 +- Rebuild for tcl 8.4 + * Sat Feb 03 2007 Robert Scheck 1.6.18-5 - Rebuild for tcl 8.5 From fedora-extras-commits at redhat.com Wed Feb 14 22:01:13 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 14 Feb 2007 17:01:13 -0500 Subject: rpms/sonata - New directory Message-ID: <200702142201.l1EM1Der028752@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/sonata In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28747/sonata Log Message: Directory /cvs/extras/rpms/sonata added to the repository From fedora-extras-commits at redhat.com Wed Feb 14 22:01:21 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 14 Feb 2007 17:01:21 -0500 Subject: rpms/sonata/devel - New directory Message-ID: <200702142201.l1EM1Lrp028768@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/sonata/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28747/sonata/devel Log Message: Directory /cvs/extras/rpms/sonata/devel added to the repository From fedora-extras-commits at redhat.com Wed Feb 14 22:01:35 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 14 Feb 2007 17:01:35 -0500 Subject: rpms/sonata Makefile,NONE,1.1 import.log,NONE,1.1 pkg.acl,NONE,1.1 Message-ID: <200702142201.l1EM1ZTY028802@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/sonata In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28792 Added Files: Makefile import.log pkg.acl Log Message: Setup of module sonata --- NEW FILE Makefile --- # Top level Makefile for module sonata all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Wed Feb 14 22:01:43 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 14 Feb 2007 17:01:43 -0500 Subject: rpms/sonata/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702142201.l1EM1hcs028828@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/sonata/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28792/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module sonata --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Feb 14 22:10:22 2007 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 14 Feb 2007 17:10:22 -0500 Subject: rpms/amarok/FC-5 amarok.spec,1.67,1.68 Message-ID: <200702142210.l1EMAMfC029455@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29434 Modified Files: amarok.spec Log Message: fix libgpod version Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-5/amarok.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- amarok.spec 14 Feb 2007 19:13:19 -0000 1.67 +++ amarok.spec 14 Feb 2007 22:09:50 -0000 1.68 @@ -4,7 +4,7 @@ Name: amarok Summary: Media player for KDE Version: 1.4.5 -Release: 2%{?dist} +Release: 2%{?dist}.1 Group: Applications/Multimedia License: GPL @@ -195,9 +195,11 @@ # SMB %{_datadir}/services/amarok_smb-device.desktop %{_libdir}/kde3/libamarok_smb-device.* +%if "0%fedora" >= "6" # IPod %{_datadir}/services/amarok_ipod-mediadevice.desktop %{_libdir}/kde3/libamarok_ipod-mediadevice.* +%endif # VFAT %{_datadir}/services/amarok_generic-mediadevice.desktop %{_libdir}/kde3/libamarok_generic-mediadevice.* @@ -235,6 +237,9 @@ %changelog +* Wed Feb 14 2007 Aurelien Bompard 1.4.5-2.1 +- libgod is not new enough in FC5 + * Wed Feb 14 2007 Aurelien Bompard 1.4.5-2 - add patch to fix CVE-2006-6979 (bug 228138) From fedora-extras-commits at redhat.com Wed Feb 14 22:19:01 2007 From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu)) Date: Wed, 14 Feb 2007 17:19:01 -0500 Subject: rpms/sysprof-kmod/FC-5 sysprof-kmod.spec,1.11,1.12 Message-ID: <200702142219.l1EMJ1jn029579@cvs-int.fedora.redhat.com> Author: giallu Update of /cvs/extras/rpms/sysprof-kmod/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29562 Modified Files: sysprof-kmod.spec Log Message: Rebuild for kernel 2.6.19-1.2288.fc5 Index: sysprof-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/sysprof-kmod/FC-5/sysprof-kmod.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sysprof-kmod.spec 23 Dec 2006 23:45:38 -0000 1.11 +++ sysprof-kmod.spec 14 Feb 2007 22:18:28 -0000 1.12 @@ -4,7 +4,7 @@ # end stuff to be ... # hardcode for now: -%{!?kversion: %define kversion 2.6.18-1.2257.fc5} +%{!?kversion: %define kversion 2.6.19-1.2288.fc5} # hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g. # --define "kversion 2.6.16-1.2096_FC5" From fedora-extras-commits at redhat.com Wed Feb 14 22:20:50 2007 From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu)) Date: Wed, 14 Feb 2007 17:20:50 -0500 Subject: rpms/sysprof-kmod/FC-6 sysprof-kmod.spec,1.16,1.17 Message-ID: <200702142220.l1EMKofK029660@cvs-int.fedora.redhat.com> Author: giallu Update of /cvs/extras/rpms/sysprof-kmod/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29641 Modified Files: sysprof-kmod.spec Log Message: Rebuild for kernel 2.6.19-1.2911.fc6 Index: sysprof-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/sysprof-kmod/FC-6/sysprof-kmod.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sysprof-kmod.spec 19 Jan 2007 08:48:02 -0000 1.16 +++ sysprof-kmod.spec 14 Feb 2007 22:20:17 -0000 1.17 @@ -4,7 +4,7 @@ # end stuff to be ... # hardcode for now: -%{!?kversion: %define kversion 2.6.19-1.2895.fc6} +%{!?kversion: %define kversion 2.6.19-1.2911.fc6} # hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g. # --define "kversion 2.6.16-1.2096_FC5" From fedora-extras-commits at redhat.com Wed Feb 14 22:36:57 2007 From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu)) Date: Wed, 14 Feb 2007 17:36:57 -0500 Subject: rpms/sysprof-kmod/devel sysprof-kmod.spec,1.32,1.33 Message-ID: <200702142236.l1EMavOB029944@cvs-int.fedora.redhat.com> Author: giallu Update of /cvs/extras/rpms/sysprof-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29920 Modified Files: sysprof-kmod.spec Log Message: Rebuild for kernel 2.6.20-1.2925.fc7 Index: sysprof-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/sysprof-kmod/devel/sysprof-kmod.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sysprof-kmod.spec 5 Feb 2007 15:29:06 -0000 1.32 +++ sysprof-kmod.spec 14 Feb 2007 22:36:25 -0000 1.33 @@ -4,7 +4,7 @@ # end stuff to be ... # hardcode for now: -%{!?kversion: %define kversion 2.6.20-1.2922.fc7} +%{!?kversion: %define kversion 2.6.20-1.2925.fc7} # hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g. # --define "kversion 2.6.16-1.2096_FC5" From fedora-extras-commits at redhat.com Wed Feb 14 22:55:51 2007 From: fedora-extras-commits at redhat.com (Garrick Staples (garrick)) Date: Wed, 14 Feb 2007 17:55:51 -0500 Subject: rpms/torque/devel torque.spec,1.21,1.22 Message-ID: <200702142255.l1EMtp5h030288@cvs-int.fedora.redhat.com> Author: garrick Update of /cvs/extras/rpms/torque/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269 Modified Files: torque.spec Log Message: * Wed Feb 14 2007 Garrick Staples 2.1.6-5 - rebuilding because tcl8.5 was downgraded to tcl8.4 Index: torque.spec =================================================================== RCS file: /cvs/extras/rpms/torque/devel/torque.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- torque.spec 6 Feb 2007 18:41:14 -0000 1.21 +++ torque.spec 14 Feb 2007 22:55:19 -0000 1.22 @@ -3,7 +3,7 @@ %define name torque %define version 2.1.6 #%%define snap 200604251602 -%define release 4 +%define release 5 # The following options are supported: # --with server_name=hostname @@ -403,6 +403,9 @@ %changelog +* Wed Feb 14 2007 Garrick Staples 2.1.6-5 +- rebuilding because tcl8.5 was downgraded to tcl8.4 + * Tue Feb 6 2007 Garrick Staples 2.1.6-4 - rebuilding with new tcl From fedora-extras-commits at redhat.com Wed Feb 14 23:24:22 2007 From: fedora-extras-commits at redhat.com (Julian Sikorski (belegdol)) Date: Wed, 14 Feb 2007 18:24:22 -0500 Subject: rpms/gchempaint/devel gchempaint.spec,1.4,1.5 Message-ID: <200702142324.l1ENOMAo001585@cvs-int.fedora.redhat.com> Author: belegdol Update of /cvs/extras/rpms/gchempaint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1568 Modified Files: gchempaint.spec Log Message: corrected perl(XML:parser) Index: gchempaint.spec =================================================================== RCS file: /cvs/extras/rpms/gchempaint/devel/gchempaint.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gchempaint.spec 22 Dec 2006 10:56:41 -0000 1.4 +++ gchempaint.spec 14 Feb 2007 23:23:49 -0000 1.5 @@ -12,7 +12,7 @@ BuildRequires: gnome-chemistry-utils-devel BuildRequires: scrollkeeper BuildRequires: gnome-doc-utils -BuildRequires: perl-XML-Parser +BuildRequires: perl(XML::parser) BuildRequires: libbonoboui-devel BuildRequires: gettext BuildRequires: desktop-file-utils From fedora-extras-commits at redhat.com Wed Feb 14 23:26:49 2007 From: fedora-extras-commits at redhat.com (Julian Sikorski (belegdol)) Date: Wed, 14 Feb 2007 18:26:49 -0500 Subject: rpms/gchempaint/devel gchempaint.spec,1.5,1.6 Message-ID: <200702142326.l1ENQnni001627@cvs-int.fedora.redhat.com> Author: belegdol Update of /cvs/extras/rpms/gchempaint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1606 Modified Files: gchempaint.spec Log Message: Whoops. Uppercase. Index: gchempaint.spec =================================================================== RCS file: /cvs/extras/rpms/gchempaint/devel/gchempaint.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gchempaint.spec 14 Feb 2007 23:23:49 -0000 1.5 +++ gchempaint.spec 14 Feb 2007 23:26:17 -0000 1.6 @@ -12,7 +12,7 @@ BuildRequires: gnome-chemistry-utils-devel BuildRequires: scrollkeeper BuildRequires: gnome-doc-utils -BuildRequires: perl(XML::parser) +BuildRequires: perl(XML::Parser) BuildRequires: libbonoboui-devel BuildRequires: gettext BuildRequires: desktop-file-utils From fedora-extras-commits at redhat.com Wed Feb 14 23:30:13 2007 From: fedora-extras-commits at redhat.com (Julian Sikorski (belegdol)) Date: Wed, 14 Feb 2007 18:30:13 -0500 Subject: rpms/gchempaint/FC-6 gchempaint.spec,1.4,1.5 Message-ID: <200702142330.l1ENUDPJ001695@cvs-int.fedora.redhat.com> Author: belegdol Update of /cvs/extras/rpms/gchempaint/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1653 Modified Files: gchempaint.spec Log Message: Corrected perl(XML::Parser) Index: gchempaint.spec =================================================================== RCS file: /cvs/extras/rpms/gchempaint/FC-6/gchempaint.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gchempaint.spec 22 Dec 2006 10:59:25 -0000 1.4 +++ gchempaint.spec 14 Feb 2007 23:29:40 -0000 1.5 @@ -12,7 +12,7 @@ BuildRequires: gnome-chemistry-utils-devel BuildRequires: scrollkeeper BuildRequires: gnome-doc-utils -BuildRequires: perl-XML-Parser +BuildRequires: perl(XML::Parser) BuildRequires: libbonoboui-devel BuildRequires: gettext BuildRequires: desktop-file-utils From fedora-extras-commits at redhat.com Wed Feb 14 23:32:58 2007 From: fedora-extras-commits at redhat.com (Julian Sikorski (belegdol)) Date: Wed, 14 Feb 2007 18:32:58 -0500 Subject: rpms/gchempaint/FC-5 gchempaint.spec,1.5,1.6 Message-ID: <200702142332.l1ENWwct001783@cvs-int.fedora.redhat.com> Author: belegdol Update of /cvs/extras/rpms/gchempaint/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1766 Modified Files: gchempaint.spec Log Message: Corrected perl(XML::Parser) Index: gchempaint.spec =================================================================== RCS file: /cvs/extras/rpms/gchempaint/FC-5/gchempaint.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gchempaint.spec 22 Dec 2006 11:03:52 -0000 1.5 +++ gchempaint.spec 14 Feb 2007 23:32:26 -0000 1.6 @@ -12,7 +12,7 @@ BuildRequires: gnome-chemistry-utils-devel BuildRequires: scrollkeeper BuildRequires: gnome-doc-utils -BuildRequires: perl-XML-Parser +BuildRequires: perl(XML::Parser) BuildRequires: libbonoboui-devel BuildRequires: gettext BuildRequires: desktop-file-utils From fedora-extras-commits at redhat.com Wed Feb 14 23:45:26 2007 From: fedora-extras-commits at redhat.com (Julian Sikorski (belegdol)) Date: Wed, 14 Feb 2007 18:45:26 -0500 Subject: rpms/gnome-chemistry-utils/devel gnome-chemistry-utils.spec, 1.3, 1.4 Message-ID: <200702142345.l1ENjQwU001922@cvs-int.fedora.redhat.com> Author: belegdol Update of /cvs/extras/rpms/gnome-chemistry-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1849/devel Modified Files: gnome-chemistry-utils.spec Log Message: Corrected perl(XML::Parser) BuildRequires Index: gnome-chemistry-utils.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-chemistry-utils/devel/gnome-chemistry-utils.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gnome-chemistry-utils.spec 14 Jan 2007 21:32:29 -0000 1.3 +++ gnome-chemistry-utils.spec 14 Feb 2007 23:44:53 -0000 1.4 @@ -11,7 +11,7 @@ BuildRequires: openbabel-devel BuildRequires: goffice-devel -BuildRequires: perl-XML-Parser +BuildRequires: perl(XML::Parser) BuildRequires: gtkglext-devel BuildRequires: libgnomeprintui22-devel BuildRequires: firefox-devel From fedora-extras-commits at redhat.com Wed Feb 14 23:45:21 2007 From: fedora-extras-commits at redhat.com (Julian Sikorski (belegdol)) Date: Wed, 14 Feb 2007 18:45:21 -0500 Subject: rpms/gnome-chemistry-utils/FC-5 gnome-chemistry-utils.spec,1.5,1.6 Message-ID: <200702142345.l1ENjL6S001916@cvs-int.fedora.redhat.com> Author: belegdol Update of /cvs/extras/rpms/gnome-chemistry-utils/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1849/FC-5 Modified Files: gnome-chemistry-utils.spec Log Message: Corrected perl(XML::Parser) BuildRequires Index: gnome-chemistry-utils.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-chemistry-utils/FC-5/gnome-chemistry-utils.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gnome-chemistry-utils.spec 14 Jan 2007 21:43:04 -0000 1.5 +++ gnome-chemistry-utils.spec 14 Feb 2007 23:44:48 -0000 1.6 @@ -11,7 +11,7 @@ BuildRequires: openbabel-devel BuildRequires: goffice-devel -BuildRequires: perl-XML-Parser +BuildRequires: perl(XML::Parser) BuildRequires: gtkglext-devel BuildRequires: libgnomeprintui22-devel BuildRequires: mozilla-devel From fedora-extras-commits at redhat.com Wed Feb 14 23:45:23 2007 From: fedora-extras-commits at redhat.com (Julian Sikorski (belegdol)) Date: Wed, 14 Feb 2007 18:45:23 -0500 Subject: rpms/gnome-chemistry-utils/FC-6 gnome-chemistry-utils.spec,1.2,1.3 Message-ID: <200702142345.l1ENjNcg001919@cvs-int.fedora.redhat.com> Author: belegdol Update of /cvs/extras/rpms/gnome-chemistry-utils/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1849/FC-6 Modified Files: gnome-chemistry-utils.spec Log Message: Corrected perl(XML::Parser) BuildRequires Index: gnome-chemistry-utils.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-chemistry-utils/FC-6/gnome-chemistry-utils.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gnome-chemistry-utils.spec 14 Jan 2007 21:38:13 -0000 1.2 +++ gnome-chemistry-utils.spec 14 Feb 2007 23:44:51 -0000 1.3 @@ -11,7 +11,7 @@ BuildRequires: openbabel-devel BuildRequires: goffice-devel -BuildRequires: perl-XML-Parser +BuildRequires: perl(XML::Parser) BuildRequires: gtkglext-devel BuildRequires: libgnomeprintui22-devel BuildRequires: firefox-devel From fedora-extras-commits at redhat.com Thu Feb 15 02:33:11 2007 From: fedora-extras-commits at redhat.com (Yuichi Nakamura (ynakam)) Date: Wed, 14 Feb 2007 21:33:11 -0500 Subject: rpms/seedit/FC-6 2.1.0-4.patch,NONE,1.1 seedit.spec,1.5,1.6 Message-ID: <200702150233.l1F2XBkC015338@cvs-int.fedora.redhat.com> Author: ynakam Update of /cvs/extras/rpms/seedit/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15262/FC-6 Modified Files: seedit.spec Added Files: 2.1.0-4.patch Log Message: Update for bug fix, 2.1.0-4 2.1.0-4.patch: --- NEW FILE 2.1.0-4.patch --- Index: Changelog =================================================================== --- Changelog (??????????????? 644) +++ Changelog (???????????????) @@ -1,3 +1,7 @@ +*2007/02/14 + - Fixed bug + -- seedit-converter did not work when "//" is included in path + *2007/02/05 - Fixed installhelper-include.sh for asianux 2 - Add seedit-load.conf to customize obj_type filed of audit Index: core/converter/action.c =================================================================== --- core/converter/action.c (??????????????? 644) +++ core/converter/action.c (???????????????) @@ -516,12 +516,42 @@ } +/*replace '//' with '/' */ +char *remove_slash(char *path) { + char *buf; + char *result; + int len; + int i; + int j; + result = strdup(path); + len = strlen(path); + buf = (char *)my_malloc(sizeof(char) * (len + 1)); + memset(buf, 0, sizeof(char) * (len + 1)); + + j = 0; + for (i=0; i < len; i++) { + if(path[i] == '/') { + if (i > 0 && path[i-1] == '/'){ + /*do nothing*/ + } else { + buf[j] = path[i]; + j++; + } + } else { + buf[j] = path[i]; + j++; + } + } + memcpy(result,buf,len+1); + free(buf); + return result; +} + int register_file_rule(char *path){ char **dir_list; - char *filename; - + char *filename; int state; - + path = remove_slash(path); state = get_file_state(path); filename = get_filename(path, state); add_file_user_list(filename); @@ -540,7 +570,8 @@ /* when allow

* is described, add dummy permission to dummy domain. */ label_child_dir(filename); } - + + free(path); return 0; } Index: seedit.spec =================================================================== RCS file: /cvs/extras/rpms/seedit/FC-6/seedit.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- seedit.spec 9 Feb 2007 05:55:11 -0000 1.5 +++ seedit.spec 15 Feb 2007 02:32:38 -0000 1.6 @@ -1,4 +1,4 @@ -%define buildnum 3 +%define buildnum 4 %define python_sitelib %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib()') %define selinuxconf %{_sysconfdir}/selinux/config @@ -24,6 +24,7 @@ Source0: http://osdn.dl.sourceforge.jp/selpe/23577/%{name}-%{version}.tar.gz Source1: seedit-gui.desktop Source2: seedit-gui.png +Patch0: 2.1.0-4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{betatag}-root-%(%{__id_u} -n) BuildRequires: libselinux-devel >= 1.19, libsepol-devel >= 1.1.1, byacc, flex Requires: checkpolicy, m4, audit, libselinux >= 1.19, libsepol >= 1.1.1 @@ -40,6 +41,7 @@ %prep %setup -q +%patch0 -p0 %build pushd core @@ -166,6 +168,9 @@ %changelog +* Thu Feb 15 2007 Yuichi Nakamura 2.1.0-4 + - Fixed bug, seedit-converter did not work when "//" is included in path + * Fri Feb 9 2007 Yuichi Nakamura 2.1.0-3 - Fixed build failure From fedora-extras-commits at redhat.com Thu Feb 15 02:33:13 2007 From: fedora-extras-commits at redhat.com (Yuichi Nakamura (ynakam)) Date: Wed, 14 Feb 2007 21:33:13 -0500 Subject: rpms/seedit/devel 2.1.0-4.patch,NONE,1.1 seedit.spec,1.4,1.5 Message-ID: <200702150233.l1F2XDgA015341@cvs-int.fedora.redhat.com> Author: ynakam Update of /cvs/extras/rpms/seedit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15262/devel Modified Files: seedit.spec Added Files: 2.1.0-4.patch Log Message: Update for bug fix, 2.1.0-4 2.1.0-4.patch: --- NEW FILE 2.1.0-4.patch --- Index: Changelog =================================================================== --- Changelog (??????????????? 644) +++ Changelog (???????????????) @@ -1,3 +1,7 @@ +*2007/02/14 + - Fixed bug + -- seedit-converter did not work when "//" is included in path + *2007/02/05 - Fixed installhelper-include.sh for asianux 2 - Add seedit-load.conf to customize obj_type filed of audit Index: core/converter/action.c =================================================================== --- core/converter/action.c (??????????????? 644) +++ core/converter/action.c (???????????????) @@ -516,12 +516,42 @@ } +/*replace '//' with '/' */ +char *remove_slash(char *path) { + char *buf; + char *result; + int len; + int i; + int j; + result = strdup(path); + len = strlen(path); + buf = (char *)my_malloc(sizeof(char) * (len + 1)); + memset(buf, 0, sizeof(char) * (len + 1)); + + j = 0; + for (i=0; i < len; i++) { + if(path[i] == '/') { + if (i > 0 && path[i-1] == '/'){ + /*do nothing*/ + } else { + buf[j] = path[i]; + j++; + } + } else { + buf[j] = path[i]; + j++; + } + } + memcpy(result,buf,len+1); + free(buf); + return result; +} + int register_file_rule(char *path){ char **dir_list; - char *filename; - + char *filename; int state; - + path = remove_slash(path); state = get_file_state(path); filename = get_filename(path, state); add_file_user_list(filename); @@ -540,7 +570,8 @@ /* when allow * is described, add dummy permission to dummy domain. */ label_child_dir(filename); } - + + free(path); return 0; } Index: seedit.spec =================================================================== RCS file: /cvs/extras/rpms/seedit/devel/seedit.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- seedit.spec 13 Feb 2007 04:43:19 -0000 1.4 +++ seedit.spec 15 Feb 2007 02:32:41 -0000 1.5 @@ -1,4 +1,4 @@ -%define buildnum 3 +%define buildnum 4 %define python_sitelib %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib()') %define selinuxconf %{_sysconfdir}/selinux/config @@ -24,6 +24,7 @@ Source0: http://osdn.dl.sourceforge.jp/selpe/23577/%{name}-%{version}.tar.gz Source1: seedit-gui.desktop Source2: seedit-gui.png +Patch0: 2.1.0-4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{betatag}-root-%(%{__id_u} -n) BuildRequires: libselinux-devel >= 1.19, libsepol-devel >= 1.1.1, byacc, flex Requires: checkpolicy, m4, audit, libselinux >= 1.19, libsepol >= 1.1.1 @@ -40,6 +41,7 @@ %prep %setup -q +%patch0 -p0 %build pushd core @@ -166,6 +168,9 @@ %changelog +* Thu Feb 15 2007 Yuichi Nakamura 2.1.0-4 + - Fixed bug, seedit-converter did not work when "//" is included in path + * Fri Feb 9 2007 Yuichi Nakamura 2.1.0-3 - Fixed build failure From fedora-extras-commits at redhat.com Thu Feb 15 03:22:44 2007 From: fedora-extras-commits at redhat.com (John Berninger (jwb)) Date: Wed, 14 Feb 2007 22:22:44 -0500 Subject: rpms/bugzilla/FC-5 bugzilla.spec,1.7,1.8 Message-ID: <200702150322.l1F3MiAm019177@cvs-int.fedora.redhat.com> Author: jwb Update of /cvs/extras/rpms/bugzilla/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19157 Modified Files: bugzilla.spec Log Message: more cronjob fixes - bz 227136 Index: bugzilla.spec =================================================================== RCS file: /cvs/extras/rpms/bugzilla/FC-5/bugzilla.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- bugzilla.spec 31 Jan 2007 22:03:00 -0000 1.7 +++ bugzilla.spec 15 Feb 2007 03:22:11 -0000 1.8 @@ -6,7 +6,7 @@ Name: bugzilla Version: 2.22 Group: Applications/Publishing -Release: 10%{?dist} +Release: 11%{?dist} License: MPL Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -87,7 +87,7 @@ ./collectstats.pl EOM mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/cron.d -echo "0-59/15 * * * * apache env LANG=C %{bzinstallprefix}/bugzilla/whine.pl" > ${RPM_BUILD_ROOT}/%{_sysconfdir}/cron.d/bugzilla +echo "0-59/15 * * * * apache cd /%{bzinstallprefix}/bugzilla && env LANG=C %{bzinstallprefix}/bugzilla/whine.pl" > ${RPM_BUILD_ROOT}/%{_sysconfdir}/cron.d/bugzilla rm -f ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla/{README,QUICKSTART,UPGRADING,UPGRADING-pre-2.8} mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/doc/%{name}-%{version} cp %{SOURCE2} ./README.fedora @@ -121,8 +121,9 @@ %{bzinstallprefix}/bugzilla/template %ghost %{bzinstallprefix}/bugzilla/bugzilla-req %config(noreplace) %{_sysconfdir}/httpd/conf.d/bugzilla.conf -%defattr(0600,root,root,-) +%defattr(0755,root,root,-) %{_sysconfdir}/cron.daily/* +%defattr(0600,root,root,-) %{_sysconfdir}/cron.d/* %defattr(-,root,root,-) %doc README @@ -140,6 +141,9 @@ %{bzinstallprefix}/bugzilla/contrib %changelog +* Wed Feb 14 2007 John Berninger - 2.22-11 +- More cronjob fixes + * Wed Jan 31 2007 John Berninger - 2.22-10 - Fix cron script permissions From fedora-extras-commits at redhat.com Thu Feb 15 03:23:27 2007 From: fedora-extras-commits at redhat.com (John Berninger (jwb)) Date: Wed, 14 Feb 2007 22:23:27 -0500 Subject: rpms/bugzilla/FC-6 bugzilla.spec,1.7,1.8 Message-ID: <200702150323.l1F3NRQi019263@cvs-int.fedora.redhat.com> Author: jwb Update of /cvs/extras/rpms/bugzilla/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19231 Modified Files: bugzilla.spec Log Message: more cronjob fixes - bz 227136 Index: bugzilla.spec =================================================================== RCS file: /cvs/extras/rpms/bugzilla/FC-6/bugzilla.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- bugzilla.spec 31 Jan 2007 22:05:01 -0000 1.7 +++ bugzilla.spec 15 Feb 2007 03:22:55 -0000 1.8 @@ -6,7 +6,7 @@ Name: bugzilla Version: 2.22 Group: Applications/Publishing -Release: 11%{?dist} +Release: 12%{?dist} License: MPL Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -87,7 +87,7 @@ ./collectstats.pl EOM mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/cron.d -echo "0-59/15 * * * * apache env LANG=C %{bzinstallprefix}/bugzilla/whine.pl" > ${RPM_BUILD_ROOT}/%{_sysconfdir}/cron.d/bugzilla +echo "0-59/15 * * * * apache cd %{bzinstallprefix}/bugzilla && env LANG=C %{bzinstallprefix}/bugzilla/whine.pl" > ${RPM_BUILD_ROOT}/%{_sysconfdir}/cron.d/bugzilla rm -f ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla/{README,QUICKSTART,UPGRADING,UPGRADING-pre-2.8} mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/doc/%{name}-%{version} cp %{SOURCE2} ./README.fedora @@ -121,8 +121,9 @@ %{bzinstallprefix}/bugzilla/template %ghost %{bzinstallprefix}/bugzilla/bugzilla-req %config(noreplace) %{_sysconfdir}/httpd/conf.d/bugzilla.conf -%defattr(0600,root,root,-) +%defattr(0755,root,root,-) %{_sysconfdir}/cron.daily/* +%defattr(0600,root,root,-) %{_sysconfdir}/cron.d/* %defattr(-,root,root,-) %doc README @@ -140,6 +141,9 @@ %{bzinstallprefix}/bugzilla/contrib %changelog +* Wed Feb 14 2007 John Berninger - 2.22-12 +- More cron job fixes + * Wed Jan 31 2007 John Berninger - 2.22-11 - Fix cron job perms From fedora-extras-commits at redhat.com Thu Feb 15 03:24:11 2007 From: fedora-extras-commits at redhat.com (John Berninger (jwb)) Date: Wed, 14 Feb 2007 22:24:11 -0500 Subject: rpms/bugzilla/devel bugzilla.spec,1.8,1.9 Message-ID: <200702150324.l1F3OBLM019328@cvs-int.fedora.redhat.com> Author: jwb Update of /cvs/extras/rpms/bugzilla/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19307 Modified Files: bugzilla.spec Log Message: more cronjob fixes - bz 227136 Index: bugzilla.spec =================================================================== RCS file: /cvs/extras/rpms/bugzilla/devel/bugzilla.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- bugzilla.spec 31 Jan 2007 22:07:26 -0000 1.8 +++ bugzilla.spec 15 Feb 2007 03:23:39 -0000 1.9 @@ -6,7 +6,7 @@ Name: bugzilla Version: 2.22.1 Group: Applications/Publishing -Release: 5%{?dist} +Release: 6%{?dist} License: MPL Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -85,7 +85,7 @@ ./collectstats.pl EOM mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/cron.d -echo "0-59/15 * * * * apache env LANG=C %{bzinstallprefix}/bugzilla/whine.pl" > ${RPM_BUILD_ROOT}/%{_sysconfdir}/cron.d/bugzilla +echo "0-59/15 * * * * apache cd %{bzinstallprefix}/bugzilla && env LANG=C %{bzinstallprefix}/bugzilla/whine.pl" > ${RPM_BUILD_ROOT}/%{_sysconfdir}/cron.d/bugzilla rm -f ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla/{README,QUICKSTART,UPGRADING,UPGRADING-pre-2.8} mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/doc/%{name}-%{version} cp %{SOURCE2} ./README.fedora @@ -119,8 +119,9 @@ %{bzinstallprefix}/bugzilla/template %ghost %{bzinstallprefix}/bugzilla/bugzilla-req %config(noreplace) %{_sysconfdir}/httpd/conf.d/bugzilla.conf -%defattr(0600,root,root,-) +%defattr(0755,root,root,-) %{_sysconfdir}/cron.daily/* +%defattr(0600,root,root,-) %{_sysconfdir}/cron.d/* %defattr(-,root,root,-) %doc README @@ -138,6 +139,9 @@ %{bzinstallprefix}/bugzilla/contrib %changelog +* Wed Feb 14 2007 John Berninger - 2.22.1-6 +- More cron job fixes + * Wed Jan 31 2007 John Berninger - 2.22.1-5 - Fix cron job perms From fedora-extras-commits at redhat.com Thu Feb 15 03:43:25 2007 From: fedora-extras-commits at redhat.com (Yuichi Nakamura (ynakam)) Date: Wed, 14 Feb 2007 22:43:25 -0500 Subject: rpms/seedit/devel 2.1.0-5.patch,NONE,1.1 seedit.spec,1.5,1.6 Message-ID: <200702150343.l1F3hPVu019586@cvs-int.fedora.redhat.com> Author: ynakam Update of /cvs/extras/rpms/seedit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19563 Modified Files: seedit.spec Added Files: 2.1.0-5.patch Log Message: Update for 2.1.0-5 2.1.0-5.patch: --- NEW FILE 2.1.0-5.patch --- Index: Changelog =================================================================== --- Changelog (??????????????? 644) +++ Changelog (???????????????) @@ -1,3 +1,7 @@ +*2007/02/14 + - Fixed bug + -- seedit-converter did not work when "//" is included in path + *2007/02/05 - Fixed installhelper-include.sh for asianux 2 - Add seedit-load.conf to customize obj_type filed of audit Index: core/converter/action.c =================================================================== --- core/converter/action.c (??????????????? 644) +++ core/converter/action.c (???????????????) @@ -516,12 +516,42 @@ } +/*replace '//' with '/' */ +char *remove_slash(char *path) { + char *buf; + char *result; + int len; + int i; + int j; + result = strdup(path); + len = strlen(path); + buf = (char *)my_malloc(sizeof(char) * (len + 1)); + memset(buf, 0, sizeof(char) * (len + 1)); + + j = 0; + for (i=0; i < len; i++) { + if(path[i] == '/') { + if (i > 0 && path[i-1] == '/'){ + /*do nothing*/ + } else { + buf[j] = path[i]; + j++; + } + } else { + buf[j] = path[i]; + j++; + } + } + memcpy(result,buf,len+1); + free(buf); + return result; +} + int register_file_rule(char *path){ char **dir_list; - char *filename; - + char *filename; int state; - + path = remove_slash(path); state = get_file_state(path); filename = get_filename(path, state); add_file_user_list(filename); @@ -540,7 +570,8 @@ /* when allow * is described, add dummy permission to dummy domain. */ label_child_dir(filename); } - + + free(path); return 0; } Index: core/utils/seedit-load.py =================================================================== --- core/utils/seedit-load.py (??????????????? 644) +++ core/utils/seedit-load.py (???????????????) @@ -24,7 +24,7 @@ import string import gettext -gSeeditLoadConf="/etc/seedit/seedit-load.conf" +gSeeditLoadConf="/usr/share/seedit/seedit-load.conf" gMakeFlags="CONFDIR=/etc/seedit/policy OUTDIR=/usr/share/seedit/sepolicy BASEPOLICYDIR=/usr/share/seedit/base_policy MACRODIR=/usr/share/seedit/macros" gAuditCtl="/sbin/auditctl" Index: core/config/Makefile =================================================================== --- core/config/Makefile (??????????????? 644) +++ core/config/Makefile (???????????????) @@ -63,7 +63,7 @@ mkdir -p $(BUILD_ROOT_DIR)/sepolicy mkdir -p $(SEEDITCONFROOT) mkdir -p $(sysconfdir)/seedit - install -p -m 0644 seedit-load.conf $(sysconfdir)/seedit + install -p -m 0644 seedit-load.conf $(SEEDITCONFROOT) cp -p -r base_policy $(SEEDITCONFROOT) cp -p -r macros $(SEEDITCONFROOT) mv $(SEEDITCONFROOT)/base_policy/spdl_spec.xml.expand $(SEEDITCONFROOT)/base_policy/spdl_spec.xml Index: seedit.spec =================================================================== RCS file: /cvs/extras/rpms/seedit/devel/seedit.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- seedit.spec 15 Feb 2007 02:32:41 -0000 1.5 +++ seedit.spec 15 Feb 2007 03:42:53 -0000 1.6 @@ -1,5 +1,6 @@ -%define buildnum 4 +%define buildnum 5 %define python_sitelib %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib()') +%define selinuxenabled /usr/sbin/selinuxenabled %define selinuxconf %{_sysconfdir}/selinux/config %define auditrules %{_sysconfdir}/audit/audit.rules @@ -24,11 +25,11 @@ Source0: http://osdn.dl.sourceforge.jp/selpe/23577/%{name}-%{version}.tar.gz Source1: seedit-gui.desktop Source2: seedit-gui.png -Patch0: 2.1.0-4.patch +Patch0: 2.1.0-5.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{betatag}-root-%(%{__id_u} -n) BuildRequires: libselinux-devel >= 1.19, libsepol-devel >= 1.1.1, byacc, flex Requires: checkpolicy, m4, audit, libselinux >= 1.19, libsepol >= 1.1.1 -Provides: seedit-converter +Provides: seedit-converter = %{version}-%{release} %description SELinux Policy Editor(SEEdit) is a tool to make SELinux easy. @@ -99,8 +100,7 @@ %{_datadir}/%{name}/macros %{_datadir}/%{name}/base_policy %dir %{_datadir}/%{name}/sepolicy -%dir %{_sysconfdir}/%{name} -%{_sysconfdir}/%{name}/seedit-load.conf +%{_datadir}/%{name}/seedit-load.conf %package policy Summary: SELinux Policy Editor: Sample simplified policy @@ -124,6 +124,9 @@ %postun policy if [ $1 = 0 ]; then sed -i 's/^SELINUXTYPE=.*/SELINUXTYPE=targeted/g' %{_sysconfdir}/selinux/config + if [ %{selinuxenabled} ]; then + sed -i 's/^SELINUX=.*/SELINUX=permissive/g' %{_sysconfdir}/selinux/config + fi touch /.autorelabel fi @@ -168,6 +171,11 @@ %changelog +* Thu Feb 15 2007 Yuichi Nakamura 2.1.0-5 + - SELINUX= is set permissive when uninstall, +because relabel fails in enforcing mode. + - Modified path to seedit-load.conf + * Thu Feb 15 2007 Yuichi Nakamura 2.1.0-4 - Fixed bug, seedit-converter did not work when "//" is included in path From fedora-extras-commits at redhat.com Thu Feb 15 05:39:40 2007 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 15 Feb 2007 00:39:40 -0500 Subject: rpms/tomoe/devel tomoe-modules-noversion.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.4, 1.5 tomoe.spec, 1.9, 1.10 Message-ID: <200702150539.l1F5de2H027422@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/tomoe/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27277 Modified Files: .cvsignore sources tomoe.spec Added Files: tomoe-modules-noversion.patch Log Message: - update to 0.5.1 - add tomoe-modules-noversion.patch to unversion .so modules (#227623) - improve the filelists (#227453) - add more doc files including new html files for kanjidic - moved gtk-doc files to devel - make config file noreplace tomoe-modules-noversion.patch: --- NEW FILE tomoe-modules-noversion.patch --- diff -ur tomoe-0.5.1/module/dict/Makefile.am tomoe-0.5.1/module/dict/Makefile.am --- tomoe-0.5.1/module/dict/Makefile.am 2006-12-27 11:17:28.000000000 +1000 +++ tomoe-0.5.1/module/dict/Makefile.am 2007-02-15 12:14:10.000000000 +1000 @@ -44,6 +44,7 @@ dict_module_LTLIBRARIES = libxml.la libxml_la_CPPFLAGS = -DG_LOG_DOMAIN=\"Tomoe/Dict:XML\" $(AM_CPPFLAGS) +libxml_la_LDFLAGS = -avoid-version libxml_la_SOURCES = tomoe-dict-xml.c $(ptr_array_based_dict_sources) if WITH_EST @@ -75,6 +76,7 @@ EXTRA_DIST = unihan-compiler.rb $(BUILT_SOURCES) Unihan.stamp libunihan_la_CPPFLAGS = -DG_LOG_DOMAIN=\"Tomoe/Dict:Unihan\" $(AM_CPPFLAGS) +libunihan_la_LDFLAGS = -avoid-version libunihan_la_SOURCES = \ tomoe-dict-unihan.c \ tomoe-unihan.c \ diff -ur tomoe-0.5.1/module/recognizer/Makefile.am tomoe-0.5.1/module/recognizer/Makefile.am --- tomoe-0.5.1/module/recognizer/Makefile.am 2006-12-27 11:17:28.000000000 +1000 +++ tomoe-0.5.1/module/recognizer/Makefile.am 2007-02-15 12:15:47.000000000 +1000 @@ -32,7 +32,7 @@ tomoe-recognizer-simple-logic.h libsimple_la_LDFLAGS = \ - -version-info $(LT_VERSION_INFO) \ + -avoid-version \ -export-dynamic $(no_undefined) $(LIBTOOL_EXPORT_OPTIONS) libsimple_la_LD_ADD = \ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tomoe/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 Sep 2005 09:28:46 -0000 1.2 +++ .cvsignore 15 Feb 2007 05:39:08 -0000 1.3 @@ -1 +1 @@ -tomoe-0.2.1.tar.gz +tomoe-0.5.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tomoe/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 21 Jan 2007 04:03:25 -0000 1.4 +++ sources 15 Feb 2007 05:39:08 -0000 1.5 @@ -1 +1 @@ -8a5abae3a1c388e497c6952e45db5bbd tomoe-0.5.0.tar.gz +84b103ef8240bf0d76f1083b2cf3521b tomoe-0.5.1.tar.gz Index: tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/tomoe/devel/tomoe.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- tomoe.spec 21 Jan 2007 07:05:31 -0000 1.9 +++ tomoe.spec 15 Feb 2007 05:39:08 -0000 1.10 @@ -1,6 +1,6 @@ Name: tomoe -Version: 0.5.0 -Release: 2%{?dist} +Version: 0.5.1 +Release: 1%{?dist} Summary: Japanese handwritten input system Group: System Environment/Libraries @@ -9,6 +9,7 @@ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel +Patch1: tomoe-modules-noversion.patch %description A program which does Japanese handwriting recognition. @@ -26,20 +27,20 @@ %prep %setup -q +%patch1 -p1 -b .1-version~ %build -%configure +%configure --disable-static make %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT%{_libdir}/libtomoe.{a,la} -rm -f $RPM_BUILD_ROOT%{_libdir}/tomoe/module/dict/libxml.{a,la} -rm -f $RPM_BUILD_ROOT%{_libdir}/tomoe/module/dict/libunihan.{a,la} -rm -f $RPM_BUILD_ROOT%{_libdir}/tomoe/module/recognizer/libsimple.{a,la} +# remove .la files +find ${RPM_BUILD_ROOT}%{_libdir} -name '*.la' | xargs rm + %clean rm -rf $RPM_BUILD_ROOT @@ -47,37 +48,40 @@ %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog +%doc AUTHORS COPYING NEWS README TODO data/kanjidic*.html %{_libdir}/libtomoe.so.* -%dir %{_libdir}/tomoe -%{_libdir}/tomoe/module/dict/libxml.so.* -%{_libdir}/tomoe/module/dict/libunihan.so.* -%{_libdir}/tomoe/module/recognizer/libsimple.so.* -%dir %{_datadir}/tomoe -%{_datadir}/tomoe/* -%dir %{_datadir}/gtk-doc/html/tomoe/ -%{_datadir}/gtk-doc/html/tomoe/* +%{_libdir}/tomoe +%{_datadir}/tomoe %dir %{_sysconfdir}/tomoe -%config %{_sysconfdir}/tomoe/config +%config(noreplace) %{_sysconfdir}/tomoe/config %files devel %defattr(-,root,root,-) %{_libdir}/libtomoe.so -%{_libdir}/tomoe/module/dict/libxml.so -%{_libdir}/tomoe/module/dict/libunihan.so -%{_libdir}/tomoe/module/recognizer/libsimple.so -%dir %{_includedir}/tomoe -%{_includedir}/tomoe/* +%{_includedir}/tomoe %{_libdir}/pkgconfig/tomoe.pc +%{_datadir}/gtk-doc/html/tomoe %changelog +* Thu Feb 15 2007 Jens Petersen - 0.5.1-1 +- update to 0.5.1 +- add tomoe-modules-noversion.patch to unversion .so modules (#227623) +- improve the filelists (#227453) +- add more doc files including new html files for kanjidic +- moved gtk-doc files to devel +- make config file noreplace + +* Sat Jan 20 2007 Ryo Dairiki - 0.5.0-2 +- do not buildrequire libtomoe-gtk + * Sat Jan 20 2007 Ryo Dairiki - 0.5.0-1 - update to 0.5.0. From fedora-extras-commits at redhat.com Thu Feb 15 06:21:56 2007 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Thu, 15 Feb 2007 01:21:56 -0500 Subject: rpms/amarok/FC-5 amarok-1.4.5-CVE-2006-6979.patch, 1.1, 1.2 amarok.spec, 1.68, 1.69 Message-ID: <200702150621.l1F6LugZ031245@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31185/FC-5 Modified Files: amarok-1.4.5-CVE-2006-6979.patch amarok.spec Log Message: fix patch (provided by upstream) amarok-1.4.5-CVE-2006-6979.patch: Index: amarok-1.4.5-CVE-2006-6979.patch =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-5/amarok-1.4.5-CVE-2006-6979.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- amarok-1.4.5-CVE-2006-6979.patch 14 Feb 2007 19:13:19 -0000 1.1 +++ amarok-1.4.5-CVE-2006-6979.patch 15 Feb 2007 06:21:23 -0000 1.2 @@ -1,13 +1,28 @@ -Index: src/magnatunebrowser/magnatunealbumdownloader.cpp +Index: amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp =================================================================== ---- amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp (revision 633106) -+++ amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp (working copy) -@@ -89,7 +89,7 @@ +--- amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp (revision 633659) ++++ amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp (revision 633677) +@@ -89,19 +89,19 @@ //ok, now we have the .zip file downloaded. All we need is to unpack it to the desired location and add it to the collection. - QString unzipString = "unzip \""+m_tempDir.name() + m_currentAlbumFileName + "\" -d \"" + m_currentAlbumUnpackLocation + "\" &"; -+ QString unzipString = KProcess::quote( "unzip \""+m_tempDir.name() + m_currentAlbumFileName + "\" -d \"" + m_currentAlbumUnpackLocation + "\" &" ); ++ QString unzipString = "unzip "+ KProcess::quote( m_tempDir.name() + m_currentAlbumFileName) + " -d " +KProcess::quote( m_currentAlbumUnpackLocation ) + " &"; debug() << "unpacking: " << unzipString << endl; + system( unzipString.ascii() ); + +- + ++ + if (m_currentAlbumId != -1 ) { + +- //now I really want to add the album cover to the same folder where I just unzipped the album... The ++ //now I really want to add the album cover to the same folder where I just unzipped the album... The + //only way of getting the actual location where the album was unpacked is using the artist and album names +- ++ + MagnatuneAlbum album = MagnatuneDatabaseHandler::instance()->getAlbumById( m_currentAlbumId ); + MagnatuneArtist artist = MagnatuneDatabaseHandler::instance()->getArtistById( album.getArtistId() ); + Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-5/amarok.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- amarok.spec 14 Feb 2007 22:09:50 -0000 1.68 +++ amarok.spec 15 Feb 2007 06:21:23 -0000 1.69 @@ -4,7 +4,7 @@ Name: amarok Summary: Media player for KDE Version: 1.4.5 -Release: 2%{?dist}.1 +Release: 3%{?dist} Group: Applications/Multimedia License: GPL @@ -237,8 +237,8 @@ %changelog -* Wed Feb 14 2007 Aurelien Bompard 1.4.5-2.1 -- libgod is not new enough in FC5 +* Thu Feb 15 2007 Aurelien Bompard 1.4.5-3 +- fix patch (provided by upstream) * Wed Feb 14 2007 Aurelien Bompard 1.4.5-2 - add patch to fix CVE-2006-6979 (bug 228138) From fedora-extras-commits at redhat.com Thu Feb 15 06:22:01 2007 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Thu, 15 Feb 2007 01:22:01 -0500 Subject: rpms/amarok/devel amarok-1.4.5-CVE-2006-6979.patch, 1.1, 1.2 amarok.spec, 1.74, 1.75 Message-ID: <200702150622.l1F6M1ns031253@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31185/devel Modified Files: amarok-1.4.5-CVE-2006-6979.patch amarok.spec Log Message: fix patch (provided by upstream) amarok-1.4.5-CVE-2006-6979.patch: Index: amarok-1.4.5-CVE-2006-6979.patch =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/amarok-1.4.5-CVE-2006-6979.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- amarok-1.4.5-CVE-2006-6979.patch 14 Feb 2007 19:13:24 -0000 1.1 +++ amarok-1.4.5-CVE-2006-6979.patch 15 Feb 2007 06:21:29 -0000 1.2 @@ -1,13 +1,28 @@ -Index: src/magnatunebrowser/magnatunealbumdownloader.cpp +Index: amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp =================================================================== ---- amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp (revision 633106) -+++ amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp (working copy) -@@ -89,7 +89,7 @@ +--- amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp (revision 633659) ++++ amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp (revision 633677) +@@ -89,19 +89,19 @@ //ok, now we have the .zip file downloaded. All we need is to unpack it to the desired location and add it to the collection. - QString unzipString = "unzip \""+m_tempDir.name() + m_currentAlbumFileName + "\" -d \"" + m_currentAlbumUnpackLocation + "\" &"; -+ QString unzipString = KProcess::quote( "unzip \""+m_tempDir.name() + m_currentAlbumFileName + "\" -d \"" + m_currentAlbumUnpackLocation + "\" &" ); ++ QString unzipString = "unzip "+ KProcess::quote( m_tempDir.name() + m_currentAlbumFileName) + " -d " +KProcess::quote( m_currentAlbumUnpackLocation ) + " &"; debug() << "unpacking: " << unzipString << endl; + system( unzipString.ascii() ); + +- + ++ + if (m_currentAlbumId != -1 ) { + +- //now I really want to add the album cover to the same folder where I just unzipped the album... The ++ //now I really want to add the album cover to the same folder where I just unzipped the album... The + //only way of getting the actual location where the album was unpacked is using the artist and album names +- ++ + MagnatuneAlbum album = MagnatuneDatabaseHandler::instance()->getAlbumById( m_currentAlbumId ); + MagnatuneArtist artist = MagnatuneDatabaseHandler::instance()->getArtistById( album.getArtistId() ); + Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- amarok.spec 14 Feb 2007 19:13:24 -0000 1.74 +++ amarok.spec 15 Feb 2007 06:21:29 -0000 1.75 @@ -4,7 +4,7 @@ Name: amarok Summary: Media player for KDE Version: 1.4.5 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Multimedia License: GPL @@ -235,6 +235,9 @@ %changelog +* Thu Feb 15 2007 Aurelien Bompard 1.4.5-3 +- fix patch (provided by upstream) + * Wed Feb 14 2007 Aurelien Bompard 1.4.5-2 - add patch to fix CVE-2006-6979 (bug 228138) From fedora-extras-commits at redhat.com Thu Feb 15 06:21:59 2007 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Thu, 15 Feb 2007 01:21:59 -0500 Subject: rpms/amarok/FC-6 amarok-1.4.5-CVE-2006-6979.patch, 1.1, 1.2 amarok.spec, 1.72, 1.73 Message-ID: <200702150621.l1F6Lx97031249@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31185/FC-6 Modified Files: amarok-1.4.5-CVE-2006-6979.patch amarok.spec Log Message: fix patch (provided by upstream) amarok-1.4.5-CVE-2006-6979.patch: Index: amarok-1.4.5-CVE-2006-6979.patch =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-6/amarok-1.4.5-CVE-2006-6979.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- amarok-1.4.5-CVE-2006-6979.patch 14 Feb 2007 19:13:22 -0000 1.1 +++ amarok-1.4.5-CVE-2006-6979.patch 15 Feb 2007 06:21:26 -0000 1.2 @@ -1,13 +1,28 @@ -Index: src/magnatunebrowser/magnatunealbumdownloader.cpp +Index: amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp =================================================================== ---- amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp (revision 633106) -+++ amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp (working copy) -@@ -89,7 +89,7 @@ +--- amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp (revision 633659) ++++ amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp (revision 633677) +@@ -89,19 +89,19 @@ //ok, now we have the .zip file downloaded. All we need is to unpack it to the desired location and add it to the collection. - QString unzipString = "unzip \""+m_tempDir.name() + m_currentAlbumFileName + "\" -d \"" + m_currentAlbumUnpackLocation + "\" &"; -+ QString unzipString = KProcess::quote( "unzip \""+m_tempDir.name() + m_currentAlbumFileName + "\" -d \"" + m_currentAlbumUnpackLocation + "\" &" ); ++ QString unzipString = "unzip "+ KProcess::quote( m_tempDir.name() + m_currentAlbumFileName) + " -d " +KProcess::quote( m_currentAlbumUnpackLocation ) + " &"; debug() << "unpacking: " << unzipString << endl; + system( unzipString.ascii() ); + +- + ++ + if (m_currentAlbumId != -1 ) { + +- //now I really want to add the album cover to the same folder where I just unzipped the album... The ++ //now I really want to add the album cover to the same folder where I just unzipped the album... The + //only way of getting the actual location where the album was unpacked is using the artist and album names +- ++ + MagnatuneAlbum album = MagnatuneDatabaseHandler::instance()->getAlbumById( m_currentAlbumId ); + MagnatuneArtist artist = MagnatuneDatabaseHandler::instance()->getArtistById( album.getArtistId() ); + Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-6/amarok.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- amarok.spec 14 Feb 2007 19:13:22 -0000 1.72 +++ amarok.spec 15 Feb 2007 06:21:26 -0000 1.73 @@ -4,7 +4,7 @@ Name: amarok Summary: Media player for KDE Version: 1.4.5 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Multimedia License: GPL @@ -235,6 +235,9 @@ %changelog +* Thu Feb 15 2007 Aurelien Bompard 1.4.5-3 +- fix patch (provided by upstream) + * Wed Feb 14 2007 Aurelien Bompard 1.4.5-2 - add patch to fix CVE-2006-6979 (bug 228138) From fedora-extras-commits at redhat.com Thu Feb 15 06:45:14 2007 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 15 Feb 2007 01:45:14 -0500 Subject: rpms/libtomoe-gtk/devel .cvsignore, 1.2, 1.3 libtomoe-gtk.spec, 1.10, 1.11 sources, 1.4, 1.5 Message-ID: <200702150645.l1F6jEBs031608@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/libtomoe-gtk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31566 Modified Files: .cvsignore libtomoe-gtk.spec sources Log Message: - update to 0.5.1 - add some more doc files Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libtomoe-gtk/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Mar 2006 03:48:12 -0000 1.2 +++ .cvsignore 15 Feb 2007 06:44:42 -0000 1.3 @@ -1 +1 @@ -libtomoe-gtk-0.1.0.tar.gz +libtomoe-gtk-0.5.1.tar.gz Index: libtomoe-gtk.spec =================================================================== RCS file: /cvs/extras/rpms/libtomoe-gtk/devel/libtomoe-gtk.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libtomoe-gtk.spec 21 Jan 2007 07:16:27 -0000 1.10 +++ libtomoe-gtk.spec 15 Feb 2007 06:44:42 -0000 1.11 @@ -1,6 +1,6 @@ Name: libtomoe-gtk -Version: 0.5.0 -Release: 2%{?dist} +Version: 0.5.1 +Release: 1%{?dist} Summary: Gtk library for tomoe Japanese handwritten input Group: System Environment/Libraries @@ -9,8 +9,9 @@ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: tomoe >= %{version} -BuildRequires: tomoe-devel, gtk2-devel, gucharmap-devel, gettext, libgnomeui-devel +Requires: tomoe >= %{version} +BuildRequires: tomoe-devel, gtk2-devel, gucharmap-devel, libgnomeui-devel +BuildRequires: gettext %description Gtk library for tomoe Japanese handwritten input. @@ -66,7 +67,7 @@ %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog +%doc AUTHORS COPYING NEWS README TODO %{_libdir}/libtomoe-gtk.so.* %dir %{_datadir}/libtomoe-gtk %{_datadir}/libtomoe-gtk/* @@ -82,6 +83,10 @@ %changelog +* Thu Feb 15 2007 Jens Petersen - 0.5.1-1 +- update to 0.5.1 +- add some more doc files + * Sun Jan 21 2007 Ryo Dairiki - 0.5.0-2 - fix the building dependencies. Index: sources =================================================================== RCS file: /cvs/extras/rpms/libtomoe-gtk/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 21 Jan 2007 03:55:48 -0000 1.4 +++ sources 15 Feb 2007 06:44:42 -0000 1.5 @@ -1 +1 @@ -6f3b3eb40b1b03c1272de9ae4242433a libtomoe-gtk-0.5.0.tar.gz +4d1752619cd1dab8b16cb0689a484d37 libtomoe-gtk-0.5.1.tar.gz From fedora-extras-commits at redhat.com Thu Feb 15 08:33:43 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 15 Feb 2007 03:33:43 -0500 Subject: rpms/hunspell-hr import.log,1.1,1.2 Message-ID: <200702150833.l1F8Xhvp012429@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-hr In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12391 Modified Files: import.log Log Message: auto-import hunspell-hr-0.20060607-1 on branch devel from hunspell-hr-0.20060607-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/hunspell-hr/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 Feb 2007 21:34:31 -0000 1.1 +++ import.log 15 Feb 2007 08:33:10 -0000 1.2 @@ -0,0 +1 @@ +hunspell-hr-0_20060607-1:HEAD:hunspell-hr-0.20060607-1.src.rpm:1171528475 From fedora-extras-commits at redhat.com Thu Feb 15 08:33:45 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 15 Feb 2007 03:33:45 -0500 Subject: rpms/hunspell-hr/devel hunspell-hr.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702150833.l1F8XjJv012433@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-hr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12391/devel Modified Files: .cvsignore sources Added Files: hunspell-hr.spec Log Message: auto-import hunspell-hr-0.20060607-1 on branch devel from hunspell-hr-0.20060607-1.src.rpm --- NEW FILE hunspell-hr.spec --- Name: hunspell-hr Summary: Croatian hunspell dictionaries %define upstreamid 20060607 Version: 0.%{upstreamid} Release: 1%{?dist} Source: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/hr_HR.zip Group: Applications/Text URL: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/ BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot License: LGPL BuildArch: noarch Requires: hunspell %description Croatian hunspell dictionaries. %prep %setup -q -c -n hunspell-hr %build chmod -x * %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README_hr_HR.txt %{_datadir}/myspell/* %changelog * Thu Dec 07 2006 Caolan McNamara - 0.20060607-1 - initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hunspell-hr/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Feb 2007 21:34:38 -0000 1.1 +++ .cvsignore 15 Feb 2007 08:33:13 -0000 1.2 @@ -0,0 +1 @@ +hr_HR.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/hunspell-hr/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Feb 2007 21:34:38 -0000 1.1 +++ sources 15 Feb 2007 08:33:13 -0000 1.2 @@ -0,0 +1 @@ +0017e47e491d97c0f993a7f959b0bf01 hr_HR.zip From fedora-extras-commits at redhat.com Thu Feb 15 08:44:51 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 15 Feb 2007 03:44:51 -0500 Subject: rpms/hunspell-hr/devel Makefile,1.1,1.2 Message-ID: <200702150844.l1F8ipTP012550@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-hr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12532 Modified Files: Makefile Log Message: seems to have gotten confused Index: Makefile =================================================================== RCS file: /cvs/extras/rpms/hunspell-hr/devel/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile 14 Feb 2007 21:34:38 -0000 1.1 +++ Makefile 15 Feb 2007 08:44:19 -0000 1.2 @@ -1,7 +1,7 @@ # Makefile for source rpm: hunspell-hr # $Id$ NAME := hunspell-hr -SPECFILE = hunspell-hu +SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done From fedora-extras-commits at redhat.com Thu Feb 15 08:47:16 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 15 Feb 2007 03:47:16 -0500 Subject: rpms/hunspell-th/devel Makefile,1.1,1.2 Message-ID: <200702150847.l1F8lGKP012666@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-th/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12648 Modified Files: Makefile Log Message: seems to have gotten confused Index: Makefile =================================================================== RCS file: /cvs/extras/rpms/hunspell-th/devel/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile 14 Feb 2007 21:39:37 -0000 1.1 +++ Makefile 15 Feb 2007 08:46:43 -0000 1.2 @@ -1,7 +1,7 @@ # Makefile for source rpm: hunspell-th # $Id$ NAME := hunspell-th -SPECFILE = hunspell-zu +SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done From fedora-extras-commits at redhat.com Thu Feb 15 08:49:41 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 15 Feb 2007 03:49:41 -0500 Subject: rpms/hunspell-th import.log,1.1,1.2 Message-ID: <200702150849.l1F8nf9d012746@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-th In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12708 Modified Files: import.log Log Message: auto-import hunspell-th-0.20061212-1 on branch devel from hunspell-th-0.20061212-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/hunspell-th/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 Feb 2007 21:39:30 -0000 1.1 +++ import.log 15 Feb 2007 08:49:08 -0000 1.2 @@ -0,0 +1 @@ +hunspell-th-0_20061212-1:HEAD:hunspell-th-0.20061212-1.src.rpm:1171529435 From fedora-extras-commits at redhat.com Thu Feb 15 08:49:43 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 15 Feb 2007 03:49:43 -0500 Subject: rpms/hunspell-th/devel hunspell-th.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702150849.l1F8nhCC012750@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-th/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12708/devel Modified Files: .cvsignore sources Added Files: hunspell-th.spec Log Message: auto-import hunspell-th-0.20061212-1 on branch devel from hunspell-th-0.20061212-1.src.rpm --- NEW FILE hunspell-th.spec --- Name: hunspell-th Summary: Thai hunspell dictionaries %define upstreamid 20061212 Version: 0.%{upstreamid} Release: 1%{?dist} Source: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/th_TH.zip Group: Applications/Text URL: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: LGPL BuildArch: noarch Requires: hunspell %description Thai hunspell dictionaries. %prep %setup -q -c -n hunspell-th %build chmod -x * %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README_th_TH.txt %{_datadir}/myspell/* %changelog * Wed Feb 14 2007 Caolan McNamara - 0.20061212-1 - update to latest * Thu Dec 07 2006 Caolan McNamara - 0.20050530-1 - initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hunspell-th/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Feb 2007 21:39:37 -0000 1.1 +++ .cvsignore 15 Feb 2007 08:49:11 -0000 1.2 @@ -0,0 +1 @@ +th_TH.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/hunspell-th/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Feb 2007 21:39:37 -0000 1.1 +++ sources 15 Feb 2007 08:49:11 -0000 1.2 @@ -0,0 +1 @@ +0d71a7294205979c318caf8633f1a1ab th_TH.zip From fedora-extras-commits at redhat.com Thu Feb 15 09:33:58 2007 From: fedora-extras-commits at redhat.com (Callum Lerwick (seg)) Date: Thu, 15 Feb 2007 04:33:58 -0500 Subject: rpms/tinyfugue/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tinyfugue.spec, 1.5, 1.6 Message-ID: <200702150933.l1F9XwuZ017146@cvs-int.fedora.redhat.com> Author: seg Update of /cvs/extras/rpms/tinyfugue/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17124 Modified Files: .cvsignore sources tinyfugue.spec Log Message: * Thu Feb 15 2007 Callum Lerwick - 5.0-0.6.b8 - New upstream version. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tinyfugue/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Feb 2006 19:28:42 -0000 1.2 +++ .cvsignore 15 Feb 2007 09:33:25 -0000 1.3 @@ -1 +1 @@ -tf-50b7.tar.gz +tf-50b8.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tinyfugue/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Feb 2006 19:28:42 -0000 1.2 +++ sources 15 Feb 2007 09:33:25 -0000 1.3 @@ -1 +1 @@ -6652b7eda8a200d28e8184c1659137a2 tf-50b7.tar.gz +3e994e791966d274f63b0e61abf2ef59 tf-50b8.tar.gz Index: tinyfugue.spec =================================================================== RCS file: /cvs/extras/rpms/tinyfugue/devel/tinyfugue.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- tinyfugue.spec 10 Jan 2007 04:32:23 -0000 1.5 +++ tinyfugue.spec 15 Feb 2007 09:33:25 -0000 1.6 @@ -1,14 +1,14 @@ -%define packageversion 50b7 +%define packageversion 50b8 Name: tinyfugue Version: 5.0 -Release: 0.6.b7%{?dist} +Release: 0.6.b8%{?dist} Summary: A MU* client Group: Applications/Internet License: GPL -URL: http://tf.tcp.com/ -Source: http://ftp.tcp.com/pub/mud/Clients/tinyfugue/tf-%{packageversion}.tar.gz +URL: http://tinyfugue.sourceforge.net/ +Source: http://dl.sourceforge.net/tinyfugue/tf-%{packageversion}.tar.gz Patch0: tf-50b7.build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -32,9 +32,9 @@ %install rm -rf %{buildroot} -mkdir -p %{buildroot}%{_prefix} +install -d %{buildroot}%{_prefix} make install DESTDIR=%{buildroot} -install -pD src/tf.1.nroffman %{buildroot}%{_mandir}/man1/tf.1 +install -D -p -m 644 src/tf.1.nroffman %{buildroot}%{_mandir}/man1/tf.1 %clean rm -rf %{buildroot} @@ -47,6 +47,9 @@ %{_mandir}/man1/tf.1* %changelog +* Thu Feb 15 2007 Callum Lerwick - 5.0-0.6.b8 +- New upstream version. + * Tue Jan 09 2007 Callum Lerwick - 5.0-0.6.b7 - Add ncurses-devel BR, fixes #221762. From fedora-extras-commits at redhat.com Thu Feb 15 09:46:18 2007 From: fedora-extras-commits at redhat.com (Callum Lerwick (seg)) Date: Thu, 15 Feb 2007 04:46:18 -0500 Subject: rpms/tinyfugue/FC-6 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tinyfugue.spec, 1.5, 1.6 Message-ID: <200702150946.l1F9kIdB017342@cvs-int.fedora.redhat.com> Author: seg Update of /cvs/extras/rpms/tinyfugue/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17321 Modified Files: .cvsignore sources tinyfugue.spec Log Message: * Thu Feb 15 2007 Callum Lerwick - 5.0-0.6.b8 - New upstream version. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tinyfugue/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Feb 2006 19:28:42 -0000 1.2 +++ .cvsignore 15 Feb 2007 09:45:45 -0000 1.3 @@ -1 +1 @@ -tf-50b7.tar.gz +tf-50b8.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tinyfugue/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Feb 2006 19:28:42 -0000 1.2 +++ sources 15 Feb 2007 09:45:45 -0000 1.3 @@ -1 +1 @@ -6652b7eda8a200d28e8184c1659137a2 tf-50b7.tar.gz +3e994e791966d274f63b0e61abf2ef59 tf-50b8.tar.gz Index: tinyfugue.spec =================================================================== RCS file: /cvs/extras/rpms/tinyfugue/FC-6/tinyfugue.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- tinyfugue.spec 10 Jan 2007 05:16:34 -0000 1.5 +++ tinyfugue.spec 15 Feb 2007 09:45:45 -0000 1.6 @@ -1,14 +1,14 @@ -%define packageversion 50b7 +%define packageversion 50b8 Name: tinyfugue Version: 5.0 -Release: 0.6.b7%{?dist} +Release: 0.6.b8%{?dist} Summary: A MU* client Group: Applications/Internet License: GPL -URL: http://tf.tcp.com/ -Source: http://ftp.tcp.com/pub/mud/Clients/tinyfugue/tf-%{packageversion}.tar.gz +URL: http://tinyfugue.sourceforge.net/ +Source: http://dl.sourceforge.net/tinyfugue/tf-%{packageversion}.tar.gz Patch0: tf-50b7.build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -32,9 +32,9 @@ %install rm -rf %{buildroot} -mkdir -p %{buildroot}%{_prefix} +install -d %{buildroot}%{_prefix} make install DESTDIR=%{buildroot} -install -pD src/tf.1.nroffman %{buildroot}%{_mandir}/man1/tf.1 +install -D -p -m 644 src/tf.1.nroffman %{buildroot}%{_mandir}/man1/tf.1 %clean rm -rf %{buildroot} @@ -47,6 +47,9 @@ %{_mandir}/man1/tf.1* %changelog +* Thu Feb 15 2007 Callum Lerwick - 5.0-0.6.b8 +- New upstream version. + * Tue Jan 09 2007 Callum Lerwick - 5.0-0.6.b7 - Add ncurses-devel BR, fixes #221762. From fedora-extras-commits at redhat.com Thu Feb 15 09:53:28 2007 From: fedora-extras-commits at redhat.com (Callum Lerwick (seg)) Date: Thu, 15 Feb 2007 04:53:28 -0500 Subject: rpms/tinyfugue/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tinyfugue.spec, 1.3, 1.4 Message-ID: <200702150953.l1F9rS69017467@cvs-int.fedora.redhat.com> Author: seg Update of /cvs/extras/rpms/tinyfugue/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17441 Modified Files: .cvsignore sources tinyfugue.spec Log Message: * Thu Feb 15 2007 Callum Lerwick - 5.0-0.4.b8 - New upstream version. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tinyfugue/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Feb 2006 19:28:42 -0000 1.2 +++ .cvsignore 15 Feb 2007 09:52:56 -0000 1.3 @@ -1 +1 @@ -tf-50b7.tar.gz +tf-50b8.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tinyfugue/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Feb 2006 19:28:42 -0000 1.2 +++ sources 15 Feb 2007 09:52:56 -0000 1.3 @@ -1 +1 @@ -6652b7eda8a200d28e8184c1659137a2 tf-50b7.tar.gz +3e994e791966d274f63b0e61abf2ef59 tf-50b8.tar.gz Index: tinyfugue.spec =================================================================== RCS file: /cvs/extras/rpms/tinyfugue/FC-5/tinyfugue.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tinyfugue.spec 5 Apr 2006 07:07:23 -0000 1.3 +++ tinyfugue.spec 15 Feb 2007 09:52:56 -0000 1.4 @@ -1,17 +1,19 @@ -%define packageversion 50b7 +%define packageversion 50b8 -Name: tinyfugue +Name: tinyfugue Version: 5.0 -Release: 0.4.b7%{?dist} +Release: 0.4.b8%{?dist} Summary: A MU* client -Group: Applications/Internet +Group: Applications/Internet License: GPL -URL: http://tf.tcp.com/ -Source: http://ftp.tcp.com/pub/mud/Clients/tinyfugue/tf-%{packageversion}.tar.gz -Patch0: tf-50b7.build.patch +URL: http://tinyfugue.sourceforge.net/ +Source: http://dl.sourceforge.net/tinyfugue/tf-%{packageversion}.tar.gz +Patch0: tf-50b7.build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: pcre-devel openssl-devel + +BuildRequires: pcre-devel +BuildRequires: openssl-devel %description TinyFugue is the ubiquitous MUD/MOO/MUSH/MUCK/etc client for UNIX. This client @@ -28,22 +30,25 @@ make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_prefix} -make install DESTDIR=$RPM_BUILD_ROOT -install -pD src/tf.1.nroffman $RPM_BUILD_ROOT%{_mandir}/man1/tf.1 +rm -rf %{buildroot} +install -d %{buildroot}%{_prefix} +make install DESTDIR=%{buildroot} +install -D -p -m 644 src/tf.1.nroffman %{buildroot}%{_mandir}/man1/tf.1 %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root,-) +%doc CHANGES COPYING CREDITS README %{_bindir}/tf %{_datadir}/tf-lib/ %{_mandir}/man1/tf.1* -%doc CHANGES COPYING CREDITS README %changelog +* Thu Feb 15 2007 Callum Lerwick - 5.0-0.4.b8 +- New upstream version. + * Wed Apr 05 2006 Callum Lerwick - 5.0-0.4.b7 - Pass --enable-core to configure so we get a useful debuginfo package. From fedora-extras-commits at redhat.com Thu Feb 15 09:56:28 2007 From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa)) Date: Thu, 15 Feb 2007 04:56:28 -0500 Subject: rpms/icewm import.log,1.1,1.2 Message-ID: <200702150956.l1F9uSgO017644@cvs-int.fedora.redhat.com> Author: gilboa Update of /cvs/extras/rpms/icewm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17591 Modified Files: import.log Log Message: auto-import icewm-1.2.30-12 on branch devel from icewm-1.2.30-12.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/icewm/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Feb 2007 19:35:58 -0000 1.1 +++ import.log 15 Feb 2007 09:55:55 -0000 1.2 @@ -0,0 +1 @@ +icewm-1_2_30-12:HEAD:icewm-1.2.30-12.src.rpm:1171533344 From fedora-extras-commits at redhat.com Thu Feb 15 09:56:30 2007 From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa)) Date: Thu, 15 Feb 2007 04:56:30 -0500 Subject: rpms/icewm/devel icewm-configure.patch, NONE, 1.1 icewm-keys.patch, NONE, 1.1 icewm-menu.patch, NONE, 1.1 icewm-startup, NONE, 1.1 icewm-toolbar.patch, NONE, 1.1 icewm-xdg-menu, NONE, 1.1 icewm.desktop, NONE, 1.1 icewm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702150956.l1F9uUS8017648@cvs-int.fedora.redhat.com> Author: gilboa Update of /cvs/extras/rpms/icewm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17591/devel Modified Files: .cvsignore sources Added Files: icewm-configure.patch icewm-keys.patch icewm-menu.patch icewm-startup icewm-toolbar.patch icewm-xdg-menu icewm.desktop icewm.spec Log Message: auto-import icewm-1.2.30-12 on branch devel from icewm-1.2.30-12.src.rpm icewm-configure.patch: --- NEW FILE icewm-configure.patch --- --- icewm-1.2.30/configure.in.old 2007-01-16 16:12:51.000000000 +0200 +++ icewm-1.2.30/configure.in 2007-01-16 16:13:31.000000000 +0200 @@ -814,7 +814,7 @@ APPLICATIONS="${APPLICATIONS} icewm-menu-gnome2" GNOME2_PREFIX=`pkg-config --variable=prefix gnome-desktop-2.0` GWMDIR="${GNOME2_PREFIX}/share/gnome/wm-properties/" - CONFIG_GNOME2_MENU_DIR="${GNOME2_PREFIX}/share/gnome/vfolders/" + CONFIG_GNOME2_MENU_DIR="${GNOME2_PREFIX}/share/desktop-directories/ fi if test "${GNOME2_CFLAGS}" = ""; then --- icewm-1.2.30/configure.old 2007-01-16 17:44:10.000000000 +0200 +++ icewm-1.2.30/configure 2007-01-16 17:44:31.000000000 +0200 @@ -12000,7 +12000,7 @@ APPLICATIONS="${APPLICATIONS} icewm-menu-gnome2" GNOME2_PREFIX=`pkg-config --variable=prefix gnome-desktop-2.0` GWMDIR="${GNOME2_PREFIX}/share/gnome/wm-properties/" - CONFIG_GNOME2_MENU_DIR="${GNOME2_PREFIX}/share/gnome/vfolders/" + CONFIG_GNOME2_MENU_DIR="${GNOME2_PREFIX}/share/desktop-directories/" fi if test "${GNOME2_CFLAGS}" = ""; then icewm-keys.patch: --- NEW FILE icewm-keys.patch --- --- icewm-1.2.30/lib/keys.in.old 2007-01-18 13:55:20.000000000 +0200 +++ icewm-1.2.30/lib/keys.in 2007-01-18 16:07:07.000000000 +0200 @@ -9,28 +9,21 @@ # You'll have to omit XK_ prefixs and to replace XF86XK_ prefixes by # XF86. Valid modifiers are Alt, Ctrl, Shift, Meta, Super and Hyper. # -key "Alt+Ctrl+t" xterm -key "Alt+Ctrl+f" fte -key "Alt+Ctrl+e" nedit -key "Alt+Ctrl+g" gimp -key "Alt+Ctrl+n" netscape -noraise -remote openBrowser -key "Alt+Ctrl+b" netscape -noraise -remote openBookmarks -key "Alt+Ctrl+m" netscape -noraise -remote openURL(mailto:,new-window) +key "Alt+Ctrl+t" xterm +key "Alt+Ctrl+b" htmlview +key "Alt+Ctrl+s" htmlview http://www.google.com -key "Alt+Ctrl+KP_Divide" aumix -v -5 # lower volume -key "Alt+Ctrl+KP_Multiply" aumix -v +5 # raise volume +key "Super+KP_Subtract" amixer sset PCM 5%- +key "Super+KP_Add" amixer sset PCM 5%+ # "Multimedia key" bindings for XFree86. Gather the keycodes of your # advanced function keys by watching the output of the xev command whilest # pressing those keys and map those symbols by using xmodmap. -key "XF86Standby" killall -QUIT icewm -key "XF86AudioLowerVolume" aumix -v -5 -key "XF86AudioRaiseVolume" aumix -v +5 -key "XF86AudioMute" aumix -v 0 -key "XF86AudioPlay" cdplay play 1 -key "XF86AudioStop" cdplay stop -key "XF86HomePage" netscape -noraise -remote openHomepage -key "XF86Mail" netscape -noraise -remote openURL(mailto:,new-window) -key "XF86Search" netscape -noraise -remote openURL(http://www.google.com/) -key "XF86Eject" eject +key "XF86Standby" killall -QUIT icewm +key "XF86AudioLowerVolume" amixer sset PCM 5%- +key "XF86AudioRaiseVolume" amixer sset PCM 5%+ +key "XF86AudioMute" amixer sset PCM 0% +key "XF86HomePage" htmlview +key "XF86Search" htmlview http://www.google.com +key "XF86Eject" eject icewm-menu.patch: --- NEW FILE icewm-menu.patch --- --- icewm-1.2.30/lib/menu.in.old 2007-01-28 15:14:30.000000000 +0200 +++ icewm-1.2.30/lib/menu.in 2007-01-28 15:17:12.000000000 +0200 @@ -4,16 +4,7 @@ # since modifications to this file will be discarded when you # (re)install icewm. # -prog xterm xterm xterm -prog rxvt xterm rxvt -bg black -cr green -fg white -C -fn 9x15 -sl 500 -prog fte fte fte -prog NEdit nedit nedit -prog Mozilla mozilla mozilla -prog XChat xchat xchat -prog Gimp gimp gimp +prog xterm /usr/share/icons/Bluecurve/32x32/apps/gnome-terminal.png xterm +prog "Web browser" /usr/share/icons/Bluecurve/32x32/apps/mozilla-icon.png htmlview separator -menuprog Gnome folder icewm-menu-gnome1 --list @CONFIG_GNOME1_MENU_DIR@ -menuprog Gnome folder icewm-menu-gnome2 --list @CONFIG_GNOME2_MENU_DIR@ -menuprog KDE folder icewm-menu-gnome at GNOME_VER@ --list @CONFIG_KDE_MENU_DIR@ -menufile Programs folder programs -menufile Tool_bar folder toolbar +menufile Programs folder programs.autogen --- NEW FILE icewm-startup --- #!/bin/sh [ ! -d ~/.icewm ] && mkdir ~/.icewm icewm-xdg-menu --entire-menu --with-theme-paths --icon-size 16 --theme Bluecurve > ~/.icewm/programs.autogen icewm-toolbar.patch: --- NEW FILE icewm-toolbar.patch --- --- icewm-1.2.30/lib/toolbar.in.old 2007-01-18 18:51:55.000000000 +0200 +++ icewm-1.2.30/lib/toolbar.in 2007-01-18 18:55:50.000000000 +0200 @@ -4,6 +4,6 @@ # since modifications to this file will be discarded when you # (re)install icewm. # -prog XTerm xterm xterm -prog FTE fte fte -prog Netscape netscape netscape +prog xterm /usr/share/icons/Bluecurve/32x32/apps/gnome-terminal.png xterm +prog "Web browser" /usr/share/icons/Bluecurve/32x32/apps/mozilla-icon.png htmlview + --- NEW FILE icewm-xdg-menu --- #!/usr/bin/python """ This script generates FreeDesktop application menu for IceWM window manager. Written by Konstantin Korikov , put in the public domain Requires pyxdg http://cvs.freedesktop.org/cgi-bin/viewcvs.cgi/pyxdg/ USAGE EXAMPLE Add to $HOME/.icewm/menu this line: menuprog Applications - icewm-xdg-menu and restart IceWM. """ import sys import locale import getopt import re import xdg.Menu import xdg.DesktopEntry import xdg.IconTheme import xdg.Config version = "0.3" def print_usage(exit_code = 1): print """Usage: %s [options] Options: --locale=locale set output languege and encoding --root-folder folder folder to generate (for example: /Games) --terminal command set terminal emulator command (default: xterm -e %%s) --default-folder-icon icon icon for folders that not provide Icon option --default-entry-icon icon icon for entries that not provide Icon option --with-theme-paths convert icon base names to icon absolute paths using icon theme --entire-menu print entire menu --icon-size set default icon size --theme theme set icon theme --help print this help and exit --version print version and exit """ % sys.argv[0] sys.exit(exit_code) def print_version(): print "%s version %s" % ( os.path.basename(sys.argv[0]), version) sys.exit(0) root_folder = "" terminal = "xterm -e %s" default_folder_icon = "folder" default_entry_icon = "-" entire_menu = False with_theme_paths = False icon_size = 16 exec_clean1_re = re.compile(r'%[a-zA-Z]') exec_clean2_re = re.compile(r'%%') encoding = None locale_str = None def find_icon(entry): icon = entry.getIcon() if icon and with_theme_paths: icon = xdg.IconTheme.getIconPath(icon, icon_size) or icon return icon def process_menu(menu): for entry in menu.getEntries(): if isinstance(entry, xdg.Menu.Menu): name = entry.getName() or entry.DesktopFileID icon = find_icon(entry) or default_folder_icon if entire_menu: print ("menu \"%s\" \"%s\" {" % (name, icon)).encode(encoding) process_menu(entry) print "}".encode(encoding) else: print (("menuprog \"%s\" \"%s\" %s" % (name, icon, sys.argv[0])) + (" --root-folder \"%s\"" % entry.getPath(org=True)) + (" --terminal \"%s\"" % terminal) + (" --default-folder-icon \"%s\"" % default_folder_icon) + (" --default-entry-icon \"%s\"" % default_entry_icon) + (" --theme \"%s\"" % xdg.Config.icon_theme) + (" --icon-size \"%d\"" % icon_size) + (with_theme_paths and " --with-theme-paths" or "")).encode(encoding), if locale_str: print (" --locale \"%s\"" % locale_str).encode(encoding), print elif isinstance(entry, xdg.Menu.MenuEntry): de = entry.DesktopEntry name = de.getName() or entry.DesktopFileID icon = find_icon(de) or default_entry_icon execute = exec_clean2_re.sub('%', exec_clean1_re.sub('', de.getExec())) if de.getTerminal(): execute = terminal % execute print ("prog \"%s\" \"%s\" %s" % (name, icon, execute)).encode(encoding) try: opts, args = getopt.getopt(sys.argv[1:], "", ("help", "version", "locale=", "root-folder=", "terminal=", "default-folder-icon=", "default-entry-icon=", "entire-menu", "theme=", "with-theme-paths", "icon-size=")) except getopt.GetoptError: print_usage() locale.setlocale(locale.LC_ALL, "") for o, v in opts: if o == "--locale": locale_str = v locale.setlocale(locale.LC_ALL, locale_str) if o == "--root-folder": root_folder = v elif o == "--terminal": terminal = v elif o == "--default-folder-icon": default_folder_icon = v elif o == "--default-entry-icon": default_entry_icon = v elif o == "--entire-menu" : entire_menu = True elif o == "--with-theme-paths" : with_theme_paths = True elif o == "--icon-size": icon_size = int(v) elif o == "--theme" : xdg.Config.setIconTheme(v) elif o in ("-h", "-?", "--help"): print_usage(0) elif o in ("-v", "--version"): print_version() encoding = locale.getlocale()[1] or 'UTF-8' menu = xdg.Menu.parse() if root_folder: menu = menu.getMenu(root_folder) process_menu(menu) --- NEW FILE icewm.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Icewm Comment=Simple and fast window manger Exec=icewm-session Terminal=False TryExec=icewm [Window Manager] SessionManaged=true # vi: encoding=utf-8 --- NEW FILE icewm.spec --- Name: icewm Version: 1.2.30 Release: 12%{?dist} Summary: Light and configurable window manager Group: User Interface/Desktops License: LGPL URL: http://www.icewm.org Source0: http://heanet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz Source1: http://lostclus.linux.kiev.ua/scripts/icewm-xdg-menu Source2: icewm.desktop Source4: icewm-startup BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: imlib-devel BuildRequires: xorg-x11-proto-devel BuildRequires: libXinerama-devel BuildRequires: libXft-devel BuildRequires: libICE-devel BuildRequires: gettext BuildRequires: gnome-desktop-devel Requires: redhat-artwork Requires: alsa-utils Requires: htmlview Requires: xterm Patch0: icewm-configure.patch Patch1: icewm-menu.patch Patch2: icewm-toolbar.patch Patch3: icewm-keys.patch %description IceWM is a window manager for the X Window System (freedesktop, XFree86). The goal of IceWM is speed, simplicity, and not getting in the user's way. %package gnome Summary: GNOME menu support for IceWM window manager Group: User Interface/Desktops Requires: gnome-menus Requires: icewm = %{version}-%{release} %description gnome IceWM-gnome adds gnome-menu support for the IceWM window manager. %package xdgmenu Summary: Automatically generate the main IceWM menu Group: User Interface/Desktops Requires: pyxdg Requires: icewm = %{version}-%{release} %description xdgmenu IceWM-xdgmenu generates static IceWM menu files from the existing freedesktop.org .desktop files. Files are re-generated each time the user logs-in. %prep %setup -q %patch0 -p1 -b .configure %patch1 -p1 -b .menu %patch2 -p1 -b .toolbar %patch3 -p1 -b .keys %build # Configure sets the CXXFLAGS to: -fpermissive -fno-exceptions -fno-rtti -Wxxx... # In general it doesn't seem to break anything. BZ# if you hit something bad. %configure --enable-gradients \ --enable-antialiasing \ --enable-menus-gnome2 \ --disable-menus-gnome1 \ --with-cfgdir=%{_sysconfdir}/icewm make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p" mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 %{__install} -p -m 644 doc/icewm.1.man $RPM_BUILD_ROOT/%{_mandir}/man1/icewm.1 %{__install} -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir} %{__install} -p -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/icewm/startup mkdir -p $RPM_BUILD_ROOT/%{_datadir}/xsessions/ %{__install} -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/xsessions/ %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS BUGS CHANGES COPYING README README.wm-session TODO doc/*.html %exclude %{_datadir}/icewm/startup %{_datadir}/icewm/ %{_datadir}/xsessions/icewm.desktop %{_mandir}/man1/icewm.1* %{_bindir}/icewmbg %{_bindir}/icehelp %{_bindir}/icesh %{_bindir}/icewm %{_bindir}/icewm-session %{_bindir}/icewmhint %{_bindir}/icewmtray %files gnome %defattr(-,root,root,-) %{_bindir}/icewm-menu-gnome2 %files xdgmenu %defattr(-,root,root,-) %{_bindir}/icewm-xdg-menu* %{_datadir}/icewm/startup %changelog * Sat Feb 10 2007 - 1.2.30-12 - Add missing dot in the -gnome sub-package description. - Replace REQ icewm (in both -gnome and -xdgmenu) with icewm-x.x.x. - Fix -xdgmenu file list and %%install section. - Preserve the source time-stamp. * Sun Feb 04 2007 - 1.2.30-11 - Remove .Xdefaults fix from startup. (reported upstream). - Replace buildroot with RPM_BUILD_ROOT. * Sun Jan 28 2007 - 1.2.30-10 - Missing REQ: icewm (both -gnome and -xdgmenu) - Updated menu.in patch. - Updated startup script. (-xdgmenu) - Updated icewm-xdg-menu script. (-xdgmenu) * Thu Jan 25 2007 - 1.2.30-9 - Remove redundant icewm-xdg-menu* %%file entry. - Change sub-package name to xdgmenu. - Move icewm-xdg-menu to xdgmenu sub-package. - Removed the icewm-generate-menu script. * Sat Jan 20 2007 - 1.2.30-8 - Fix source1 URL. (2nd is a winner) - Fix -gnome summery. - New sub-package: icewm-xdg-menu - ALPHA: icewm-generate-menu script added to use icewm-xdg-menu to generate static menus. * Sat Jan 20 2007 - 1.2.30-7 - Fix source1 URL. - Fix xdg-menu* owner. - Replace default terminal icon to reduce dep-chain. - Fix icewm-gnome description. - Replace install with %%{_install} - Push -gnome's BR to main package. - Change hard-coded sysconf path. * Tue Jan 18 2007 - 1.2.30-6 - Change license back to LGPL. - Change summery. - New sub-package: -gnome. (GNOME menu support.) - Missing REQ: xterm. - Missing REQ: htmlview. - Remove redundant %%_sysconf section. - Remove redundant redhat-xxx icons. - New REQ: redhat-artwork. (icons) - Better man pages handling. - Customize keys to better match fedora. - New REQ: eject. (keys) - New REQ: alsautils. (keys) * Wed Jan 17 2007 - 1.2.30-5 - Fix Source0 URL. - Replace cp with install. - Do not gzip the man page, just copy it. - Use htmlview instead of firefox. - Use BlueCurve icons instead of the mozilla ones. - Re-fix lang support. - Return the default configuration files to %%_datadir - Add gdm session support. - Remove gnome-menus from default menu - replace it with pyxdg/icewm-xdg-menu. * Tue Jan 16 2007 - 1.2.30-4 - Fix man page name. - Remove missing menu items. - Convert GNOME-menu patch to configure.in patch. - Push default configuration into /etc/icewm - Remove the default KDE support. (At least for now) - Require firefox (default browser in Fedora). - Add missing firefox icon. (No source - manual convert) - Add missing gnome-menus. (required for GNOME2 menus) - Fix missing gettext BR. - Fix missing lang support. * Sat Jan 13 2007 - 1.2.30-3 - Fix wrong license. (Was LGPL, should be GPL.) * Tue Jan 11 2007 - 1.2.30-2 - Manually add missing man page. * Tue Jan 11 2007 - 1.2.30-1 - Initial release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/icewm/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Feb 2007 19:36:05 -0000 1.1 +++ .cvsignore 15 Feb 2007 09:55:58 -0000 1.2 @@ -0,0 +1 @@ +icewm-1.2.30.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/icewm/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Feb 2007 19:36:05 -0000 1.1 +++ sources 15 Feb 2007 09:55:58 -0000 1.2 @@ -0,0 +1 @@ +8a302c5e629bb81d87cc02004a694ece icewm-1.2.30.tar.gz From fedora-extras-commits at redhat.com Thu Feb 15 10:41:50 2007 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Thu, 15 Feb 2007 05:41:50 -0500 Subject: rpms/emacs-nxml-mode/devel Makefile, NONE, 1.1 emacs-nxml-mode.spec, NONE, 1.1 slides.rnc, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702151041.l1FAfohM021483@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/extras/rpms/emacs-nxml-mode/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21474 Added Files: Makefile emacs-nxml-mode.spec slides.rnc sources Log Message: Manually imported. ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE emacs-nxml-mode.spec --- %define snapshot 20041004 Summary: Emacs package for editing XML Name: emacs-nxml-mode Version: 0.%{snapshot} Release: 5%{?dist} License: GPL Group: Applications/Editors URL: http://www.thaiopensource.com/nxml-mode/ Source0: http://www.thaiopensource.com/download/nxml-mode-%{snapshot}.tar.gz Source1: http://docbook.sourceforge.net/release/slides/3.4.0/schema/relaxng/slides.rnc BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires(post): info Requires(postun): info Requires: emacs-common BuildRequires: emacs %description The nXML package provides a validating major mode for editing XML documents in GNU Emacs. It can validate against a RELAX NG schema while you type. %prep %setup -q -n nxml-mode-%{snapshot} cp -a %SOURCE1 schema %build make %install rm -rf $RPM_BUILD_ROOT DESTDIR=$RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp/nxml-mode mkdir -p $DESTDIR $DESTDIR/../site-start.d cp -a rng-auto.el *.elc schema char-name $DESTDIR cat <<"EOF" > $DESTDIR/../site-start.d/nxml-init.el ;;; nXML (load "%{_datadir}/emacs/site-lisp/nxml-mode/rng-auto.el") (add-to-list 'auto-mode-alist '("\\.\\(xml\\|xsl\\|rng\\|xhtml\\)\\'" . nxml-mode)) (if (boundp 'magic-mode-alist) (add-to-list 'magic-mode-alist '("<\\?xml " . nxml-mode))) (setq nxml-slash-auto-complete-flag t) EOF mkdir -p $RPM_BUILD_ROOT/%{_infodir} cp -a *.info $RPM_BUILD_ROOT/%{_infodir} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING NEWS README TODO VERSION %{_datadir}/emacs/site-lisp/nxml-mode %{_datadir}/emacs/site-lisp/site-start.d/* %{_infodir}/* %post install-info --info-dir=%{_infodir} %{_infodir}/nxml-mode.info exit 0 %postun if [ "$1" = 0 ] ; then install-info --info-dir=%{_infodir} --delete %{_infodir}/nxml-mode.info fi exit 0 %changelog * Wed Feb 14 2007 Tim Waugh 0.20041004.1-5 - First build. * Tue Feb 13 2007 Tim Waugh 0.20041004.1-4 - Add an entry to magic-mode-alist (bug #223023). * Thu Feb 8 2007 Tim Waugh - Moved dist tag to the right place (bug #223023). - Require emacs-common not emacs (bug #223023). * Wed Feb 7 2007 Tim Waugh - Fixed package rename problems (bug #223023). - Fixed requires tags (bug #223023). - Require emacs (bug #223023). - Better url tag (bug #223023). * Mon Jan 22 2007 Tim Waugh - Renamed package to emacs-nxml-mode (bug #223023). * Mon Nov 15 2004 Tim Waugh - New snapshot (20041004). * Mon Jul 26 2004 Tim Waugh - New snapshot. * Thu Apr 15 2004 J. J. Ramsey - Added the missing char-name/unicode/*.el files * Thu Oct 23 2003 Tim Waugh - Initial build. ***** Error reading new file: [Errno 2] No such file or directory: 'slides.rnc' --- NEW FILE sources --- ac137024cf337d6f11d8ab278d39b4db nxml-mode-20041004.tar.gz From fedora-extras-commits at redhat.com Thu Feb 15 10:59:34 2007 From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa)) Date: Thu, 15 Feb 2007 05:59:34 -0500 Subject: rpms/gmrun import.log,1.1,1.2 Message-ID: <200702151059.l1FAxYc5021727@cvs-int.fedora.redhat.com> Author: gilboa Update of /cvs/extras/rpms/gmrun In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21680 Modified Files: import.log Log Message: auto-import gmrun-0.9.2-7 on branch devel from gmrun-0.9.2-7.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gmrun/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Feb 2007 19:37:25 -0000 1.1 +++ import.log 15 Feb 2007 10:59:01 -0000 1.2 @@ -0,0 +1 @@ +gmrun-0_9_2-7:HEAD:gmrun-0.9.2-7.src.rpm:1171537127 From fedora-extras-commits at redhat.com Thu Feb 15 10:59:36 2007 From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa)) Date: Thu, 15 Feb 2007 05:59:36 -0500 Subject: rpms/gmrun/devel gmrun-gmrunrc.patch, NONE, 1.1 gmrun.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702151059.l1FAxaW8021731@cvs-int.fedora.redhat.com> Author: gilboa Update of /cvs/extras/rpms/gmrun/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21680/devel Modified Files: .cvsignore sources Added Files: gmrun-gmrunrc.patch gmrun.spec Log Message: auto-import gmrun-0.9.2-7 on branch devel from gmrun-0.9.2-7.src.rpm gmrun-gmrunrc.patch: --- NEW FILE gmrun-gmrunrc.patch --- --- gmrun-0.9.2/config/gmrunrc.old 2003-11-16 12:43:41.000000000 +0200 +++ gmrun-0.9.2/config/gmrunrc 2007-01-18 16:05:47.000000000 +0200 @@ -3,7 +3,7 @@ # GPL v2.0 applies # Set terminal -Terminal = gnome-terminal --start-factory-server --use-factory +Terminal = xterm TermExec = ${Terminal} -e AlwaysInTerm = ssh telnet ftp lynx mc vi vim pine centericq perldoc man @@ -32,18 +32,13 @@ # - %u gets replaced with the whole URL ("http://www.google.com") # - %s gets replaced with "//www.google.com". This is useful for URL-s # like "man:printf" --> %s will get replaced with "printf" -URL_http = mozilla -remote "openURL(%u, new-window)" -URL_mailto = mozilla -remote "mailto(%s)" +URL_http = htmlview %u +URL_mailto = htmlview %u +URL_file = xdg-open %s URL_man = ${TermExec} 'man %s' URL_info = ${TermExec} 'info %s' -URL_pd = ${TermExec} 'perldoc %s' -URL_file = nautilus %s -URL_readme = ${TermExec} 'less /usr/doc/%s/README' -URL_info = ${TermExec} 'info %s' -URL_sh = sh -c '%s' +URL_search = htmlview 'http://www.google.co.il/search?q=%s' # extension handlers -EXT:doc,rtf = AbiWord %s -EXT:txt,cc,cpp,h,java,html,htm,epl,tex,latex,js,css,xml,xsl,am = emacs %s -EXT:ps = gv %s -EXT:pdf = xpdf %s +# Customize your own extension handler. +EXT:doc,rtf,txt,cc,cpp,h,java,html,htm,epl,tex,latex,js,css,xml,xsl,am,ps,pdf = xdg-open %s + --- NEW FILE gmrun.spec --- Name: gmrun Version: 0.9.2 Release: 7%{?dist} Summary: Lightweight "Run program" dialog box with search history and tab completion Group: User Interface/Desktops License: GPL URL: http://sourceforge.net/projects/gmrun Source0: http://heanet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz Patch0: gmrun-gmrunrc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel BuildRequires: popt Requires: htmlview Requires: xterm Requires: man Requires: info Requires: xdg-utils %description A simple GTK program which provides a "run program" window. It features a bash-like TAB completion, Ctrl-R/Ctrl-S for searching through the history and URL handlers for any user defined prefix. %prep %setup -q %patch0 -p1 -b .gmrunrc %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p" %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog AUTHORS COPYING README NEWS %{_datadir}/gmrun/ %{_bindir}/gmrun %changelog * Sat Feb 10 2007 - 0.9.2-7 - Preserve the source time-stamp. * Sun Feb 04 2007 - 0.9.2-6 - Fixed summery. - Remove redundant fileattr. * Sun Jan 28 2007 - 0.9.2-5 - Missing REQ: man. - Missing REQ: info. - Missing REQ: xdg-open. - Use xdg-open to handle files. * Sat Jan 20 2007 - 0.9.2-4 - Add missing NEWS to %%doc. * Thu Jan 18 2007 - 0.9.2-3 - Fix wrong group and project URLs. - Fix summery, description. - Remove BR: glib2-devel. (REQ by gtk2-devel). - Add BR: popt - Remove gmrunrc from %%config section. - Set gmrunrc to 0644 (by default it's 0600) - Configure gmrunrc to better handle Fedora URI's. - Add REQ: htmlview. (gmrunrc) - Add REQ: xterm. (gmrunrc) * Sat Jan 13 2007 - 0.9.2-2 - Fix Source0 URL. - Remove redundant %%doc files. * Sat Jan 13 2007 - 0.9.2-1 - Initial release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gmrun/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Feb 2007 19:37:33 -0000 1.1 +++ .cvsignore 15 Feb 2007 10:59:04 -0000 1.2 @@ -0,0 +1 @@ +gmrun-0.9.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gmrun/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Feb 2007 19:37:33 -0000 1.1 +++ sources 15 Feb 2007 10:59:04 -0000 1.2 @@ -0,0 +1 @@ +6cef37a968006d9496fc56a7099c603c gmrun-0.9.2.tar.gz From fedora-extras-commits at redhat.com Thu Feb 15 12:59:05 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 07:59:05 -0500 Subject: rpms/hunspell-zu - New directory Message-ID: <200702151259.l1FCx5NW029628@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-zu In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29623/hunspell-zu Log Message: Directory /cvs/extras/rpms/hunspell-zu added to the repository From fedora-extras-commits at redhat.com Thu Feb 15 12:59:13 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 07:59:13 -0500 Subject: rpms/hunspell-zu/devel - New directory Message-ID: <200702151259.l1FCxDas029642@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-zu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29623/hunspell-zu/devel Log Message: Directory /cvs/extras/rpms/hunspell-zu/devel added to the repository From fedora-extras-commits at redhat.com Thu Feb 15 12:59:28 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 07:59:28 -0500 Subject: rpms/hunspell-zu Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702151259.l1FCxSXT029676@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-zu In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29666 Added Files: Makefile import.log pkg.acl Log Message: Setup of module hunspell-zu --- NEW FILE Makefile --- # Top level Makefile for module hunspell-zu all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Thu Feb 15 12:59:35 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 07:59:35 -0500 Subject: rpms/hunspell-zu/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702151259.l1FCxZwW029694@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-zu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29666/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module hunspell-zu --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Feb 15 13:00:48 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 08:00:48 -0500 Subject: rpms/hunspell-sv - New directory Message-ID: <200702151300.l1FD0mNf029772@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-sv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29767/hunspell-sv Log Message: Directory /cvs/extras/rpms/hunspell-sv added to the repository From fedora-extras-commits at redhat.com Thu Feb 15 13:00:56 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 08:00:56 -0500 Subject: rpms/hunspell-sv/devel - New directory Message-ID: <200702151300.l1FD0ubf029786@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-sv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29767/hunspell-sv/devel Log Message: Directory /cvs/extras/rpms/hunspell-sv/devel added to the repository From fedora-extras-commits at redhat.com Thu Feb 15 13:01:15 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 08:01:15 -0500 Subject: rpms/hunspell-sv Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702151301.l1FD1F7i000815@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-sv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv803 Added Files: Makefile import.log pkg.acl Log Message: Setup of module hunspell-sv --- NEW FILE Makefile --- # Top level Makefile for module hunspell-sv all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Thu Feb 15 13:01:24 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 08:01:24 -0500 Subject: rpms/hunspell-sv/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702151301.l1FD1O50000833@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-sv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv803/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module hunspell-sv --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Feb 15 13:02:50 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 08:02:50 -0500 Subject: rpms/hunspell-sk - New directory Message-ID: <200702151302.l1FD2ocu000933@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-sk In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv928/hunspell-sk Log Message: Directory /cvs/extras/rpms/hunspell-sk added to the repository From fedora-extras-commits at redhat.com Thu Feb 15 13:02:58 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 08:02:58 -0500 Subject: rpms/hunspell-sk/devel - New directory Message-ID: <200702151302.l1FD2w86000947@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-sk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv928/hunspell-sk/devel Log Message: Directory /cvs/extras/rpms/hunspell-sk/devel added to the repository From fedora-extras-commits at redhat.com Thu Feb 15 13:03:13 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 08:03:13 -0500 Subject: rpms/hunspell-sk Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702151303.l1FD3Dm2000981@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-sk In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv971 Added Files: Makefile import.log pkg.acl Log Message: Setup of module hunspell-sk --- NEW FILE Makefile --- # Top level Makefile for module hunspell-sk all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Thu Feb 15 13:03:20 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 08:03:20 -0500 Subject: rpms/hunspell-sk/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702151303.l1FD3KSc000999@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-sk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv971/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module hunspell-sk --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Feb 15 13:04:45 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 08:04:45 -0500 Subject: rpms/hunspell-sl - New directory Message-ID: <200702151304.l1FD4jT5001063@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-sl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1058/hunspell-sl Log Message: Directory /cvs/extras/rpms/hunspell-sl added to the repository From fedora-extras-commits at redhat.com Thu Feb 15 13:04:48 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 08:04:48 -0500 Subject: rpms/hunspell-sl/devel - New directory Message-ID: <200702151304.l1FD4mOb001077@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-sl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1058/hunspell-sl/devel Log Message: Directory /cvs/extras/rpms/hunspell-sl/devel added to the repository From fedora-extras-commits at redhat.com Thu Feb 15 13:05:04 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 08:05:04 -0500 Subject: rpms/hunspell-sl Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702151305.l1FD54bn001111@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-sl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1101 Added Files: Makefile import.log pkg.acl Log Message: Setup of module hunspell-sl --- NEW FILE Makefile --- # Top level Makefile for module hunspell-sl all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Thu Feb 15 13:05:11 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 08:05:11 -0500 Subject: rpms/hunspell-sl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702151305.l1FD5BEv001129@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-sl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1101/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module hunspell-sl --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Feb 15 13:06:39 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 08:06:39 -0500 Subject: rpms/hunspell-pt/devel - New directory Message-ID: <200702151306.l1FD6dd6001210@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-pt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1191/hunspell-pt/devel Log Message: Directory /cvs/extras/rpms/hunspell-pt/devel added to the repository From fedora-extras-commits at redhat.com Thu Feb 15 13:06:54 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 08:06:54 -0500 Subject: rpms/hunspell-pt Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702151306.l1FD6saD001244@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-pt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1234 Added Files: Makefile import.log pkg.acl Log Message: Setup of module hunspell-pt --- NEW FILE Makefile --- # Top level Makefile for module hunspell-pt all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Thu Feb 15 13:07:01 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 08:07:01 -0500 Subject: rpms/hunspell-pt/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702151307.l1FD71eY001262@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-pt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1234/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module hunspell-pt --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Feb 15 13:08:19 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 08:08:19 -0500 Subject: rpms/hunspell-ru - New directory Message-ID: <200702151308.l1FD8JmV001338@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-ru In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1333/hunspell-ru Log Message: Directory /cvs/extras/rpms/hunspell-ru added to the repository From fedora-extras-commits at redhat.com Thu Feb 15 13:08:27 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 08:08:27 -0500 Subject: rpms/hunspell-ru/devel - New directory Message-ID: <200702151308.l1FD8RZ9001352@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-ru/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1333/hunspell-ru/devel Log Message: Directory /cvs/extras/rpms/hunspell-ru/devel added to the repository From fedora-extras-commits at redhat.com Thu Feb 15 13:08:42 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 08:08:42 -0500 Subject: rpms/hunspell-ru Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702151308.l1FD8g1F001394@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-ru In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1384 Added Files: Makefile import.log pkg.acl Log Message: Setup of module hunspell-ru --- NEW FILE Makefile --- # Top level Makefile for module hunspell-ru all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Thu Feb 15 13:08:49 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 08:08:49 -0500 Subject: rpms/hunspell-ru/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702151308.l1FD8nkT001412@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-ru/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1384/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module hunspell-ru --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Feb 15 13:09:50 2007 From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing)) Date: Thu, 15 Feb 2007 08:09:50 -0500 Subject: rpms/audacious-plugins/devel audacious-plugins.spec,1.6,1.7 Message-ID: <200702151309.l1FD9ooa001448@cvs-int.fedora.redhat.com> Author: ertzing Update of /cvs/extras/rpms/audacious-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1431 Modified Files: audacious-plugins.spec Log Message: - Rebuild against new FLAC libraries Index: audacious-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/audacious-plugins/devel/audacious-plugins.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- audacious-plugins.spec 15 Jan 2007 08:08:33 -0000 1.6 +++ audacious-plugins.spec 15 Feb 2007 13:09:18 -0000 1.7 @@ -1,6 +1,6 @@ Name: audacious-plugins Version: 1.2.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Plugins for the Audacious media player Group: Applications/Multimedia @@ -197,6 +197,9 @@ %changelog +* Mon Feb 15 2007 Ralf Ertzinger 1.2.5-5.fc7 +- Rebuild against new FLAC libraries + * Mon Jan 15 2007 Ralf Ertzinger 1.2.5-4.fc7 - Fix typo in BuildRequires From fedora-extras-commits at redhat.com Thu Feb 15 13:15:28 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 08:15:28 -0500 Subject: rpms/hunspell-nn - New directory Message-ID: <200702151315.l1FDFSrK001578@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-nn In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1573/hunspell-nn Log Message: Directory /cvs/extras/rpms/hunspell-nn added to the repository From fedora-extras-commits at redhat.com Thu Feb 15 13:15:36 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 08:15:36 -0500 Subject: rpms/hunspell-nn/devel - New directory Message-ID: <200702151315.l1FDFaij001592@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-nn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1573/hunspell-nn/devel Log Message: Directory /cvs/extras/rpms/hunspell-nn/devel added to the repository From fedora-extras-commits at redhat.com Thu Feb 15 13:15:51 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 08:15:51 -0500 Subject: rpms/hunspell-nn Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702151315.l1FDFpj7001627@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-nn In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1617 Added Files: Makefile import.log pkg.acl Log Message: Setup of module hunspell-nn --- NEW FILE Makefile --- # Top level Makefile for module hunspell-nn all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Thu Feb 15 13:15:58 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 08:15:58 -0500 Subject: rpms/hunspell-nn/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702151315.l1FDFwUp001645@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-nn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1617/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module hunspell-nn --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Feb 15 13:06:31 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 08:06:31 -0500 Subject: rpms/hunspell-pt - New directory Message-ID: <200702151306.l1FD6VfY001196@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-pt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1191/hunspell-pt Log Message: Directory /cvs/extras/rpms/hunspell-pt added to the repository From fedora-extras-commits at redhat.com Thu Feb 15 13:32:51 2007 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 15 Feb 2007 08:32:51 -0500 Subject: rpms/akode/devel akode.spec,1.9,1.10 Message-ID: <200702151332.l1FDWpop001847@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/akode/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1824 Modified Files: akode.spec Log Message: * Thu Feb 15 2007 Rex Dieter 2.0.1-6 - respin (for flac, fc7+) Index: akode.spec =================================================================== RCS file: /cvs/extras/rpms/akode/devel/akode.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- akode.spec 12 Feb 2007 16:36:47 -0000 1.9 +++ akode.spec 15 Feb 2007 13:32:18 -0000 1.10 @@ -2,7 +2,7 @@ Summary: Audio-decoding framework Name: akode Version: 2.0.1 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPL Group: System Environment/Libraries #URL: http://carewolf.com/akode/ @@ -165,6 +165,9 @@ %changelog +* Thu Feb 15 2007 Rex Dieter 2.0.1-6 +- respin (for flac, fc7+) + * Mon Feb 12 2007 Rex Dieter 2.0.1-5 - enable pulseaudio support - Requires: akode-pulseaudio (fc7+) From fedora-extras-commits at redhat.com Thu Feb 15 13:46:31 2007 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 15 Feb 2007 08:46:31 -0500 Subject: rpms/autogen/devel .cvsignore, 1.4, 1.5 autogen.spec, 1.8, 1.9 sources, 1.4, 1.5 Message-ID: <200702151346.l1FDkVnL002041@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/autogen/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2000/devel Modified Files: .cvsignore autogen.spec sources Log Message: auto-import autogen-5.8.9-1 on branch devel from autogen-5.8.9-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/autogen/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 23 Dec 2006 21:11:53 -0000 1.4 +++ .cvsignore 15 Feb 2007 13:45:58 -0000 1.5 @@ -1 +1 @@ -autogen-5.8.8.tar.bz2 +autogen-5.8.9.tar.gz Index: autogen.spec =================================================================== RCS file: /cvs/extras/rpms/autogen/devel/autogen.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- autogen.spec 23 Dec 2006 21:11:53 -0000 1.8 +++ autogen.spec 15 Feb 2007 13:45:58 -0000 1.9 @@ -1,10 +1,10 @@ Summary: Sourcecode autogenerator Name: autogen -Version: 5.8.8 +Version: 5.8.9 Release: 1%{?dist} License: GPL Group: Development/Tools -Source: http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2 +Source: http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz URL: http://autogen.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: guile-devel libxml2-devel libtool @@ -30,6 +30,13 @@ %description devel Development files for autogen. +%package manuals +Summary: man files for autogen (not devel) +Group: Documentation + +%description manuals +man files for autogen (not for the devel package) + %prep %setup -q -n %{name}-%{version} chmod 0644 COPYING @@ -99,15 +106,17 @@ %{_bindir}/autogen %{_bindir}/columns.autogen %{_bindir}/getdefs.autogen -%{_mandir}/man1/autogen* -%{_mandir}/man1/columns* -%{_mandir}/man1/getdefs* -%{_mandir}/man1/xml2ag* -%{_datadir}/autogen/ %{_infodir}/autogen.info* %{_bindir}/xml2ag %{_libdir}/libguileopts.so.0* %{_libdir}/libopts.so.* +%{_datadir}/autogen/ + +%files manuals +%{_mandir}/man1/autogen* +%{_mandir}/man1/columns* +%{_mandir}/man1/getdefs* +%{_mandir}/man1/xml2ag* %files devel %defattr(-,root,root) @@ -123,6 +132,10 @@ %{_includedir}/autoopts %changelog +* Thu Feb 15 2007 Paul F. Johnson 5.8.9-1 +- bump +- split man files into subpackage (conflicts on fc7) + * Sat Dec 23 2006 Paul F. Johnson 5.8.8-1 - bump Index: sources =================================================================== RCS file: /cvs/extras/rpms/autogen/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 23 Dec 2006 21:11:53 -0000 1.4 +++ sources 15 Feb 2007 13:45:58 -0000 1.5 @@ -1 +1 @@ -fe078c23b26753347a31c0bee6e5c82c autogen-5.8.8.tar.bz2 +de8081b9944dcc43a73d3527da04f873 autogen-5.8.9.tar.gz From fedora-extras-commits at redhat.com Thu Feb 15 13:46:28 2007 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 15 Feb 2007 08:46:28 -0500 Subject: rpms/autogen import.log,1.11,1.12 Message-ID: <200702151346.l1FDkSH7002036@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/autogen In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2000 Modified Files: import.log Log Message: auto-import autogen-5.8.9-1 on branch devel from autogen-5.8.9-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/autogen/import.log,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- import.log 27 Dec 2006 21:35:54 -0000 1.11 +++ import.log 15 Feb 2007 13:45:56 -0000 1.12 @@ -8,3 +8,4 @@ autogen-5_8_7-4:HEAD:autogen-5.8.7-4.src.rpm:1166052821 autogen-5_8_8-1:HEAD:autogen-5.8.8-1.src.rpm:1166908817 autogen-5_8_8-1:FC-6:autogen-5.8.8-1.src.rpm:1167255926 +autogen-5_8_9-1:HEAD:autogen-5.8.9-1.src.rpm:1171547107 From fedora-extras-commits at redhat.com Thu Feb 15 13:51:04 2007 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 15 Feb 2007 08:51:04 -0500 Subject: rpms/xsp import.log,1.21,1.22 Message-ID: <200702151351.l1FDp4bb002151@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/xsp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2109 Modified Files: import.log Log Message: auto-import xsp-1.2.3-1 on branch devel from xsp-1.2.3-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/xsp/import.log,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- import.log 25 Nov 2006 17:09:19 -0000 1.21 +++ import.log 15 Feb 2007 13:50:32 -0000 1.22 @@ -18,3 +18,4 @@ xsp-1_1_18-1:FC-5:xsp-1.1.18-1.src.rpm:1160861838 xsp-1_1_18-1:HEAD:xsp-1.1.18-1.src.rpm:1160862214 xsp-1_2_1-1:HEAD:xsp-1.2.1-1.src.rpm:1164474621 +xsp-1_2_3-1:HEAD:xsp-1.2.3-1.src.rpm:1171547370 From fedora-extras-commits at redhat.com Thu Feb 15 13:51:07 2007 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 15 Feb 2007 08:51:07 -0500 Subject: rpms/xsp/devel .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 xsp.spec, 1.13, 1.14 Message-ID: <200702151351.l1FDp7nm002156@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/xsp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2109/devel Modified Files: .cvsignore sources xsp.spec Log Message: auto-import xsp-1.2.3-1 on branch devel from xsp-1.2.3-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xsp/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 25 Nov 2006 17:09:19 -0000 1.8 +++ .cvsignore 15 Feb 2007 13:50:35 -0000 1.9 @@ -1 +1 @@ -xsp-1.2.1.tar.gz +xsp-1.2.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xsp/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 25 Nov 2006 17:09:19 -0000 1.8 +++ sources 15 Feb 2007 13:50:35 -0000 1.9 @@ -1 +1 @@ -37333caaf4c4570ec76cf0ef9218b402 xsp-1.2.1.tar.gz +bdd6bd7d2dab9e117fc1fd4c03aac45b xsp-1.2.3.tar.gz Index: xsp.spec =================================================================== RCS file: /cvs/extras/rpms/xsp/devel/xsp.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- xsp.spec 25 Nov 2006 17:09:19 -0000 1.13 +++ xsp.spec 15 Feb 2007 13:50:35 -0000 1.14 @@ -1,5 +1,5 @@ Name: xsp -Version: 1.2.1 +Version: 1.2.3 Release: 1%{?dist} License: BSD BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -69,6 +69,9 @@ %{_libdir}/pkgconfig/xsp* %changelog +* Thu Feb 15 2007 Paul F. Johnson 1.2.3-1 +- bump + * Sat Nov 23 2006 Paul F. Johnson 1.2.1-1 - bump From fedora-extras-commits at redhat.com Thu Feb 15 13:58:37 2007 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 15 Feb 2007 08:58:37 -0500 Subject: rpms/monodoc/devel .cvsignore, 1.6, 1.7 monodoc.spec, 1.19, 1.20 sources, 1.6, 1.7 Message-ID: <200702151358.l1FDwbho002320@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/monodoc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2268/devel Modified Files: .cvsignore monodoc.spec sources Log Message: auto-import monodoc-1.2.3-1 on branch devel from monodoc-1.2.3-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/monodoc/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 25 Nov 2006 17:21:46 -0000 1.6 +++ .cvsignore 15 Feb 2007 13:58:05 -0000 1.7 @@ -1 +1 @@ -monodoc-1.2.1.zip +monodoc-1.2.3.zip Index: monodoc.spec =================================================================== RCS file: /cvs/extras/rpms/monodoc/devel/monodoc.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- monodoc.spec 25 Nov 2006 17:21:46 -0000 1.19 +++ monodoc.spec 15 Feb 2007 13:58:05 -0000 1.20 @@ -8,7 +8,7 @@ Summary: The mono documentation system Name: monodoc -Version: 1.2.1 +Version: 1.2.3 Release: 1%{?dist} License: GPL Group: Documentation @@ -69,6 +69,9 @@ %{monodir}/pkgconfig/monodoc.pc %changelog +* Thu Feb 15 2007 Paul F. Johnson 1.2.3-1 +- bump + * Sat Nov 25 2006 Paul F. Johnson 1.2.1-1 - bump - added new manuals Index: sources =================================================================== RCS file: /cvs/extras/rpms/monodoc/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 25 Nov 2006 17:21:46 -0000 1.6 +++ sources 15 Feb 2007 13:58:05 -0000 1.7 @@ -1 +1 @@ -19437a8652ee009364abb04b767b65ba monodoc-1.2.1.zip +6387e57b69a2052150398fce7c29eaea monodoc-1.2.3.zip From fedora-extras-commits at redhat.com Thu Feb 15 13:58:35 2007 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 15 Feb 2007 08:58:35 -0500 Subject: rpms/monodoc import.log,1.26,1.27 Message-ID: <200702151358.l1FDwZFh002315@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/monodoc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2268 Modified Files: import.log Log Message: auto-import monodoc-1.2.3-1 on branch devel from monodoc-1.2.3-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/monodoc/import.log,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- import.log 25 Nov 2006 17:21:45 -0000 1.26 +++ import.log 15 Feb 2007 13:58:02 -0000 1.27 @@ -23,3 +23,4 @@ monodoc-1_1_18-1:FC-5:monodoc-1.1.18-1.src.rpm:1160861442 monodoc-1_1_18-1:HEAD:monodoc-1.1.18-1.src.rpm:1160861543 monodoc-1_2_1-1:HEAD:monodoc-1.2.1-1.src.rpm:1164475369 +monodoc-1_2_3-1:HEAD:monodoc-1.2.3-1.src.rpm:1171547863 From fedora-extras-commits at redhat.com Thu Feb 15 14:03:54 2007 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 15 Feb 2007 09:03:54 -0500 Subject: rpms/PyKDE/devel PyKDE-3.16.0-python25.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 PyKDE.spec, 1.9, 1.10 Message-ID: <200702151403.l1FE3sJD005931@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/PyKDE/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5864 Modified Files: .cvsignore PyKDE.spec Added Files: PyKDE-3.16.0-python25.patch Log Message: * Thu Feb 15 2007 Rex Dieter 3.16.0-6 - BR: sip-devel >= 4.5.2 - patch for python-2.5 PyKDE-3.16.0-python25.patch: --- NEW FILE PyKDE-3.16.0-python25.patch --- Nur in PyKDE-3.16.0.py25: dcop. diff -ru PyKDE-3.16.0/sip/kdecore/bytearray.sip PyKDE-3.16.0.py25/sip/kdecore/bytearray.sip --- PyKDE-3.16.0/sip/kdecore/bytearray.sip 2006-09-22 07:53:14.000000000 +0200 +++ PyKDE-3.16.0.py25/sip/kdecore/bytearray.sip 2006-12-23 15:42:13.000000000 +0100 @@ -633,7 +633,7 @@ QMap *cppmap = new QMap; PyObject *aelem, *belem; - int pos = 0; + SIP_SSIZE_T pos = 0; QCString *acpp; DCOPRef *bcpp; @@ -717,7 +717,7 @@ QMap *cppmap = new QMap; PyObject *aelem, *belem; - int pos = 0; + SIP_SSIZE_T pos = 0; QString *acpp; DCOPRef *bcpp; diff -ru PyKDE-3.16.0/sip/kdecore/kaccel.sip PyKDE-3.16.0.py25/sip/kdecore/kaccel.sip --- PyKDE-3.16.0/sip/kdecore/kaccel.sip 2006-09-22 05:11:16.000000000 +0200 +++ PyKDE-3.16.0.py25/sip/kdecore/kaccel.sip 2006-12-23 15:42:22.000000000 +0100 @@ -209,7 +209,7 @@ QMap *map = new QMap; PyObject *key, *value; - int pos = 0; + SIP_SSIZE_T pos = 0; int iKey; QString *sData; diff -ru PyKDE-3.16.0/sip/kdecore/kcompletion.sip PyKDE-3.16.0.py25/sip/kdecore/kcompletion.sip --- PyKDE-3.16.0/sip/kdecore/kcompletion.sip 2006-09-22 05:11:16.000000000 +0200 +++ PyKDE-3.16.0.py25/sip/kdecore/kcompletion.sip 2006-12-23 15:42:31.000000000 +0100 @@ -201,7 +201,7 @@ QMap *kbmap = new QMap; PyObject *key, *value; - int pos = 0; + SIP_SSIZE_T pos = 0; KShortcut *cValue; int iserr; diff -ru PyKDE-3.16.0/sip/kdecore/kconfigdata.sip PyKDE-3.16.0.py25/sip/kdecore/kconfigdata.sip --- PyKDE-3.16.0/sip/kdecore/kconfigdata.sip 2006-09-22 05:11:16.000000000 +0200 +++ PyKDE-3.16.0.py25/sip/kdecore/kconfigdata.sip 2006-12-23 15:42:39.000000000 +0100 @@ -146,7 +146,7 @@ KEntryMap *cppmap = new KEntryMap; PyObject *aelem, *belem; - int pos = 0; + SIP_SSIZE_T pos = 0; KEntryKey *acpp; KEntry *bcpp; diff -ru PyKDE-3.16.0/sip/kdecore/kconfig.sip PyKDE-3.16.0.py25/sip/kdecore/kconfig.sip --- PyKDE-3.16.0/sip/kdecore/kconfig.sip 2006-09-22 05:11:16.000000000 +0200 +++ PyKDE-3.16.0.py25/sip/kdecore/kconfig.sip 2006-12-23 15:42:45.000000000 +0100 @@ -158,7 +158,7 @@ QMap *cppmap = new QMap; PyObject *aelem, *belem; - int pos = 0; + SIP_SSIZE_T pos = 0; QString *acpp; QString *bcpp; diff -ru PyKDE-3.16.0/sip/kdecore/kmacroexpander.sip PyKDE-3.16.0.py25/sip/kdecore/kmacroexpander.sip --- PyKDE-3.16.0/sip/kdecore/kmacroexpander.sip 2006-09-22 05:11:16.000000000 +0200 +++ PyKDE-3.16.0.py25/sip/kdecore/kmacroexpander.sip 2006-12-23 15:42:57.000000000 +0100 @@ -169,7 +169,7 @@ QMap *map = new QMap; PyObject *key, *value; - int pos = 0; + SIP_SSIZE_T pos = 0; QChar *cKey; QString *sData; @@ -251,7 +251,7 @@ QMap *map = new QMap; PyObject *key, *value; - int pos = 0; + SIP_SSIZE_T pos = 0; QString *sKey; QStringList *slData; @@ -334,7 +334,7 @@ QMap *map = new QMap; PyObject *key, *value; - int pos = 0; + SIP_SSIZE_T pos = 0; QChar *cKey; QStringList *slData; diff -ru PyKDE-3.16.0/sip/kdecore/ktimezones.sip PyKDE-3.16.0.py25/sip/kdecore/ktimezones.sip --- PyKDE-3.16.0/sip/kdecore/ktimezones.sip 2006-09-22 05:11:16.000000000 +0200 +++ PyKDE-3.16.0.py25/sip/kdecore/ktimezones.sip 2006-12-23 15:43:04.000000000 +0100 @@ -240,7 +240,7 @@ QMap *cppmap = new QMap; PyObject *aelem, *belem; - int pos = 0; + SIP_SSIZE_T pos = 0; QString *acpp; KTimezone *bcpp; diff -ru PyKDE-3.16.0/sip/kdecore/kurl.sip PyKDE-3.16.0.py25/sip/kdecore/kurl.sip --- PyKDE-3.16.0/sip/kdecore/kurl.sip 2006-09-22 05:11:16.000000000 +0200 +++ PyKDE-3.16.0.py25/sip/kdecore/kurl.sip 2006-12-23 15:43:18.000000000 +0100 @@ -248,7 +248,7 @@ %MethodCode //takes range | (a Python slice) | urlList | (KURL.List) - int len, start, stop, step, slicelength; + SIP_SSIZE_T len, start, stop, step, slicelength; len = sipCpp -> count(); @@ -291,7 +291,7 @@ void __delitem__ (SIP_PYSLICE); %MethodCode //takes range | (a Python slice) - int len, start, stop, step, slicelength; + SIP_SSIZE_T len, start, stop, step, slicelength; len = sipCpp -> count(); if (sipConvertFromSliceObject(a0,len,&start,&stop,&step,&slicelength) < 0) @@ -322,7 +322,7 @@ %MethodCode //returns (KURL.List) //takes range | (a Python slice) - int len, start, stop, step, slicelength; + SIP_SSIZE_T len, start, stop, step, slicelength; len = sipCpp -> count(); diff -ru PyKDE-3.16.0/sip/kdeui/kkeydialog.sip PyKDE-3.16.0.py25/sip/kdeui/kkeydialog.sip --- PyKDE-3.16.0/sip/kdeui/kkeydialog.sip 2006-09-22 05:11:15.000000000 +0200 +++ PyKDE-3.16.0.py25/sip/kdeui/kkeydialog.sip 2006-12-23 15:43:23.000000000 +0100 @@ -231,7 +231,7 @@ QDict* qdict = new QDict; PyObject *key, *value; - int pos = 0; + SIP_SSIZE_T pos = 0; QString *a0; int a1; diff -ru PyKDE-3.16.0/sip/kio/authinfo.sip PyKDE-3.16.0.py25/sip/kio/authinfo.sip --- PyKDE-3.16.0/sip/kio/authinfo.sip 2006-09-22 05:11:14.000000000 +0200 +++ PyKDE-3.16.0.py25/sip/kio/authinfo.sip 2006-12-23 15:43:28.000000000 +0100 @@ -176,7 +176,7 @@ QMap *map = new QMap; PyObject *key, *value; - int pos = 0; + SIP_SSIZE_T pos = 0; QString *sKey; QStringList *sData; diff -ru PyKDE-3.16.0/sip/kio/global.sip PyKDE-3.16.0.py25/sip/kio/global.sip --- PyKDE-3.16.0/sip/kio/global.sip 2006-09-22 05:11:14.000000000 +0200 +++ PyKDE-3.16.0.py25/sip/kio/global.sip 2006-12-23 15:43:33.000000000 +0100 @@ -702,7 +702,7 @@ QMap *cppmap = new QMap; PyObject *aelem, *belem; - int pos = 0; + SIP_SSIZE_T pos = 0; QString *acpp; QString *bcpp; diff -ru PyKDE-3.16.0/sip/kio/kservicetype.sip PyKDE-3.16.0.py25/sip/kio/kservicetype.sip --- PyKDE-3.16.0/sip/kio/kservicetype.sip 2006-09-22 05:11:14.000000000 +0200 +++ PyKDE-3.16.0.py25/sip/kio/kservicetype.sip 2006-12-23 15:43:44.000000000 +0100 @@ -183,7 +183,7 @@ QMap *cppmap = new QMap; PyObject *aelem, *belem; - int pos = 0; + SIP_SSIZE_T pos = 0; QString *acpp; QVariant::Type bcpp; diff -ru PyKDE-3.16.0/sip/kmdi/kmdichildfrm.sip PyKDE-3.16.0.py25/sip/kmdi/kmdichildfrm.sip --- PyKDE-3.16.0/sip/kmdi/kmdichildfrm.sip 2006-09-22 05:11:14.000000000 +0200 +++ PyKDE-3.16.0.py25/sip/kmdi/kmdichildfrm.sip 2006-12-23 15:39:49.000000000 +0100 @@ -245,7 +245,7 @@ QDict* qdict = new QDict; PyObject *key, *value; - int pos = 0; + SIP_SSIZE_T pos = 0; QString *a0; QWidget::FocusPolicy a1; diff -ru PyKDE-3.16.0/sip/kparts/browserextension.sip PyKDE-3.16.0.py25/sip/kparts/browserextension.sip --- PyKDE-3.16.0/sip/kparts/browserextension.sip 2006-09-22 05:11:15.000000000 +0200 +++ PyKDE-3.16.0.py25/sip/kparts/browserextension.sip 2006-12-23 15:33:51.000000000 +0100 @@ -419,7 +419,7 @@ QMap *cppmap = new QMap; PyObject *aelem, *belem; - int pos = 0; + SIP_SSIZE_T pos = 0; QCString *acpp; QCString *bcpp; @@ -503,7 +503,7 @@ QMap *cppmap = new QMap; PyObject *aelem, *belem; - int pos = 0; + SIP_SSIZE_T pos = 0; QCString *acpp; int bcpp; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/PyKDE/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 26 Sep 2006 20:19:02 -0000 1.3 +++ .cvsignore 15 Feb 2007 14:03:21 -0000 1.4 @@ -1,2 +1,2 @@ -PyKDE-snapshot20060422.tar.gz +clog PyKDE-3.16.0.tar.gz Index: PyKDE.spec =================================================================== RCS file: /cvs/extras/rpms/PyKDE/devel/PyKDE.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- PyKDE.spec 9 Dec 2006 17:26:38 -0000 1.9 +++ PyKDE.spec 15 Feb 2007 14:03:21 -0000 1.10 @@ -5,7 +5,7 @@ Summary: Python bindings for KDE Name: PyKDE Version: 3.16.0 -Release: 5%{?dist}.1 +Release: 6%{?dist} License: GPL URL: http://www.riverbankcomputing.co.uk/pykde/ @@ -16,20 +16,29 @@ Patch1: PyKDE-3.16.0-konsolepart.patch # http://mats.imk.fraunhofer.de/pipermail/pykde/2006-November/014627.html Patch2: PyKDE-3.16.0-kmimetype.patch +# http://mats.imk.fraunhofer.de/pipermail/pykde/2006-December/015025.html +Patch3: PyKDE-3.16.0-python25.patch BuildRequires: python-devel >= 2.3 %global python_ver %(%{__python} -c "import sys ; print sys.version[:3]") %global python_sitedir %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)") -%if "%{?python_ver}" > "2" +## python >=2.4 automatically uses python(abi) +%if "%{?python_ver}" > "1" && "%{?python_ver}" < "2.4" Requires: python-abi = %{python_ver} %endif +## Until sip-4.5.2+ is everywhere, we need to special-case python-2.5 +%if "%{?python_ver}" >= "2.5" +%define python25 1 +BuildRequires: sip-devel >= 4.5.2 +%else +BuildRequires: sip-devel +%endif -BuildRequires: sip-devel >= 4.4.3 -BuildRequires: PyQt-devel >= 3.16 +BuildRequires: PyQt-devel ## try to leave this unversioned, for now -- Rex Requires: PyQt #global pyqt_ver %(pyuic -version 2>&1 | cut -d' ' -f5) -#if "%{?pyqt_ver}" > "2" +#if 0%{?pyqt_ver} > 2 #Requires: PyQt = %{pyqt_ver} #endif @@ -60,6 +69,7 @@ %patch1 -p1 -b .konsolepart %patch2 -p1 -b .kmimetype +%{?python25:%patch3 -p1 -b .python25} %build @@ -96,6 +106,10 @@ %changelog +* Thu Feb 15 2007 Rex Dieter 3.16.0-6 +- BR: sip-devel >= 4.5.2 +- patch for python-2.5 + * Thu Nov 09 2006 Rex Dieter 3.16.0-5 - kmimetype patch - devel: Requires: sip-devel From fedora-extras-commits at redhat.com Thu Feb 15 14:04:08 2007 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 15 Feb 2007 09:04:08 -0500 Subject: rpms/mono-debugger import.log,1.6,1.7 Message-ID: <200702151404.l1FE48hC005972@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/mono-debugger In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5896 Modified Files: import.log Log Message: auto-import mono-debugger-0.31-1 on branch devel from mono-debugger-0.31-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/mono-debugger/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 6 Sep 2006 23:03:46 -0000 1.6 +++ import.log 15 Feb 2007 14:03:36 -0000 1.7 @@ -3,3 +3,4 @@ mono-debugger-0_30-5:HEAD:mono-debugger-0.30-5.src.rpm:1157297730 mono-debugger-0_30-6:HEAD:mono-debugger-0.30-6.src.rpm:1157583705 mono-debugger-0_30-6:FC-5:mono-debugger-0.30-6.src.rpm:1157583847 +mono-debugger-0_31-1:HEAD:mono-debugger-0.31-1.src.rpm:1171548205 From fedora-extras-commits at redhat.com Thu Feb 15 14:04:11 2007 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 15 Feb 2007 09:04:11 -0500 Subject: rpms/mono-debugger/devel .cvsignore, 1.2, 1.3 mono-debugger.spec, 1.6, 1.7 sources, 1.2, 1.3 Message-ID: <200702151404.l1FE4Bio005977@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/mono-debugger/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5896/devel Modified Files: .cvsignore mono-debugger.spec sources Log Message: auto-import mono-debugger-0.31-1 on branch devel from mono-debugger-0.31-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mono-debugger/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 2 Sep 2006 09:30:31 -0000 1.2 +++ .cvsignore 15 Feb 2007 14:03:38 -0000 1.3 @@ -1 +1 @@ -mono-debugger-0.30.tar.gz +mono-debugger-0.31.tar.gz Index: mono-debugger.spec =================================================================== RCS file: /cvs/extras/rpms/mono-debugger/devel/mono-debugger.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mono-debugger.spec 7 Sep 2006 21:10:10 -0000 1.6 +++ mono-debugger.spec 15 Feb 2007 14:03:38 -0000 1.7 @@ -1,15 +1,15 @@ Summary: A debugger for Mono Name: mono-debugger -Version: 0.30 -Release: 7%{?dist} +Version: 0.31 +Release: 1%{?dist} License: MIT BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://www.go-mono.com/sources/mono-debugger Source0: http://www.go-mono.com/sources/%{name}/%{name}-%{version}.tar.gz Patch0: monodebug-configure.patch -BuildRequires: readline-devel, termcap, ncurses-devel libtool -BuildRequires: mono-devel -BuildRequires: mono-nunit-devel autoconf automake mono-nunit +BuildRequires: readline-devel ncurses-devel libtool +BuildRequires: mono-devel mono-nunit +BuildRequires: mono-nunit-devel autoconf automake Requires: mono-core >= 1.1.16 Group: Development/Tools ExcludeArch: ppc @@ -61,6 +61,7 @@ %{_libdir}/mono/mono-debugger/ %{_libdir}/mono/gac/Mono.Debugger/ %{_libdir}/mono/gac/Mono.Debugger.Cecil/ +%{_libdir}/mono/gac/Mono.Debugger.Backend/ %files devel %defattr(-,root,root) @@ -69,8 +70,13 @@ %{_libdir}/libmono*.so %changelog +* Thu Feb 15 2007 Paul F. Johnson 0.31-1 +- removed BR termcap +- bump to 0.31 + * Thu Sep 07 2006 Paul F. Johnson 0.30-7 -- removed all the FC-5 stuff and added R mono-core min version +- Removed FC-5 bits +- Added R mono-core to ensure correct version of mono is used * Wed Sep 06 2006 Paul F. Johnson 0.30-6 - Fixes for FC-5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/mono-debugger/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 2 Sep 2006 09:30:31 -0000 1.2 +++ sources 15 Feb 2007 14:03:38 -0000 1.3 @@ -1 +1 @@ -b0352d2537eba7ce2c63d6d7ce795d87 mono-debugger-0.30.tar.gz +6ad73b85380b85d2be7feffcefe26a5f mono-debugger-0.31.tar.gz From fedora-extras-commits at redhat.com Thu Feb 15 14:14:16 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 15 Feb 2007 09:14:16 -0500 Subject: rpms/hunspell-nn import.log,1.1,1.2 Message-ID: <200702151414.l1FEEGeJ006410@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-nn In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6296 Modified Files: import.log Log Message: auto-import hunspell-nn-0.20060508-1 on branch devel from hunspell-nn-0.20060508-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/hunspell-nn/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 Feb 2007 13:15:48 -0000 1.1 +++ import.log 15 Feb 2007 14:13:44 -0000 1.2 @@ -0,0 +1 @@ +hunspell-nn-0_20060508-1:HEAD:hunspell-nn-0.20060508-1.src.rpm:1171548912 From fedora-extras-commits at redhat.com Thu Feb 15 14:14:19 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 15 Feb 2007 09:14:19 -0500 Subject: rpms/hunspell-nn/devel hunspell-nn.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702151414.l1FEEJXC006414@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-nn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6296/devel Modified Files: .cvsignore sources Added Files: hunspell-nn.spec Log Message: auto-import hunspell-nn-0.20060508-1 on branch devel from hunspell-nn-0.20060508-1.src.rpm --- NEW FILE hunspell-nn.spec --- Name: hunspell-nn Summary: Nynorsk hunspell dictionaries %define upstreamid 20060508 Version: 0.%{upstreamid} Release: 1%{?dist} Source: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/nn_NO.zip Group: Applications/Text URL: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: GPL BuildArch: noarch Requires: hunspell %description Nynorsk hunspell dictionaries. %prep %setup -q -c -n hunspell-nn %build chmod -x * %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README_nn_NO.txt %{_datadir}/myspell/* %changelog * Wed Feb 14 2007 Caolan McNamara - 0.20050112-1 - update * Thu Dec 07 2006 Caolan McNamara - 0.20050112-1 - initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hunspell-nn/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Feb 2007 13:15:56 -0000 1.1 +++ .cvsignore 15 Feb 2007 14:13:47 -0000 1.2 @@ -0,0 +1 @@ +nn_NO.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/hunspell-nn/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Feb 2007 13:15:56 -0000 1.1 +++ sources 15 Feb 2007 14:13:47 -0000 1.2 @@ -0,0 +1 @@ +feabbed3baf3a6e40932635aeb3c71c2 nn_NO.zip From fedora-extras-commits at redhat.com Thu Feb 15 14:16:58 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 15 Feb 2007 09:16:58 -0500 Subject: rpms/hunspell-nn/devel Makefile,1.1,1.2 Message-ID: <200702151416.l1FEGwo2006574@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-nn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6547 Modified Files: Makefile Log Message: import buggered up again Index: Makefile =================================================================== RCS file: /cvs/extras/rpms/hunspell-nn/devel/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile 15 Feb 2007 13:15:56 -0000 1.1 +++ Makefile 15 Feb 2007 14:16:26 -0000 1.2 @@ -1,7 +1,7 @@ # Makefile for source rpm: hunspell-nn # $Id$ NAME := hunspell-nn -SPECFILE = hunspell-pl +SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done From fedora-extras-commits at redhat.com Thu Feb 15 14:19:11 2007 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 15 Feb 2007 09:19:11 -0500 Subject: rpms/kdemultimedia-extras/devel kdemultimedia-extras.spec, 1.15, 1.16 Message-ID: <200702151419.l1FEJBpb006723@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdemultimedia-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6675 Modified Files: kdemultimedia-extras.spec Log Message: * Thu Feb 15 2007 Rex Dieter 6:3.5.6-4 - don't omit .la files yet, fedora's kdelibs hasn't been patched (yet) Index: kdemultimedia-extras.spec =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/devel/kdemultimedia-extras.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- kdemultimedia-extras.spec 12 Feb 2007 20:32:59 -0000 1.15 +++ kdemultimedia-extras.spec 15 Feb 2007 14:18:38 -0000 1.16 @@ -64,7 +64,7 @@ Epoch: 6 #endif Version: 3.5.6 -Release: 3%{?dist}%{?kde} +Release: 4%{?dist}%{?kde} License: GPL %if "%{?patched:1}" == "1" @@ -311,8 +311,10 @@ -e "s@%{_libdir}/libltdl.la@@g" # Die, die, die, requires patched kdelibs -- Rex +%if "%{?kde:1}" == "1" rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/libkdeinit_*.la +%endif # Handle .la, .so files (v0.7) [ ! -f %{name}.list ] && echo "%defattr(-,root,root,-)" > %{name}.list @@ -500,6 +502,9 @@ %changelog +* Thu Feb 15 2007 Rex Dieter 6:3.5.6-4 +- don't omit .la files yet, fedora's kdelibs hasn't been patched (yet) + * Mon Feb 12 2007 Rex Dieter 6:3.5.6-3 - -extras: move kfile_mp3 here (no decoding, only metadata via taglib) - -extras: Conflicts: kdemultimedia-extras-nonfree < 3.5.6-3 From fedora-extras-commits at redhat.com Thu Feb 15 14:19:42 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 15 Feb 2007 09:19:42 -0500 Subject: rpms/hunspell-ru import.log,1.1,1.2 Message-ID: <200702151419.l1FEJgjj006794@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-ru In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6715 Modified Files: import.log Log Message: auto-import hunspell-ru-0.20040406-1 on branch devel from hunspell-ru-0.20040406-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/hunspell-ru/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 Feb 2007 13:08:39 -0000 1.1 +++ import.log 15 Feb 2007 14:19:09 -0000 1.2 @@ -0,0 +1 @@ +hunspell-ru-0_20040406-1:HEAD:hunspell-ru-0.20040406-1.src.rpm:1171549237 From fedora-extras-commits at redhat.com Thu Feb 15 14:19:44 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 15 Feb 2007 09:19:44 -0500 Subject: rpms/hunspell-ru/devel hunspell-ru.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702151419.l1FEJifj006798@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-ru/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6715/devel Modified Files: .cvsignore sources Added Files: hunspell-ru.spec Log Message: auto-import hunspell-ru-0.20040406-1 on branch devel from hunspell-ru-0.20040406-1.src.rpm --- NEW FILE hunspell-ru.spec --- Name: hunspell-ru Summary: Russian hunspell dictionaries %define upstreamid 20040406 Version: 0.%{upstreamid} Release: 1%{?dist} Source: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/ru_RU.zip Group: Applications/Text URL: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: BSD BuildArch: noarch Requires: hunspell %description Russian hunspell dictionaries. %prep %setup -q -c -n hunspell-ru %build chmod -x * %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README_ru_RU.txt %{_datadir}/myspell/* %changelog * Thu Dec 07 2006 Caolan McNamara - 0.20040406-1 - initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hunspell-ru/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Feb 2007 13:08:47 -0000 1.1 +++ .cvsignore 15 Feb 2007 14:19:12 -0000 1.2 @@ -0,0 +1 @@ +ru_RU.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/hunspell-ru/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Feb 2007 13:08:47 -0000 1.1 +++ sources 15 Feb 2007 14:19:12 -0000 1.2 @@ -0,0 +1 @@ +67da1e4d594de554a9184568235ab301 ru_RU.zip From fedora-extras-commits at redhat.com Thu Feb 15 14:26:15 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 15 Feb 2007 09:26:15 -0500 Subject: rpms/hunspell-pt import.log,1.1,1.2 Message-ID: <200702151426.l1FEQFkw007020@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-pt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6982 Modified Files: import.log Log Message: auto-import hunspell-pt-0.20061026-2 on branch devel from hunspell-pt-0.20061026-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/hunspell-pt/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 Feb 2007 13:06:51 -0000 1.1 +++ import.log 15 Feb 2007 14:25:43 -0000 1.2 @@ -0,0 +1 @@ +hunspell-pt-0_20061026-2:HEAD:hunspell-pt-0.20061026-2.src.rpm:1171549631 From fedora-extras-commits at redhat.com Thu Feb 15 14:26:18 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 15 Feb 2007 09:26:18 -0500 Subject: rpms/hunspell-pt/devel hunspell-pt.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702151426.l1FEQI1C007024@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-pt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6982/devel Modified Files: .cvsignore sources Added Files: hunspell-pt.spec Log Message: auto-import hunspell-pt-0.20061026-2 on branch devel from hunspell-pt-0.20061026-2.src.rpm --- NEW FILE hunspell-pt.spec --- Name: hunspell-pt Summary: Portuguese hunspell dictionaries %define upstreamid 20061026 Version: 0.%{upstreamid} Release: 2%{?dist} Source0: http://www.deso-se.com.br/downloads/pt_PT-2700C.zip Source1: http://www.deso-se.com.br/downloads/pt_BR-2700g.zip Group: Applications/Text URL: http://www.broffice.org.br/?q=verortografico BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: LGPL BuildArch: noarch Requires: hunspell %description Portuguese hunspell dictionaries. %prep %setup -q -c -n hunspell-pt mv Leia-me.pdf Leia-me-pt_PT.pdf unzip -q -o %{SOURCE1} mv Leia-me.pdf Leia-me-pt_BR.pdf %build %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Leia-me-pt_BR.pdf %doc Leia-me-pt_PT.pdf %{_datadir}/myspell/* %changelog * Wed Feb 14 2007 Caolan McNamara - 0.20061026-2 - disambiguate readmes * Thu Dec 07 2006 Caolan McNamara - 0.20061026-1 - initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hunspell-pt/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Feb 2007 13:06:59 -0000 1.1 +++ .cvsignore 15 Feb 2007 14:25:45 -0000 1.2 @@ -0,0 +1,2 @@ +pt_BR-2700g.zip +pt_PT-2700C.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/hunspell-pt/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Feb 2007 13:06:59 -0000 1.1 +++ sources 15 Feb 2007 14:25:45 -0000 1.2 @@ -0,0 +1,2 @@ +1126056a65628c95abae967ef063680a pt_BR-2700g.zip +e72b072f863a9e0deb0b8d83aa447aa5 pt_PT-2700C.zip From fedora-extras-commits at redhat.com Thu Feb 15 14:28:23 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 15 Feb 2007 09:28:23 -0500 Subject: rpms/hunspell-pt/devel Makefile,1.1,1.2 Message-ID: <200702151428.l1FESN6q007093@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-pt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7067 Modified Files: Makefile Log Message: import buggered up again Index: Makefile =================================================================== RCS file: /cvs/extras/rpms/hunspell-pt/devel/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile 15 Feb 2007 13:06:59 -0000 1.1 +++ Makefile 15 Feb 2007 14:27:50 -0000 1.2 @@ -1,7 +1,7 @@ # Makefile for source rpm: hunspell-pt # $Id$ NAME := hunspell-pt -SPECFILE = hunspell-ru +SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done From fedora-extras-commits at redhat.com Thu Feb 15 14:32:43 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik)) Date: Thu, 15 Feb 2007 09:32:43 -0500 Subject: rpms/sonata import.log,1.1,1.2 Message-ID: <200702151432.l1FEWhe7007311@cvs-int.fedora.redhat.com> Author: ecik Update of /cvs/extras/rpms/sonata In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7259 Modified Files: import.log Log Message: auto-import sonata-1.0.1-2 on branch devel from sonata-1.0.1-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/sonata/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 Feb 2007 22:01:32 -0000 1.1 +++ import.log 15 Feb 2007 14:32:10 -0000 1.2 @@ -0,0 +1 @@ +sonata-1_0_1-2:HEAD:sonata-1.0.1-2.src.rpm:1171550025 From fedora-extras-commits at redhat.com Thu Feb 15 14:32:45 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik)) Date: Thu, 15 Feb 2007 09:32:45 -0500 Subject: rpms/sonata/devel sonata.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702151432.l1FEWj2s007317@cvs-int.fedora.redhat.com> Author: ecik Update of /cvs/extras/rpms/sonata/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7259/devel Modified Files: .cvsignore sources Added Files: sonata.spec Log Message: auto-import sonata-1.0.1-2 on branch devel from sonata-1.0.1-2.src.rpm --- NEW FILE sonata.spec --- %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: sonata Version: 1.0.1 Release: 2%{?dist} Summary: An elegant GTK+ client for the Music Player Daemon (MPD) Group: Applications/Multimedia License: GPL URL: http://sonata.berlios.de/ Source0: http://download.berlios.de/sonata/sonata-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils BuildRequires: pygtk2-devel gtk2-devel BuildRequires: python-devel Requires: pygtk2 SOAPpy dbus-python gnome-python2-libegg %description Sonata is a lightweight GTK+ music client for the Music Player Daemon (MPD). It aims to be efficient (no toolbar, main menu, or statusbar), user-friendly, and clean. Features: - Expanded and collapsed views - Automatic remote or local album art - Automatic fetching of lyrics - Playlist and stream support - Support for editing tags - System tray icon with tooltip - Optional popup notification - Library searching by artist, song, etc. - Keyboard friendly - Support for multimedia keys - Commandline control %prep %setup -q %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %find_lang %{name} desktop-file-install --vendor="fedora" \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ --remove-category Application \ --delete-original \ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop rm -rf $RPM_BUILD_ROOT%{_datadir}/sonata %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc CHANGELOG COPYING README TODO TRANSLATORS %{python_sitearch}/* %{_bindir}/%{name} %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/%{name}* %changelog * Wed Feb 14 2007 Micha?? Bentkowski - 1.0.1-2 - Add dbus-python and gnome-python2-libegg dependencies * Wed Feb 14 2007 Micha?? Bentkowski - 1.0.1-1 - Update to 1.0.1 - Get rid of Application category in a more clear way * Fri Feb 02 2007 Micha?? Bentkowski - 1.0-1 - Initial release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sonata/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Feb 2007 22:01:40 -0000 1.1 +++ .cvsignore 15 Feb 2007 14:32:13 -0000 1.2 @@ -0,0 +1 @@ +sonata-1.0.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sonata/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Feb 2007 22:01:40 -0000 1.1 +++ sources 15 Feb 2007 14:32:13 -0000 1.2 @@ -0,0 +1 @@ +aa7dd98cf31d719328adf7afba4c0c83 sonata-1.0.1.tar.bz2 From fedora-extras-commits at redhat.com Thu Feb 15 14:34:14 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 15 Feb 2007 09:34:14 -0500 Subject: rpms/hunspell-sl import.log,1.1,1.2 Message-ID: <200702151434.l1FEYE8r007409@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-sl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7369 Modified Files: import.log Log Message: auto-import hunspell-sl-0.20070127-1 on branch devel from hunspell-sl-0.20070127-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/hunspell-sl/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 Feb 2007 13:05:01 -0000 1.1 +++ import.log 15 Feb 2007 14:33:42 -0000 1.2 @@ -0,0 +1 @@ +hunspell-sl-0_20070127-1:HEAD:hunspell-sl-0.20070127-1.src.rpm:1171550110 From fedora-extras-commits at redhat.com Thu Feb 15 14:34:17 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 15 Feb 2007 09:34:17 -0500 Subject: rpms/hunspell-sl/devel hunspell-sl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702151434.l1FEYHcj007413@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-sl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7369/devel Modified Files: .cvsignore sources Added Files: hunspell-sl.spec Log Message: auto-import hunspell-sl-0.20070127-1 on branch devel from hunspell-sl-0.20070127-1.src.rpm --- NEW FILE hunspell-sl.spec --- Name: hunspell-sl Summary: Slovenian hunspell dictionaries %define upstreamid 20070127 Version: 0.%{upstreamid} Release: 1%{?dist} Source: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/sl_SI.zip Group: Applications/Text URL: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: LGPL BuildArch: noarch Requires: hunspell %description Slovenian hunspell dictionaries. %prep %setup -q -c -n hunspell-sl %build chmod -x * %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README_sl_SI.txt %{_datadir}/myspell/* %changelog * Wed Feb 14 2007 Caolan McNamara - 0.20070127-1 - next version * Thu Dec 07 2006 Caolan McNamara - 0.20021008-1 - initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hunspell-sl/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Feb 2007 13:05:09 -0000 1.1 +++ .cvsignore 15 Feb 2007 14:33:44 -0000 1.2 @@ -0,0 +1 @@ +sl_SI.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/hunspell-sl/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Feb 2007 13:05:09 -0000 1.1 +++ sources 15 Feb 2007 14:33:44 -0000 1.2 @@ -0,0 +1 @@ +74d1bf52a3c013e2a5dae2bd20ccdc00 sl_SI.zip From fedora-extras-commits at redhat.com Thu Feb 15 14:37:32 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 15 Feb 2007 09:37:32 -0500 Subject: rpms/hunspell-sk/devel Makefile,1.1,1.2 Message-ID: <200702151437.l1FEbWKK007535@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-sk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7513 Modified Files: Makefile Log Message: import buggered up again Index: Makefile =================================================================== RCS file: /cvs/extras/rpms/hunspell-sk/devel/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile 15 Feb 2007 13:03:18 -0000 1.1 +++ Makefile 15 Feb 2007 14:37:00 -0000 1.2 @@ -1,7 +1,7 @@ # Makefile for source rpm: hunspell-sk # $Id$ NAME := hunspell-sk -SPECFILE = hunspell-sl +SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done From fedora-extras-commits at redhat.com Thu Feb 15 14:39:17 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 15 Feb 2007 09:39:17 -0500 Subject: rpms/hunspell-sk import.log,1.1,1.2 Message-ID: <200702151439.l1FEdHhX007622@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-sk In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7584 Modified Files: import.log Log Message: auto-import hunspell-sk-0.20050911-1 on branch devel from hunspell-sk-0.20050911-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/hunspell-sk/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 Feb 2007 13:03:11 -0000 1.1 +++ import.log 15 Feb 2007 14:38:45 -0000 1.2 @@ -0,0 +1 @@ +hunspell-sk-0_20050911-1:HEAD:hunspell-sk-0.20050911-1.src.rpm:1171550410 From fedora-extras-commits at redhat.com Thu Feb 15 14:39:20 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 15 Feb 2007 09:39:20 -0500 Subject: rpms/hunspell-sk/devel hunspell-sk.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702151439.l1FEdKpv007628@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-sk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7584/devel Modified Files: .cvsignore sources Added Files: hunspell-sk.spec Log Message: auto-import hunspell-sk-0.20050911-1 on branch devel from hunspell-sk-0.20050911-1.src.rpm --- NEW FILE hunspell-sk.spec --- Name: hunspell-sk Summary: Slovak hunspell dictionaries %define upstreamid 20050911 Version: 0.%{upstreamid} Release: 1%{?dist} Source: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/sk_SK.zip Group: Applications/Text URL: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: LGPL BuildArch: noarch Requires: hunspell %description Slovak hunspell dictionaries. %prep %setup -q -c -n hunspell-sk %build chmod -x * %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README_sk_SK.txt %{_datadir}/myspell/* %changelog * Wed Feb 14 2007 Caolan McNamara - 0.20050911-1 - upstream id * Thu Dec 07 2006 Caolan McNamara - 0.20050228-1 - initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hunspell-sk/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Feb 2007 13:03:18 -0000 1.1 +++ .cvsignore 15 Feb 2007 14:38:47 -0000 1.2 @@ -0,0 +1 @@ +sk_SK.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/hunspell-sk/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Feb 2007 13:03:18 -0000 1.1 +++ sources 15 Feb 2007 14:38:47 -0000 1.2 @@ -0,0 +1 @@ +27f42413c371ffea30401884cd9b54d6 sk_SK.zip From fedora-extras-commits at redhat.com Thu Feb 15 14:40:55 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 15 Feb 2007 09:40:55 -0500 Subject: rpms/hunspell-sv/devel Makefile,1.1,1.2 Message-ID: <200702151440.l1FEet4x007838@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-sv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7791 Modified Files: Makefile Log Message: import buggered up again Index: Makefile =================================================================== RCS file: /cvs/extras/rpms/hunspell-sv/devel/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile 15 Feb 2007 13:01:21 -0000 1.1 +++ Makefile 15 Feb 2007 14:40:23 -0000 1.2 @@ -1,7 +1,7 @@ # Makefile for source rpm: hunspell-sv # $Id$ NAME := hunspell-sv -SPECFILE = hunspell-th +SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done From fedora-extras-commits at redhat.com Thu Feb 15 14:42:40 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 15 Feb 2007 09:42:40 -0500 Subject: rpms/hunspell-sv import.log,1.1,1.2 Message-ID: <200702151442.l1FEgeba007934@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-sv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7893 Modified Files: import.log Log Message: auto-import hunspell-sv-1.3.8.6-1 on branch devel from hunspell-sv-1.3.8.6-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/hunspell-sv/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 Feb 2007 13:01:12 -0000 1.1 +++ import.log 15 Feb 2007 14:42:08 -0000 1.2 @@ -0,0 +1 @@ +hunspell-sv-1_3_8_6-1:HEAD:hunspell-sv-1.3.8.6-1.src.rpm:1171550616 From fedora-extras-commits at redhat.com Thu Feb 15 14:42:43 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 15 Feb 2007 09:42:43 -0500 Subject: rpms/hunspell-sv/devel hunspell-sv.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702151442.l1FEghhS007940@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-sv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7893/devel Modified Files: .cvsignore sources Added Files: hunspell-sv.spec Log Message: auto-import hunspell-sv-1.3.8.6-1 on branch devel from hunspell-sv-1.3.8.6-1.src.rpm --- NEW FILE hunspell-sv.spec --- Name: hunspell-sv Summary: Swedish hunspell dictionaries Version: 1.3.8.6 Release: 1%{?dist} Source: http://sv.speling.org/filer/myspell-sv-1.3.8-6.tar.gz Group: Applications/Text URL: http://sv.speling.org/filer/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: LGPL BuildArch: noarch Requires: hunspell %description Swedish hunspell dictionaries. %prep %setup -q -n myspell-sv-1.3.8-6 %build %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell pushd $RPM_BUILD_ROOT/%{_datadir}/myspell/ sv_SE_aliases="sv_FI" for lang in $sv_SE_aliases; do ln -s sv_SE.aff $lang.aff ln -s sv_SE.dic $lang.dic done popd %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Copyright COPYING NEWS contributors README %{_datadir}/myspell/* %changelog * Thu Dec 07 2006 Caolan McNamara - 1.3.8.6-1 - initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hunspell-sv/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Feb 2007 13:01:21 -0000 1.1 +++ .cvsignore 15 Feb 2007 14:42:11 -0000 1.2 @@ -0,0 +1 @@ +myspell-sv-1.3.8-6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/hunspell-sv/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Feb 2007 13:01:21 -0000 1.1 +++ sources 15 Feb 2007 14:42:11 -0000 1.2 @@ -0,0 +1 @@ +150fe3dfb9db9b866deabe48d75d42dd myspell-sv-1.3.8-6.tar.gz From fedora-extras-commits at redhat.com Thu Feb 15 14:45:51 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 15 Feb 2007 09:45:51 -0500 Subject: rpms/hunspell-zu import.log,1.1,1.2 Message-ID: <200702151445.l1FEjpFV008135@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-zu In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8096 Modified Files: import.log Log Message: auto-import hunspell-zu-0.20060120-1 on branch devel from hunspell-zu-0.20060120-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/hunspell-zu/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 Feb 2007 12:59:25 -0000 1.1 +++ import.log 15 Feb 2007 14:45:18 -0000 1.2 @@ -0,0 +1 @@ +hunspell-zu-0_20060120-1:HEAD:hunspell-zu-0.20060120-1.src.rpm:1171550807 From fedora-extras-commits at redhat.com Thu Feb 15 14:45:53 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 15 Feb 2007 09:45:53 -0500 Subject: rpms/hunspell-zu/devel hunspell-zu.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702151445.l1FEjrnZ008139@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-zu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8096/devel Modified Files: .cvsignore sources Added Files: hunspell-zu.spec Log Message: auto-import hunspell-zu-0.20060120-1 on branch devel from hunspell-zu-0.20060120-1.src.rpm --- NEW FILE hunspell-zu.spec --- Name: hunspell-zu Summary: Zulu hunspell dictionaries %define upstreamid 20060120 Version: 0.%{upstreamid} Release: 1%{?dist} Source: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/zu_ZA.zip Group: Applications/Text URL: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: LGPL BuildArch: noarch Requires: hunspell %description Zulu hunspell dictionaries. %prep %setup -q -c -n hunspell-zu %build chmod -x * %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README_zu_ZA.txt %{_datadir}/myspell/* %changelog * Thu Dec 07 2006 Caolan McNamara - 0.20060120-1 - initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hunspell-zu/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Feb 2007 12:59:33 -0000 1.1 +++ .cvsignore 15 Feb 2007 14:45:21 -0000 1.2 @@ -0,0 +1 @@ +zu_ZA.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/hunspell-zu/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Feb 2007 12:59:33 -0000 1.1 +++ sources 15 Feb 2007 14:45:21 -0000 1.2 @@ -0,0 +1 @@ +40a2ea21a81f3b08ffb46896abff66d0 zu_ZA.zip From fedora-extras-commits at redhat.com Thu Feb 15 14:57:37 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Thu, 15 Feb 2007 09:57:37 -0500 Subject: rpms/q/devel q.spec,1.7,1.8 Message-ID: <200702151457.l1FEvbJ0008362@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/q/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8339 Modified Files: q.spec Log Message: use ncurses instead of termcap Index: q.spec =================================================================== RCS file: /cvs/extras/rpms/q/devel/q.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- q.spec 7 Jan 2007 19:35:41 -0000 1.7 +++ q.spec 15 Feb 2007 14:57:05 -0000 1.8 @@ -1,6 +1,6 @@ Name: q Version: 7.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Equational programming language Group: Development/Languages @@ -21,7 +21,6 @@ BuildRequires: libxslt-devel BuildRequires: ncurses-devel BuildRequires: readline-devel -BuildRequires: libtermcap-devel BuildRequires: tcl-devel BuildRequires: tk-devel BuildRequires: unixODBC-devel @@ -84,7 +83,7 @@ %build -%configure --with-unicode --with-rl="-lreadline -ltermcap" +%configure --with-unicode --with-rl="-lreadline -lncurses" # %{?_smp_mflags} breaks the build make cd mod_q @@ -157,6 +156,9 @@ %changelog +* Thu Feb 15 2007 Gerard Milmeister - 7.6-2 +- use ncurses instead of termcap + * Sun Jan 7 2007 Gerard Milmeister - 7.6-1 - new version 7.6 From fedora-extras-commits at redhat.com Thu Feb 15 15:05:26 2007 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 15 Feb 2007 10:05:26 -0500 Subject: rpms/lyx/devel lyx-1.4.4-xdg_open.patch, NONE, 1.1 lyx-qt.desktop, 1.2, 1.3 lyx-xforms.desktop, 1.2, 1.3 lyx.desktop, 1.4, 1.5 lyx.spec, 1.48, 1.49 lyx-1.4.3-helpers.patch, 1.2, NONE Message-ID: <200702151505.l1FF5QDp011953@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11920 Modified Files: lyx-qt.desktop lyx-xforms.desktop lyx.desktop lyx.spec Added Files: lyx-1.4.4-xdg_open.patch Removed Files: lyx-1.4.3-helpers.patch Log Message: * Wed Feb 14 2007 Rex Dieter 1.4.4-1 - lyx-1.4.4 - .desktop's: -Category=Application - mark -xforms as deprecated lyx-1.4.4-xdg_open.patch: --- NEW FILE lyx-1.4.4-xdg_open.patch --- --- lyx-1.4.4/lib/configure.py.helpers 2007-02-13 17:20:29.000000000 -0600 +++ lyx-1.4.4/lib/configure.py 2007-02-14 09:53:28.000000000 -0600 @@ -251,7 +251,7 @@ checkViewer('a FEN viewer and editor', ['xboard -lpf $$i -mode EditPosition'], rc_entry = [r'\Format fen fen FEN "" "%%" "%%"']) # - path, iv = checkViewer('a raster image viewer', ['xv', 'kview', 'gimp']) + path, iv = checkViewer('a raster image viewer', ['xdg-open', 'xv', 'kview', 'gimp']) path, ie = checkViewer('a raster image editor', ['gimp']) addToRC(r'''\Format bmp bmp BMP "" "%s" "%s" \Format gif gif GIF "" "%s" "%s" @@ -283,23 +283,23 @@ # #checkProg('a Postscript interpreter', ['gs'], # rc_entry = [ r'\ps_command "%%"' ]) - checkViewer('a Postscript previewer', ['gv', 'ghostview -swap', 'kghostview'], + checkViewer('a Postscript previewer', ['xdg-open', 'gv', 'ghostview -swap', 'kghostview'], rc_entry = [r'''\Format eps eps EPS "" "%%" "" "vector" \Format ps ps Postscript t "%%" "" "vector"''']) # - checkViewer('a PDF previewer', ['acrobat', 'acroread', 'gv', 'ghostview', \ + checkViewer('a PDF previewer', ['xdg-open', 'acrobat', 'acroread', 'gv', 'ghostview', \ 'xpdf', 'kpdf', 'kghostview'], rc_entry = [r'''\Format pdf pdf "PDF (ps2pdf)" P "%%" "" "vector" \Format pdf2 pdf "PDF (pdflatex)" F "%%" "" "vector" \Format pdf3 pdf "PDF (dvipdfm)" m "%%" "" "vector"''']) # - checkViewer('a DVI previewer', ['xdvi', 'kdvi'], + checkViewer('a DVI previewer', ['xdg-open', 'xdvi', 'kdvi'], rc_entry = [r'\Format dvi dvi DVI D "%%" "" "vector"']) if dtl_tools: # Windows only: DraftDVI addToRC(r'\Format dvi2 dvi DraftDVI "" "" "vector"') # - checkViewer('a HTML previewer', ['mozilla file://$$p$$i', 'netscape'], + checkViewer('a HTML previewer', ['xdg-open', 'htmlview file://$$p$$i', 'mozilla file://$$p$$i', 'netscape'], rc_entry = [r'\Format html html HTML H "%%" ""']) # # entried that do not need checkProg Index: lyx-qt.desktop =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/lyx-qt.desktop,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- lyx-qt.desktop 1 Oct 2006 23:14:31 -0000 1.2 +++ lyx-qt.desktop 15 Feb 2007 15:04:53 -0000 1.3 @@ -7,5 +7,5 @@ MimeType=application/x-lyx;text/x-lyx; Type=Application Encoding=UTF-8 -Categories=Qt;Application;Office;WordProcessor; +Categories=Qt;Office;WordProcessor; Index: lyx-xforms.desktop =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/lyx-xforms.desktop,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- lyx-xforms.desktop 1 Oct 2006 23:14:31 -0000 1.2 +++ lyx-xforms.desktop 15 Feb 2007 15:04:53 -0000 1.3 @@ -7,5 +7,5 @@ MimeType=application/x-lyx;text/x-lyx; Type=Application Encoding=UTF-8 -Categories=Application;Office;WordProcessor; +Categories=Office;WordProcessor; Index: lyx.desktop =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/lyx.desktop,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- lyx.desktop 1 Oct 2006 23:14:31 -0000 1.4 +++ lyx.desktop 15 Feb 2007 15:04:53 -0000 1.5 @@ -7,5 +7,5 @@ MimeType=application/x-lyx;text/x-lyx; Type=Application Encoding=UTF-8 -Categories=Application;Office;WordProcessor; +Categories=Office;WordProcessor; Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- lyx.spec 1 Oct 2006 23:55:58 -0000 1.48 +++ lyx.spec 15 Feb 2007 15:04:53 -0000 1.49 @@ -1,8 +1,8 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx -Version: 1.4.3 -Release: 3%{?dist} +Version: 1.4.4 +Release: 1%{?dist} License: GPL Group: Applications/Publishing @@ -10,7 +10,7 @@ Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: lyx-1.4.3-helpers.patch +Patch1: lyx-1.4.4-xdg_open.patch Source1: lyxrc.dist # app-wrapper for various frontends @@ -45,10 +45,10 @@ Requires: tetex-dvips Requires: mathml-fonts Requires: ghostscript -Requires: htmlview -Requires: xdg-utils +# Short-hand for Requires+Requires(post,postun) +Prereq: xdg-utils ## Soft dependencies -%if "%{?fedora}" > "3" +%if 0%{?fedora} > 3 # dvipost adds support for lyx's Document->Change Tracking feature Requires(hint): tetex-dvipost Requires(hint): tetex-preview @@ -89,19 +89,19 @@ Provides: %{name}-frontend = %{version}-%{release} %description xforms %{summary}. +Please note: This frontend is deprecated, and will no longer be included +in lyx-1.5.x. %prep %setup -q -n %{name}-%{version}%{?beta} -# FIXME -%patch1 -p1 -b .helpers +%patch1 -p1 -b .xdg_open %build -# QT unset QTDIR || : ; . /etc/profile.d/qt.sh # drop -fexceptions from optflags, suggested by lyx devs: @@ -145,7 +145,7 @@ # .desktop desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category="X-Fedora" --vendor="" \ + --vendor="" \ %{SOURCE21} %{SOURCE22} # generic/hicolor icon @@ -165,25 +165,25 @@ %post -touch --no-create %{_datadir}/icons/hicolor ||: -gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||: +%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || : texhash > /dev/null 2>&1 ||: cd %{_datadir}/lyx && ./configure.py > /dev/null 2>&1 ||: %postun -touch --no-create %{_datadir}/icons/hicolor ||: -gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||: +%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || : texhash > /dev/null 2>&1 ||: -# Catch installed/uninstalled helpers -%triggerin -- acroread,AdobeReader_enu,evince,gsview,ImageMagick,kdegraphics,latex2html,tetex-xdvi,wv +## Catch installed/uninstalled helpers +## not sure if this is really needed anymore, as it seems to be a per-user thing, +## and besides, we use xdg-open now -- Rex +%triggerin -- latex2html,wv if [ $2 -gt 1 ]; then cd %{_datadir}/lyx && ./configure.py --without-latex-config > /dev/null 2>&1 ||: fi -%triggerun -- acroread,AdobeReader_enu,evince,gsview,ImageMagick,kdegraphics,latex2html,tetex-xdvi,wv +%triggerun -- latex2html,wv if [ $2 -eq 0 ]; then cd %{_datadir}/lyx && ./configure.py --without-latex-config > /dev/null 2>&1 ||: fi @@ -220,12 +220,17 @@ %changelog +* Wed Feb 14 2007 Rex Dieter 1.4.4-1 +- lyx-1.4.4 +- .desktop's: -Category=Application +- mark -xforms as deprecated + * Sun Oct 01 2006 Rex Dieter 1.4.3-3 - sync .desktop files with upstream - use xdg-open as default helper, +Requires: xdg-utils * Thu Sep 21 2006 Rex Dieter 1.4.3-1 -- 1.4.3 +- lyx-1.4.3 * Thu Sep 07 2006 Rex Dieter 1.4.2-5 - fc6 respin --- lyx-1.4.3-helpers.patch DELETED --- From fedora-extras-commits at redhat.com Thu Feb 15 15:08:41 2007 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 15 Feb 2007 10:08:41 -0500 Subject: rpms/libsx/devel libsx-examples.diff, NONE, 1.1 libsx-rgb.diff, NONE, 1.1 libsx-simple_freq.c, NONE, 1.1 libsx.spec, 1.7, 1.8 libsx-freq_simple.diff, 1.1, NONE Message-ID: <200702151508.l1FF8faa012045@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/libsx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12016 Modified Files: libsx.spec Added Files: libsx-examples.diff libsx-rgb.diff libsx-simple_freq.c Removed Files: libsx-freq_simple.diff Log Message: * Thu Feb 15 2007 Patrice Dumas 2.05-11 - use only %{buildroot} - put examples in a directory and fix them - set the rgb database location to a correct value - replace libsx-freq_simple.diff by libsx-examples.diff + libsx-simple_freq.c libsx-examples.diff: --- NEW FILE libsx-examples.diff --- --- libsx-2.05/demo0/makefile.examples 1999-06-22 14:41:40.000000000 +0200 +++ libsx-2.05/demo0/makefile 2007-02-15 13:46:00.000000000 +0100 @@ -21,9 +21,9 @@ # main.o depends on main.c (of course) and main.h and callbacks.h -main.o : main.c main.h callbacks.h libsx.h +main.o : main.c main.h callbacks.h -callbacks.o : libsx.h callbacks.c main.h +callbacks.o : callbacks.c main.h # --- libsx-2.05/pcurve/makefile.examples 1994-11-06 00:21:09.000000000 +0100 +++ libsx-2.05/pcurve/makefile 2007-02-15 13:46:00.000000000 +0100 @@ -1,20 +1,23 @@ -#!smake +include ../libsx_defs CFLAGS = -g -I../controlbox -CLIBS = ../src/libsxGL.a -lGLU -lGL -lXaw -lXt -lXmu -lX11 -lm -LDFLAGS = $(LIBPATH) $(LIBS) +CLIBS = -lGLU -lGL -lXaw -lXt -lXmu -lX11 -lm +LDFLAGS = $(LIBPATH) $(LIBS) $(CLIBS) OBJS = fogl.o cfogl.o -OTHEROBJS = ../controlbox/controlbox.o +OTHEROBJS = controlbox.o -default: pcurve +default: $(OTHEROBJS) pcurve + +controlbox.o: ../controlbox/controlbox.c + cc -c $(CFLAGS) ../controlbox/controlbox.c -o controlbox.o clean: rm -f $(OBJS) cool -pcurve: pcurve.c - cc $(CFLAGS) pcurve.c -o pcurve $(OTHEROBJS) $(LIBPATH) $(CLIBS) +pcurve: pcurve.c $(OTHEROBJS) + cc $(CFLAGS) pcurve.c -o pcurve $(OTHEROBJS) $(LDFLAGS) -cool2: cool2.c - cc $(CFLAGS) cool2.c $(OTHEROBJS) -o cool2 $(LIBPATH) $(CLIBS) +cool2: cool2.c $(OTHEROBJS) + cc $(CFLAGS) cool2.c $(OTHEROBJS) -o cool2 $(LDFLAGS) --- libsx-2.05/demo3/makefile.examples 2007-02-15 13:48:46.000000000 +0100 +++ libsx-2.05/demo3/makefile 2007-02-15 15:47:47.000000000 +0100 @@ -10,9 +10,9 @@ # main.o depends on main.c (of course) and main.h and callbacks.h -main.o : main.c main.h callbacks.h libsx.h +main.o : main.c main.h callbacks.h -callbacks.o : libsx.h callbacks.c main.h +callbacks.o : callbacks.c main.h clean : --- libsx-2.05/controlbox/makefile.examples 2000-07-23 20:57:49.000000000 +0200 +++ libsx-2.05/controlbox/makefile 2007-02-15 13:46:00.000000000 +0100 @@ -10,9 +10,9 @@ # main.o depends on main.c (of course) and main.h and callbacks.h -main.o : main.c main.h callbacks.h libsx.h controlbox.h +main.o : main.c main.h callbacks.h controlbox.h -callbacks.o : libsx.h callbacks.c +callbacks.o : callbacks.c controlbox.o : controlbox.c controlbox.c --- libsx-2.05/freq/makefile.examples 1994-02-02 17:54:22.000000000 +0100 +++ libsx-2.05/freq/makefile 2007-02-15 13:46:00.000000000 +0100 @@ -3,9 +3,11 @@ include ../libsx_defs FREQ_OBJS = freq.o dirlist.o +SIMPLE_FREQ_OBJS = simple_freq.o OBJS = main.o libfreq.a +SIMPLE_OBJS = main.o libsimplefreq.a -all : libfreq.a freq +all : libfreq.a freq libsimplefreq.a simple_freq libfreq.a : $(FREQ_OBJS) @@ -13,16 +15,24 @@ ar rc libfreq.a $(FREQ_OBJS) $(RANLIB) libfreq.a +libsimplefreq.a : $(SIMPLE_FREQ_OBJS) + rm -f libsimplefreq.a + ar rc libsimplefreq.a $(SIMPLE_FREQ_OBJS) + $(RANLIB) libsimplefreq.a freq : $(OBJS) $(CC) -o $@ $(OBJS) $(LIBS) +simple_freq : $(SIMPLE_OBJS) + $(CC) -o $@ $(SIMPLE_OBJS) $(LIBS) -main.o : main.c libsx.h freq.h +main.o : main.c freq.h freq.o : freq.c +simple_freq.o : simple_freq.c + dirlist.o : dirlist.c clean: - rm -f *.o *~ core freq libfreq.a + rm -f *.o *~ core freq libfreq.a simple_freq libsimplefreq.a --- libsx-2.05/multireq/makefile.examples 2007-02-15 13:47:36.000000000 +0100 +++ libsx-2.05/multireq/makefile 2007-02-15 13:47:45.000000000 +0100 @@ -9,7 +9,7 @@ multireq : $(OBJS) $(CC) -g -o $@ $(OBJS) $(LIBS) -main.o : main.c libsx.h multireq.h +main.o : main.c multireq.h multireq.o : multireq.c multireq.h --- libsx-2.05/skel/makefile.examples 1994-01-19 21:10:46.000000000 +0100 +++ libsx-2.05/skel/makefile 2007-02-15 13:46:00.000000000 +0100 @@ -10,9 +10,9 @@ # main.o depends on main.c (of course) and main.h and callbacks.h -main.o : main.c main.h callbacks.h libsx.h +main.o : main.c main.h callbacks.h -callbacks.o : libsx.h callbacks.c +callbacks.o : callbacks.c clean : rm -f *.o *~ core skel --- libsx-2.05/demo2/makefile.examples 1994-01-19 21:12:08.000000000 +0100 +++ libsx-2.05/demo2/makefile 2007-02-15 13:46:00.000000000 +0100 @@ -10,9 +10,9 @@ # main.o depends on main.c (of course) and main.h and callbacks.h -main.o : main.c main.h callbacks.h libsx.h +main.o : main.c main.h callbacks.h -callbacks.o : libsx.h callbacks.c main.h +callbacks.o : callbacks.c main.h clean : --- libsx-2.05/demo1/makefile.examples 1994-01-19 21:12:13.000000000 +0100 +++ libsx-2.05/demo1/makefile 2007-02-15 13:46:00.000000000 +0100 @@ -10,9 +10,9 @@ # main.o depends on main.c (of course) and main.h and callbacks.h -main.o : main.c main.h callbacks.h libsx.h +main.o : main.c main.h callbacks.h -callbacks.o : libsx.h callbacks.c main.h +callbacks.o : callbacks.c main.h # --- libsx-2.05/xrootbg/makefile.examples 1999-12-14 21:02:00.000000000 +0100 +++ libsx-2.05/xrootbg/makefile 2007-02-15 13:46:00.000000000 +0100 @@ -1,7 +1,7 @@ # # -XAWLIB=Xaw95 -# XAWLIB=Xaw +#XAWLIB=Xaw95 +XAWLIB=Xaw include ../libsx_defs CFLAGS = -Wall -O2 -D_POSIX_SOURCE -D$(XAWLIB) --- libsx-2.05/creq/makefile.examples 1994-01-19 21:21:40.000000000 +0100 +++ libsx-2.05/creq/makefile 2007-02-15 13:46:00.000000000 +0100 @@ -10,7 +10,7 @@ creq : $(OBJS) $(CC) -o $@ $(OBJS) $(LIBS) -main.o : main.c libsx.h creq.h +main.o : main.c creq.h creq.o : creq.c libsx-rgb.diff: --- NEW FILE libsx-rgb.diff --- --- libsx-2.05/src/colorsel.c.rgb 2000-07-29 11:10:32.000000000 +0200 +++ libsx-2.05/src/colorsel.c 2007-02-15 15:49:55.000000000 +0100 @@ -12,7 +12,9 @@ char *SX_ColorSelector_Label[] = { }; +#ifndef RGBTXT #define RGBTXT "/usr/lib/X11/rgb.txt" +#endif #include #include --- NEW FILE libsx-simple_freq.c --- #include "libsx.h" #include "freq.h" char *SimpleGetFile(char *path) { return GetFile("Simple file requestor", path, NULL, NULL); } Index: libsx.spec =================================================================== RCS file: /cvs/extras/rpms/libsx/devel/libsx.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libsx.spec 10 Sep 2006 21:59:15 -0000 1.7 +++ libsx.spec 15 Feb 2007 15:08:09 -0000 1.8 @@ -1,17 +1,20 @@ Name: libsx Summary: Simple X library Version: 2.05 -Release: 10%{?dist} +Release: 11%{?dist} Group: System Environment/Libraries License: LGPL Url: ftp://ftp.ac-grenoble.fr/ge/Xlibraries/ Source: ftp://ftp.ac-grenoble.fr/ge/Xlibraries/%{name}-%{version}.tar.bz2 -Patch: libsx-no_nested_prototypes.diff +# simpler example for freq +Source1: libsx-simple_freq.c +Patch0: libsx-no_nested_prototypes.diff Patch1: libsx-comment_caddr_t.diff Patch2: libsx-protect_strdup.diff -Patch3: libsx-freq_simple.diff +Patch3: libsx-examples.diff Patch4: libsx-mkdir_p.diff Patch5: libsx-shared.diff +Patch6: libsx-rgb.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # libXt-devel requires libX11-devel and libXaw-devel requires libXmu-devel BuildRequires: libXaw-devel libXpm-devel libXt-devel @@ -38,39 +41,54 @@ %prep %setup -q -%patch -p1 -# caddr_t redefined? -%patch -P 1 -# with RPM_OPT_FLAGS (maybe FORTIFY_SOURCE) all the strdup prototypes -# have to be commented. -%patch -p1 -P 2 -# use the new GetFile in freq -%patch -p1 -P 3 +# static function cannot be within other function +%patch0 -p1 +# don't redefine caddr_t +%patch1 +# set strdup prototypes only if strdup isn't a macro +%patch2 -p1 +# use the new GetFile in freq, remove libsx.h from prerequisite and other +# fixes allowing examples to compile +%patch3 -p1 -b .examples # use mkdir -p to create directories -%patch -p1 -P 4 +%patch4 -p1 # shared library with fine soname -%patch -p1 -P 5 +%patch5 -p1 +# allow the rgb file location to be redefined +%patch6 -p1 -b .rgb + +# example of a simple use of the new GetFile +cp %{SOURCE1} freq/simple_freq.c %build -make CFLAGS="%{optflags} -fPIC" src +make CFLAGS="%{optflags} -fPIC -DRGBTXT=\"\\\"%{_datadir}/X11/rgb.txt\\\"\"" src %install rm -rf %{buildroot} -# remove symlinks pointing to libsx.h in example directories -find . -name libsx.h -a -type l -exec rm \{\} \; - -cd src -%makeinstall LIBDIR=%{buildroot}%{_libdir} \ +pushd src +make install LIBDIR=%{buildroot}%{_libdir} \ INCLUDEDIR=%{buildroot}%{_includedir} \ SHAREDIR=%{buildroot}%{_datadir}/libsx +popd -# fix symbolic links for shared library -cd $RPM_BUILD_ROOT/%{_libdir} +# prepare examples directory +rm -rf examples +mkdir examples +cp -a bezier controlbox creq demo* draw_demo frac freq multireq \ + pcurve skel xmore xrootbg libsx_defs examples/ +# remove symlinks pointing to libsx.h in example directories +find examples/ -name libsx.h -a -type l -exec rm \{\} \; +find examples/ -name makefile.examples -exec rm \{\} \; + +# fix symbolic links for shared library. It is not completly obvious +# that using 0.0.0 like in libtool makes sense, do it anyway. +pushd %{buildroot}/%{_libdir} mv libsx.so libsx.so.0.0.0 chmod +x libsx.so.0.0.0 ln -s libsx.so.0.0.0 libsx.so.0 ln -s libsx.so.0 libsx.so +popd %post -p /sbin/ldconfig @@ -87,13 +105,18 @@ %files devel %defattr(-,root,root,-) -%doc bezier controlbox creq demo* docs draw_demo frac freq multireq -%doc pcurve skel xmore xrootbg libsx_defs +%doc docs/ examples/ %{_libdir}/libsx.a %{_libdir}/libsx.so %{_includedir}/libsx.h %changelog +* Thu Feb 15 2007 Patrice Dumas 2.05-11 +- use only %%{buildroot} +- put examples in a directory and fix them +- set the rgb database location to a correct value +- replace libsx-freq_simple.diff by libsx-examples.diff + libsx-simple_freq.c + * Sun Sep 10 2006 Patrice Dumas 2.05-10 - add defattr to devel --- libsx-freq_simple.diff DELETED --- From fedora-extras-commits at redhat.com Thu Feb 15 15:18:17 2007 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 15 Feb 2007 10:18:17 -0500 Subject: rpms/lyx/devel .cvsignore, 1.15, 1.16 lyx.spec, 1.49, 1.50 sources, 1.14, 1.15 Message-ID: <200702151518.l1FFIHNp012149@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12122 Modified Files: .cvsignore lyx.spec sources Log Message: * Thu Feb 15 2007 Rex Dieter 1.4.4-2 - biffed sources, respin Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 21 Sep 2006 15:26:46 -0000 1.15 +++ .cvsignore 15 Feb 2007 15:17:45 -0000 1.16 @@ -1,3 +1,4 @@ clog beamer.layout lyx-1.4.3.tar.bz2 +lyx-1.4.4.tar.bz2 Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- lyx.spec 15 Feb 2007 15:04:53 -0000 1.49 +++ lyx.spec 15 Feb 2007 15:17:45 -0000 1.50 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Publishing @@ -220,6 +220,9 @@ %changelog +* Thu Feb 15 2007 Rex Dieter 1.4.4-2 +- biffed sources, respin + * Wed Feb 14 2007 Rex Dieter 1.4.4-1 - lyx-1.4.4 - .desktop's: -Category=Application Index: sources =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 21 Sep 2006 15:26:46 -0000 1.14 +++ sources 15 Feb 2007 15:17:45 -0000 1.15 @@ -1,2 +1,2 @@ c906271900a0627d3df2a38ad962a285 beamer.layout -34a014a0034481381cbba517d4a00e61 lyx-1.4.3.tar.bz2 +2e778eba4191c5f9fb2cafa7901c322c lyx-1.4.4.tar.bz2 From fedora-extras-commits at redhat.com Thu Feb 15 15:21:14 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 10:21:14 -0500 Subject: rpms/hunspell-pl - New directory Message-ID: <200702151521.l1FFLEjj012249@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-pl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12244/hunspell-pl Log Message: Directory /cvs/extras/rpms/hunspell-pl added to the repository From fedora-extras-commits at redhat.com Thu Feb 15 15:21:22 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 10:21:22 -0500 Subject: rpms/hunspell-pl/devel - New directory Message-ID: <200702151521.l1FFLMaa012265@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-pl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12244/hunspell-pl/devel Log Message: Directory /cvs/extras/rpms/hunspell-pl/devel added to the repository From fedora-extras-commits at redhat.com Thu Feb 15 15:21:35 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 10:21:35 -0500 Subject: rpms/hunspell-pl Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702151521.l1FFLZv3012299@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-pl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12289 Added Files: Makefile import.log pkg.acl Log Message: Setup of module hunspell-pl --- NEW FILE Makefile --- # Top level Makefile for module hunspell-pl all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Thu Feb 15 15:21:42 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 10:21:42 -0500 Subject: rpms/hunspell-pl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702151521.l1FFLgQN012317@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-pl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12289/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module hunspell-pl --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Feb 15 15:23:23 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 10:23:23 -0500 Subject: rpms/hunspell-nb/devel - New directory Message-ID: <200702151523.l1FFNN1E012460@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-nb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12441/hunspell-nb/devel Log Message: Directory /cvs/extras/rpms/hunspell-nb/devel added to the repository From fedora-extras-commits at redhat.com Thu Feb 15 15:23:21 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 10:23:21 -0500 Subject: rpms/hunspell-nb - New directory Message-ID: <200702151523.l1FFNLk2012446@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-nb In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12441/hunspell-nb Log Message: Directory /cvs/extras/rpms/hunspell-nb added to the repository From fedora-extras-commits at redhat.com Thu Feb 15 15:23:30 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 15 Feb 2007 10:23:30 -0500 Subject: rpms/easytag/devel easytag.spec,1.15,1.16 Message-ID: <200702151523.l1FFNUQk012478@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/easytag/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12413 Modified Files: easytag.spec Log Message: Rebuild against flac 1.1.4 and enable libmp4v2 since it's now part of Fedora. Index: easytag.spec =================================================================== RCS file: /cvs/extras/rpms/easytag/devel/easytag.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- easytag.spec 12 Dec 2006 12:53:21 -0000 1.15 +++ easytag.spec 15 Feb 2007 15:22:58 -0000 1.16 @@ -1,7 +1,7 @@ Summary: Tag editor for mp3, ogg, flac and other music files Name: easytag Version: 1.99.13 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Multimedia URL: http://easytag.sourceforge.net/ @@ -14,9 +14,7 @@ Patch0: easytag-1.99.13-id3lib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gtk2-devel >= 2.4.0, id3lib-devel >= 3.7.12 -BuildRequires: libvorbis-devel >= 1.0, flac-devel, gettext -# Not in Extras (yet, #191036 - enable later!) -#Buildrequires: libmp4v2-devel +BuildRequires: libvorbis-devel >= 1.0, flac-devel, libmp4v2-devel, gettext %description EasyTAG is a utility for viewing, editing and writing the tags of MP3, @@ -54,6 +52,10 @@ %changelog +* Thu Feb 15 2007 Matthias Saou 1.99.13-2 +- Rebuild against flac 1.1.4. +- Enable libmp4v2 since it's now part of Fedora. + * Tue Dec 12 2006 Matthias Saou 1.99.13-1 - Update to 1.99.13. - Update id3lib patch to still apply. From fedora-extras-commits at redhat.com Thu Feb 15 15:23:36 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 10:23:36 -0500 Subject: rpms/hunspell-nb Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702151523.l1FFNaKQ012497@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-nb In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12487 Added Files: Makefile import.log pkg.acl Log Message: Setup of module hunspell-nb --- NEW FILE Makefile --- # Top level Makefile for module hunspell-nb all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Thu Feb 15 15:23:38 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 10:23:38 -0500 Subject: rpms/hunspell-nb/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702151523.l1FFNcU9012515@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-nb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12487/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module hunspell-nb --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Feb 15 15:24:51 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 10:24:51 -0500 Subject: rpms/hunspell-nl/devel - New directory Message-ID: <200702151524.l1FFOpV3012597@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-nl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12578/hunspell-nl/devel Log Message: Directory /cvs/extras/rpms/hunspell-nl/devel added to the repository From fedora-extras-commits at redhat.com Thu Feb 15 15:24:44 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 10:24:44 -0500 Subject: rpms/hunspell-nl - New directory Message-ID: <200702151524.l1FFOiJD012583@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-nl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12578/hunspell-nl Log Message: Directory /cvs/extras/rpms/hunspell-nl added to the repository From fedora-extras-commits at redhat.com Thu Feb 15 15:25:00 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 10:25:00 -0500 Subject: rpms/hunspell-nl Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702151525.l1FFP0KT012631@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-nl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12621 Added Files: Makefile import.log pkg.acl Log Message: Setup of module hunspell-nl --- NEW FILE Makefile --- # Top level Makefile for module hunspell-nl all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Thu Feb 15 15:25:07 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 10:25:07 -0500 Subject: rpms/hunspell-nl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702151525.l1FFP73a012649@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-nl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12621/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module hunspell-nl --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Feb 15 15:27:09 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 10:27:09 -0500 Subject: rpms/hunspell-lt - New directory Message-ID: <200702151527.l1FFR9K0012766@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-lt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12759/hunspell-lt Log Message: Directory /cvs/extras/rpms/hunspell-lt added to the repository From fedora-extras-commits at redhat.com Thu Feb 15 15:27:16 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 10:27:16 -0500 Subject: rpms/hunspell-lt/devel - New directory Message-ID: <200702151527.l1FFRGLE012781@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-lt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12759/hunspell-lt/devel Log Message: Directory /cvs/extras/rpms/hunspell-lt/devel added to the repository From fedora-extras-commits at redhat.com Thu Feb 15 15:27:30 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 10:27:30 -0500 Subject: rpms/hunspell-lt Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702151527.l1FFRUXr012815@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-lt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12805 Added Files: Makefile import.log pkg.acl Log Message: Setup of module hunspell-lt --- NEW FILE Makefile --- # Top level Makefile for module hunspell-lt all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Thu Feb 15 15:27:38 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 10:27:38 -0500 Subject: rpms/hunspell-lt/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702151527.l1FFRcpr012833@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-lt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12805/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module hunspell-lt --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Feb 15 15:33:09 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 10:33:09 -0500 Subject: rpms/sonata/FC-6 Makefile,1.1,1.2 Message-ID: <200702151533.l1FFX99r013072@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/sonata/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13038/FC-6 Modified Files: Makefile Log Message: fix make file Index: Makefile =================================================================== RCS file: /cvs/extras/rpms/sonata/FC-6/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile 14 Feb 2007 22:01:40 -0000 1.1 +++ Makefile 15 Feb 2007 15:32:37 -0000 1.2 @@ -1,7 +1,7 @@ # Makefile for source rpm: sonata # $Id$ NAME := sonata -SPECFILE = emacs-nxml-mode +SPECFILE = sonata define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done From fedora-extras-commits at redhat.com Thu Feb 15 15:33:12 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 10:33:12 -0500 Subject: rpms/sonata/devel Makefile,1.1,1.2 Message-ID: <200702151533.l1FFXCJl013075@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/sonata/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13038/devel Modified Files: Makefile Log Message: fix make file Index: Makefile =================================================================== RCS file: /cvs/extras/rpms/sonata/devel/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile 14 Feb 2007 22:01:40 -0000 1.1 +++ Makefile 15 Feb 2007 15:32:40 -0000 1.2 @@ -1,7 +1,7 @@ # Makefile for source rpm: sonata # $Id$ NAME := sonata -SPECFILE = emacs-nxml-mode +SPECFILE = sonata define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done From fedora-extras-commits at redhat.com Thu Feb 15 15:42:30 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 10:42:30 -0500 Subject: rpms/sonata/FC-6 Makefile,1.2,1.3 Message-ID: <200702151542.l1FFgU5g013182@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/sonata/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13138/FC-6 Modified Files: Makefile Log Message: realy fix Index: Makefile =================================================================== RCS file: /cvs/extras/rpms/sonata/FC-6/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 15 Feb 2007 15:32:37 -0000 1.2 +++ Makefile 15 Feb 2007 15:41:58 -0000 1.3 @@ -1,7 +1,7 @@ # Makefile for source rpm: sonata # $Id$ NAME := sonata -SPECFILE = sonata +SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done From fedora-extras-commits at redhat.com Thu Feb 15 15:42:32 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 10:42:32 -0500 Subject: rpms/sonata/devel Makefile,1.2,1.3 Message-ID: <200702151542.l1FFgW4U013185@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/sonata/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13138/devel Modified Files: Makefile Log Message: realy fix Index: Makefile =================================================================== RCS file: /cvs/extras/rpms/sonata/devel/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 15 Feb 2007 15:32:40 -0000 1.2 +++ Makefile 15 Feb 2007 15:42:00 -0000 1.3 @@ -1,7 +1,7 @@ # Makefile for source rpm: sonata # $Id$ NAME := sonata -SPECFILE = sonata +SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done From fedora-extras-commits at redhat.com Thu Feb 15 15:49:16 2007 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 15 Feb 2007 10:49:16 -0500 Subject: rpms/libsx/devel libsx-link_mkdir.diff, NONE, 1.1 libsx-strdup.diff, NONE, 1.1 libsx.spec, 1.8, 1.9 libsx-mkdir_p.diff, 1.1, NONE libsx-protect_strdup.diff, 1.1, NONE libsx-shared.diff, 1.2, NONE Message-ID: <200702151549.l1FFnGBR013391@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/libsx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13317 Modified Files: libsx.spec Added Files: libsx-link_mkdir.diff libsx-strdup.diff Removed Files: libsx-mkdir_p.diff libsx-protect_strdup.diff libsx-shared.diff Log Message: * Thu Feb 15 2007 Patrice Dumas 2.05-12 - build examples as part of building the library - replace libsx-protect_strdup.diff with libsx-strdup.diff, which has the fix for freq/freq.c, not only for file in src/ - merge libsx-shared.diff and libsx-mkdir_p.diff in libsx-link_mkdir.diff libsx-link_mkdir.diff: --- NEW FILE libsx-link_mkdir.diff --- --- libsx-2.05/src/Makefile.link_mkdir 2003-08-09 13:17:23.000000000 +0200 +++ libsx-2.05/src/Makefile 2007-02-15 16:39:54.000000000 +0100 @@ -13,6 +13,9 @@ INCLUDEDIR=/usr/X11R6/include/X11/SX SHAREDIR=/usr/share/libsx +mkinstalldirs = mkdir -p +#mkinstalldirs = mkdirhier + CC=gcc # @@ -38,10 +41,10 @@ libsx.so : $(LIBSXOBJS) rm -f libsx.so - $(CC) -shared -Wl,-soname,libsx.so draw.o toggle.o \ + $(CC) -shared -Wl,-soname,libsx.so.0 draw.o toggle.o \ button.o string_entry.o libsx.o misc.o list.o font.o scrollbar.o \ menu.o popups.o colormap.o drawing.o dialog.o dirlist.o freq.o \ - grabpix.o colorsel.o version.o -o libsx.so + grabpix.o colorsel.o version.o -o libsx.so $(XLIBS) draw.o : draw.c libsx.h libsx_private.h @@ -89,11 +92,11 @@ callbacks.o : libsx.h callbacks.c install: - mkdirhier $(LIBDIR) + $(mkinstalldirs) $(LIBDIR) cp -f libsx.a libsx.so $(LIBDIR) - mkdirhier $(INCLUDEDIR) + $(mkinstalldirs) $(INCLUDEDIR) cp -f libsx.h $(INCLUDEDIR) - mkdirhier $(SHAREDIR) + $(mkinstalldirs) $(SHAREDIR) cp -f dialogs/dialogs* $(SHAREDIR) clean: --- libsx-2.05/libsx_defs.link_mkdir 1999-12-14 13:59:35.000000000 +0100 +++ libsx-2.05/libsx_defs 2007-02-15 16:42:05.000000000 +0100 @@ -44,7 +44,7 @@ # CFLAGS = -O3 -D_POSIX_SOURCE # # On Linux, use CC=cc, RANLIB=ranlib, and: -CFLAGS = -Wall -O2 -D_POSIX_SOURCE +CFLAGS = -Wall -g -O2 -D_POSIX_SOURCE # # On a Motorola Delta/88K box, you can use (with gcc): # CFLAGS = -O2 -DSYSV -DUSG -DMOTOROLA -DMOTOR32V2 @@ -98,9 +98,11 @@ # #LIBSX = ../src/libsx.a -LIBSX = -lsx -L/usr/X11R6/lib +LIBSX = -L../src -lsx + +XLIBS = -lXpm -l$(XAWLIB) -lXmu -lXt -lX11 XPM_SUPPORT = yes -LIBS = $(LIBSX) -lXpm -l$(XAWLIB) -lXmu -lXt -lX11 -L/usr/X11R6/lib +LIBS = $(LIBSX) $(XLIBS) libsx-strdup.diff: --- NEW FILE libsx-strdup.diff --- --- libsx-2.05/src/dirlist.c.strdup 1999-12-30 08:22:14.000000000 +0100 +++ libsx-2.05/src/dirlist.c 2007-02-15 16:15:22.000000000 +0100 @@ -32,7 +32,9 @@ #include #include +#ifndef strdup extern char *strdup(char *str); +#endif extern char _FreqFilter[84]; extern int view_dir, view_pt; --- libsx-2.05/src/freq.c.strdup 2007-02-15 16:16:18.000000000 +0100 +++ libsx-2.05/src/freq.c 2007-02-15 16:16:48.000000000 +0100 @@ -60,8 +60,9 @@ * in the butt. Why on earth isn't strdup() in the POSIX standard * but something completely useless like mbstowcs() is? */ +#ifndef strdup char *strdup(const char *str); - +#endif /* * Here's where the real code begins. --- libsx-2.05/src/dialog.c.strdup 2000-07-23 18:02:11.000000000 +0200 +++ libsx-2.05/src/dialog.c 2007-02-15 16:15:22.000000000 +0100 @@ -247,8 +247,10 @@ void PopdownDialog(Dialog popup, char **answer) { - char *tmp; +#ifndef strdup extern char *strdup(char *str); +#endif + char *tmp; if (answer) { --- libsx-2.05/freq/freq.c.strdup 1999-07-04 06:07:13.000000000 +0200 +++ libsx-2.05/freq/freq.c 2007-02-15 16:15:22.000000000 +0100 @@ -56,8 +56,9 @@ * in the butt. Why on earth isn't strdup() in the POSIX standard * but something completely useless like mbstowcs() is? */ +#ifndef strdup char *strdup(const char *str); - +#endif /* * Here's where the real code begins. Index: libsx.spec =================================================================== RCS file: /cvs/extras/rpms/libsx/devel/libsx.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libsx.spec 15 Feb 2007 15:08:09 -0000 1.8 +++ libsx.spec 15 Feb 2007 15:48:43 -0000 1.9 @@ -1,7 +1,7 @@ Name: libsx Summary: Simple X library Version: 2.05 -Release: 11%{?dist} +Release: 12%{?dist} Group: System Environment/Libraries License: LGPL Url: ftp://ftp.ac-grenoble.fr/ge/Xlibraries/ @@ -10,10 +10,9 @@ Source1: libsx-simple_freq.c Patch0: libsx-no_nested_prototypes.diff Patch1: libsx-comment_caddr_t.diff -Patch2: libsx-protect_strdup.diff +Patch2: libsx-strdup.diff Patch3: libsx-examples.diff -Patch4: libsx-mkdir_p.diff -Patch5: libsx-shared.diff +Patch4: libsx-link_mkdir.diff Patch6: libsx-rgb.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # libXt-devel requires libX11-devel and libXaw-devel requires libXmu-devel @@ -46,14 +45,14 @@ # don't redefine caddr_t %patch1 # set strdup prototypes only if strdup isn't a macro -%patch2 -p1 +%patch2 -p1 -b .strdup # use the new GetFile in freq, remove libsx.h from prerequisite and other # fixes allowing examples to compile %patch3 -p1 -b .examples # use mkdir -p to create directories -%patch4 -p1 # shared library with fine soname -%patch5 -p1 +# fix compile flags +%patch4 -p1 -b .link_mkdir # allow the rgb file location to be redefined %patch6 -p1 -b .rgb @@ -61,7 +60,7 @@ cp %{SOURCE1} freq/simple_freq.c %build -make CFLAGS="%{optflags} -fPIC -DRGBTXT=\"\\\"%{_datadir}/X11/rgb.txt\\\"\"" src +make CFLAGS="%{optflags} -fPIC -DRGBTXT=\"\\\"%{_datadir}/X11/rgb.txt\\\"\"" %install rm -rf %{buildroot} @@ -75,11 +74,18 @@ # prepare examples directory rm -rf examples mkdir examples -cp -a bezier controlbox creq demo* draw_demo frac freq multireq \ - pcurve skel xmore xrootbg libsx_defs examples/ +# pcurve doesn't build since it requires OPENGL_SUPPORT to be used, +# and we don't use it, since it is maked as experimental. +example_dirs="bezier controlbox creq demo* draw_demo frac freq multireq skel xmore xrootbg" +cp -a $example_dirs libsx_defs pcurve examples/ # remove symlinks pointing to libsx.h in example directories find examples/ -name libsx.h -a -type l -exec rm \{\} \; find examples/ -name makefile.examples -exec rm \{\} \; +rm examples/freq/freq.c.strdup +for dir in $example_dirs; do + make -C examples/$dir clean +done + # fix symbolic links for shared library. It is not completly obvious # that using 0.0.0 like in libtool makes sense, do it anyway. @@ -111,6 +117,12 @@ %{_includedir}/libsx.h %changelog +* Thu Feb 15 2007 Patrice Dumas 2.05-12 +- build examples as part of building the library +- replace libsx-protect_strdup.diff with libsx-strdup.diff, which has the fix + for freq/freq.c, not only for file in src/ +- merge libsx-shared.diff and libsx-mkdir_p.diff in libsx-link_mkdir.diff + * Thu Feb 15 2007 Patrice Dumas 2.05-11 - use only %%{buildroot} - put examples in a directory and fix them --- libsx-mkdir_p.diff DELETED --- --- libsx-protect_strdup.diff DELETED --- --- libsx-shared.diff DELETED --- From fedora-extras-commits at redhat.com Thu Feb 15 15:52:37 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik)) Date: Thu, 15 Feb 2007 10:52:37 -0500 Subject: rpms/sonata/FC-6 sonata.spec,NONE,1.1 Message-ID: <200702151552.l1FFqbxL013479@cvs-int.fedora.redhat.com> Author: ecik Update of /cvs/extras/rpms/sonata/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13471 Added Files: sonata.spec Log Message: Add spec file --- NEW FILE sonata.spec --- %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: sonata Version: 1.0.1 Release: 2%{?dist} Summary: An elegant GTK+ client for the Music Player Daemon (MPD) Group: Applications/Multimedia License: GPL URL: http://sonata.berlios.de/ Source0: http://download.berlios.de/sonata/sonata-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils BuildRequires: pygtk2-devel gtk2-devel BuildRequires: python-devel Requires: pygtk2 SOAPpy dbus-python gnome-python2-libegg %description Sonata is a lightweight GTK+ music client for the Music Player Daemon (MPD). It aims to be efficient (no toolbar, main menu, or statusbar), user-friendly, and clean. Features: - Expanded and collapsed views - Automatic remote or local album art - Automatic fetching of lyrics - Playlist and stream support - Support for editing tags - System tray icon with tooltip - Optional popup notification - Library searching by artist, song, etc. - Keyboard friendly - Support for multimedia keys - Commandline control %prep %setup -q %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %find_lang %{name} desktop-file-install --vendor="fedora" \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ --remove-category Application \ --delete-original \ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop rm -rf $RPM_BUILD_ROOT%{_datadir}/sonata %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc CHANGELOG COPYING README TODO TRANSLATORS %{python_sitearch}/* %{_bindir}/%{name} %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/%{name}* %changelog * Wed Feb 14 2007 Micha?? Bentkowski - 1.0.1-2 - Add dbus-python and gnome-python2-libegg dependencies * Wed Feb 14 2007 Micha?? Bentkowski - 1.0.1-1 - Update to 1.0.1 - Get rid of Application category in a more clear way * Fri Feb 02 2007 Micha?? Bentkowski - 1.0-1 - Initial release From fedora-extras-commits at redhat.com Thu Feb 15 15:55:45 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 15 Feb 2007 10:55:45 -0500 Subject: rpms/xmms-flac/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xmms-flac.spec, 1.6, 1.7 Message-ID: <200702151555.l1FFtj99013577@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/xmms-flac/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13540 Modified Files: .cvsignore sources xmms-flac.spec Log Message: Update to 1.1.4. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xmms-flac/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 May 2005 09:10:47 -0000 1.2 +++ .cvsignore 15 Feb 2007 15:55:13 -0000 1.3 @@ -1 +1 @@ -flac-1.1.2.tar.gz +flac-1.1.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xmms-flac/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 May 2005 09:10:47 -0000 1.2 +++ sources 15 Feb 2007 15:55:13 -0000 1.3 @@ -1 +1 @@ -2bfc127cdda02834d0491ab531a20960 flac-1.1.2.tar.gz +3958cbd5b6ed8c14966792538e44223b flac-1.1.4.tar.gz Index: xmms-flac.spec =================================================================== RCS file: /cvs/extras/rpms/xmms-flac/devel/xmms-flac.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- xmms-flac.spec 28 Aug 2006 16:40:17 -0000 1.6 +++ xmms-flac.spec 15 Feb 2007 15:55:13 -0000 1.7 @@ -2,17 +2,14 @@ Summary: XMMS plugin needed to play FLAC (Free Lossless Audio Codec) files Name: xmms-flac -Version: 1.1.2 -Release: 27%{?dist} +Version: 1.1.4 +Release: 1%{?dist} License: GPL Group: Applications/Multimedia URL: http://flac.sourceforge.net/ Source: http://dl.sf.net/flac/flac-%{version}.tar.gz -Patch0: flac-1.1.2-xmms.patch -Patch1: flac-1.1.2-libtool.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: xmms-devel, libogg-devel, gettext-devel -Buildrequires: autoconf, automake, libtool %description FLAC is a Free Lossless Audio Codec. The FLAC format supports streaming, @@ -22,9 +19,6 @@ %prep %setup -n flac-%{version} -%patch0 -p1 -b .xmms -%patch1 -p1 -b .libtool -autoreconf -i -f %build @@ -49,6 +43,12 @@ %changelog +* Thu Feb 15 2007 Matthias Saou 1.1.4-1 +- Update to 1.1.4. +- Remove now included "xmms" patch. +- Remove no longer relevant "libtool" patch. +- No longer autoreconf, since we don't patch configure.in anymore. + * Mon Aug 28 2006 Matthias Saou 1.1.2-27 - FC6 rebuild. From fedora-extras-commits at redhat.com Thu Feb 15 15:57:20 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 15 Feb 2007 10:57:20 -0500 Subject: rpms/hunspell-pl import.log,1.1,1.2 Message-ID: <200702151557.l1FFvKWX013653@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-pl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13615 Modified Files: import.log Log Message: auto-import hunspell-pl-0.20070214-1 on branch devel from hunspell-pl-0.20070214-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/hunspell-pl/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 Feb 2007 15:21:32 -0000 1.1 +++ import.log 15 Feb 2007 15:56:48 -0000 1.2 @@ -0,0 +1 @@ +hunspell-pl-0_20070214-1:HEAD:hunspell-pl-0.20070214-1.src.rpm:1171555096 From fedora-extras-commits at redhat.com Thu Feb 15 15:57:23 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 15 Feb 2007 10:57:23 -0500 Subject: rpms/hunspell-pl/devel hunspell-pl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702151557.l1FFvNJJ013662@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-pl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13615/devel Modified Files: .cvsignore sources Added Files: hunspell-pl.spec Log Message: auto-import hunspell-pl-0.20070214-1 on branch devel from hunspell-pl-0.20070214-1.src.rpm --- NEW FILE hunspell-pl.spec --- Name: hunspell-pl Summary: Polish hunspell dictionaries %define upstreamid 20070214 Version: 0.%{upstreamid} Release: 1%{?dist} Source: http://www.kurnik.pl/dictionary/alt-myspell-pl-%{upstreamid}.tar.bz2 Group: Applications/Text URL: http://www.kurnik.pl/dictionary/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: LGPL BuildArch: noarch Requires: hunspell %description Polish hunspell dictionaries. %prep %setup -q -n alt-myspell-pl-%{upstreamid} %build %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README_pl_PL.txt %{_datadir}/myspell/* %changelog * Wed Feb 14 2007 Caolan McNamara - 0.20070214-1 - next version * Thu Dec 07 2006 Caolan McNamara - 0.20060823-1 - initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hunspell-pl/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Feb 2007 15:21:40 -0000 1.1 +++ .cvsignore 15 Feb 2007 15:56:50 -0000 1.2 @@ -0,0 +1 @@ +alt-myspell-pl-20070214.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/hunspell-pl/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Feb 2007 15:21:40 -0000 1.1 +++ sources 15 Feb 2007 15:56:50 -0000 1.2 @@ -0,0 +1 @@ +26f6bf81988dbaebdbfe46b7f048b1be alt-myspell-pl-20070214.tar.bz2 From fedora-extras-commits at redhat.com Thu Feb 15 16:01:52 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 15 Feb 2007 11:01:52 -0500 Subject: rpms/hunspell-nb/devel Makefile,1.1,1.2 Message-ID: <200702151601.l1FG1qcu017317@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-nb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17283 Modified Files: Makefile Log Message: import buggered up again Index: Makefile =================================================================== RCS file: /cvs/extras/rpms/hunspell-nb/devel/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile 15 Feb 2007 15:23:36 -0000 1.1 +++ Makefile 15 Feb 2007 16:01:19 -0000 1.2 @@ -1,7 +1,7 @@ # Makefile for source rpm: hunspell-nb # $Id$ NAME := hunspell-nb -SPECFILE = hunspell-nl +SPECFILE = hunspell-nb define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done From fedora-extras-commits at redhat.com Thu Feb 15 16:11:39 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 15 Feb 2007 11:11:39 -0500 Subject: rpms/hunspell-nb import.log,1.1,1.2 Message-ID: <200702151611.l1FGBdPp017512@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-nb In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17462 Modified Files: import.log Log Message: auto-import hunspell-nb-0.20060508-1 on branch devel from hunspell-nb-0.20060508-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/hunspell-nb/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 Feb 2007 15:23:34 -0000 1.1 +++ import.log 15 Feb 2007 16:11:07 -0000 1.2 @@ -0,0 +1 @@ +hunspell-nb-0_20060508-1:HEAD:hunspell-nb-0.20060508-1.src.rpm:1171555955 From fedora-extras-commits at redhat.com Thu Feb 15 16:11:42 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 15 Feb 2007 11:11:42 -0500 Subject: rpms/hunspell-nb/devel hunspell-nb.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702151611.l1FGBgDW017523@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-nb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17462/devel Modified Files: .cvsignore sources Added Files: hunspell-nb.spec Log Message: auto-import hunspell-nb-0.20060508-1 on branch devel from hunspell-nb-0.20060508-1.src.rpm --- NEW FILE hunspell-nb.spec --- Name: hunspell-nb Summary: Bokmaal hunspell dictionaries %define upstreamid 20060508 Version: 0.%{upstreamid} Release: 1%{?dist} Source: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/nb_NO.zip Group: Applications/Text URL: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: GPL BuildArch: noarch Requires: hunspell %description Bokmaal hunspell dictionaries. %prep %setup -q -c -n hunspell-nb %build chmod -x * %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README_nb_NO.txt %{_datadir}/myspell/* %changelog * Thu Dec 07 2006 Caolan McNamara - 0.20060508-1 - fix upstream wiki date to match ftp date * Thu Dec 07 2006 Caolan McNamara - 0.20050315-1 - initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hunspell-nb/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Feb 2007 15:23:36 -0000 1.1 +++ .cvsignore 15 Feb 2007 16:11:09 -0000 1.2 @@ -0,0 +1 @@ +nb_NO.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/hunspell-nb/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Feb 2007 15:23:36 -0000 1.1 +++ sources 15 Feb 2007 16:11:09 -0000 1.2 @@ -0,0 +1 @@ +afb0948dc116d944b6bd39f56be11485 nb_NO.zip From fedora-extras-commits at redhat.com Thu Feb 15 16:14:08 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 15 Feb 2007 11:14:08 -0500 Subject: rpms/hunspell-nb/devel Makefile,1.2,1.3 Message-ID: <200702151614.l1FGE8Tl017647@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-nb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17621 Modified Files: Makefile Log Message: import buggered up again Index: Makefile =================================================================== RCS file: /cvs/extras/rpms/hunspell-nb/devel/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 15 Feb 2007 16:01:19 -0000 1.2 +++ Makefile 15 Feb 2007 16:13:35 -0000 1.3 @@ -1,7 +1,7 @@ # Makefile for source rpm: hunspell-nb # $Id$ NAME := hunspell-nb -SPECFILE = hunspell-nb +SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done From fedora-extras-commits at redhat.com Thu Feb 15 16:18:46 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 15 Feb 2007 11:18:46 -0500 Subject: rpms/hunspell-nl/devel hunspell-nl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702151618.l1FGIkFA017848@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-nl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17804/devel Modified Files: .cvsignore sources Added Files: hunspell-nl.spec Log Message: auto-import hunspell-nl-0.20050720-1 on branch devel from hunspell-nl-0.20050720-1.src.rpm --- NEW FILE hunspell-nl.spec --- Name: hunspell-nl Summary: Dutch hunspell dictionaries %define upstreamid 20050720 Version: 0.%{upstreamid} Release: 1%{?dist} Source: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/nl_NL.zip Group: Applications/Text URL: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: GPL BuildArch: noarch Requires: hunspell %description Dutch hunspell dictionaries. %prep %setup -q -c -n hunspell-nl %build tr -d '\r' < README_nl_NL.txt > README_nl_NL.txt.new mv -f README_nl_NL.txt.new README_nl_NL.txt chmod -x * %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell pushd $RPM_BUILD_ROOT/%{_datadir}/myspell/ nl_NL_aliases="nl_BE" for lang in $nl_NL_aliases; do ln -s nl_NL.aff $lang.aff ln -s nl_NL.dic $lang.dic done %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README_nl_NL.txt %{_datadir}/myspell/* %changelog * Wed Feb 14 2007 Caolan McNamara - 0.20050720-1 - update to match upstream id * Thu Dec 07 2006 Caolan McNamara - 0.20050617-1 - initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hunspell-nl/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Feb 2007 15:25:05 -0000 1.1 +++ .cvsignore 15 Feb 2007 16:18:14 -0000 1.2 @@ -0,0 +1 @@ +nl_NL.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/hunspell-nl/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Feb 2007 15:25:05 -0000 1.1 +++ sources 15 Feb 2007 16:18:14 -0000 1.2 @@ -0,0 +1 @@ +23f25d3c2a384bb19936f13c4e0d3490 nl_NL.zip From fedora-extras-commits at redhat.com Thu Feb 15 16:18:44 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 15 Feb 2007 11:18:44 -0500 Subject: rpms/hunspell-nl import.log,1.1,1.2 Message-ID: <200702151618.l1FGIi3l017844@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-nl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17804 Modified Files: import.log Log Message: auto-import hunspell-nl-0.20050720-1 on branch devel from hunspell-nl-0.20050720-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/hunspell-nl/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 Feb 2007 15:24:58 -0000 1.1 +++ import.log 15 Feb 2007 16:18:11 -0000 1.2 @@ -0,0 +1 @@ +hunspell-nl-0_20050720-1:HEAD:hunspell-nl-0.20050720-1.src.rpm:1171556379 From fedora-extras-commits at redhat.com Thu Feb 15 16:21:13 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 15 Feb 2007 11:21:13 -0500 Subject: rpms/hunspell-lt/devel Makefile,1.1,1.2 Message-ID: <200702151621.l1FGLD7U017979@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-lt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17959 Modified Files: Makefile Log Message: import buggered up again Index: Makefile =================================================================== RCS file: /cvs/extras/rpms/hunspell-lt/devel/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile 15 Feb 2007 15:27:35 -0000 1.1 +++ Makefile 15 Feb 2007 16:20:40 -0000 1.2 @@ -1,7 +1,7 @@ # Makefile for source rpm: hunspell-lt # $Id$ NAME := hunspell-lt -SPECFILE = hunspell-ms +SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done From fedora-extras-commits at redhat.com Thu Feb 15 16:23:11 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 15 Feb 2007 11:23:11 -0500 Subject: rpms/hunspell-lt/devel hunspell-lt.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702151623.l1FGNBKi018065@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-lt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18020/devel Modified Files: .cvsignore sources Added Files: hunspell-lt.spec Log Message: auto-import hunspell-lt-1.1-1.20061127cvs on branch devel from hunspell-lt-1.1-1.20061127cvs.src.rpm --- NEW FILE hunspell-lt.spec --- Name: hunspell-lt Summary: Lithuanian hunspell dictionaries Version: 1.1 Release: 1.20061127cvs%{?dist} Source: ftp://ftp.akl.lt/ispell-lt/lt_LT-1.1+cvs20061127.zip Group: Applications/Text URL: ftp://ftp.akl.lt/ispell-lt/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: BSD BuildArch: noarch Requires: hunspell %description Lithuanian hunspell dictionaries. %prep %setup -q -n lt_LT-1.1+cvs20061127 %build chmod -x * %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README.EN INSTRUKCIJOS.txt %{_datadir}/myspell/* %changelog * Thu Dec 07 2006 Caolan McNamara - 1.1-1.20061127cvs - initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hunspell-lt/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Feb 2007 15:27:35 -0000 1.1 +++ .cvsignore 15 Feb 2007 16:22:39 -0000 1.2 @@ -0,0 +1 @@ +lt_LT-1.1+cvs20061127.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/hunspell-lt/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Feb 2007 15:27:35 -0000 1.1 +++ sources 15 Feb 2007 16:22:39 -0000 1.2 @@ -0,0 +1 @@ +3357079d4c13738e7161291dfef88525 lt_LT-1.1+cvs20061127.zip From fedora-extras-commits at redhat.com Thu Feb 15 16:23:09 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 15 Feb 2007 11:23:09 -0500 Subject: rpms/hunspell-lt import.log,1.1,1.2 Message-ID: <200702151623.l1FGN9Q6018061@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-lt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18020 Modified Files: import.log Log Message: auto-import hunspell-lt-1.1-1.20061127cvs on branch devel from hunspell-lt-1.1-1.20061127cvs.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/hunspell-lt/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 Feb 2007 15:27:28 -0000 1.1 +++ import.log 15 Feb 2007 16:22:36 -0000 1.2 @@ -0,0 +1 @@ +hunspell-lt-1_1-1_20061127cvs:HEAD:hunspell-lt-1.1-1.20061127cvs.src.rpm:1171556641 From fedora-extras-commits at redhat.com Thu Feb 15 16:57:26 2007 From: fedora-extras-commits at redhat.com (Josef Whiter (josef)) Date: Thu, 15 Feb 2007 11:57:26 -0500 Subject: rpms/tilda/FC-5 tilda-segfault-fix.patch, NONE, 1.1 tilda.spec, NONE, 1.1 Message-ID: <200702151657.l1FGvQCk018534@cvs-int.fedora.redhat.com> Author: josef Update of /cvs/extras/rpms/tilda/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18524 Added Files: tilda-segfault-fix.patch tilda.spec Log Message: adding the spec file and patch file tilda-segfault-fix.patch: --- NEW FILE tilda-segfault-fix.patch --- --- tilda-0.9.4/src/key_grabber.c.josef 2007-01-22 11:43:36.000000000 -0500 +++ tilda-0.9.4/src/key_grabber.c 2007-01-22 11:43:49.000000000 -0500 @@ -241,8 +241,10 @@ static void key_grab (tilda_window *tw) if (strstr(tmp_key, "None")) modmask = 0; - if (!strstr(tmp_key, "+")) + if (!strstr(tmp_key, "+")) { perror ("Key Incorrect -- Read the README or tilda.sf.net for info, rerun as 'tilda -C' to set keybinding\n"); + return; + } if (strtok(tmp_key, "+")) key = XStringToKeysym(strtok(NULL, "+")); --- NEW FILE tilda.spec --- Name: tilda Version: 0.9.4 Release: 6%{?dist} Summary: A quake like terminal for GNOME Group: Applications/System License: GPL URL: http://tilda.sourceforge.net/ Source0: http://downloads.sourceforge.net/tilda/%{name}-%{version}.tar.gz Patch0: tilda-segfault-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils, pango-devel, vte-devel BuildRequires: libconfuse-devel, libXt-devel %description Tilda is a Linux terminal taking after the likeness of many classic terminals from first person shooter games, Quake, Doom and Half-Life (to name a few), where the terminal has no border and is hidden from the desktop until a key is pressed. %prep %setup -q %patch0 -p1 -b .segfix echo "Comment=A quake like terminal for GNOME" >> tilda.desktop %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install --delete-original --vendor="fedora" \ --dir=$RPM_BUILD_ROOT/%{_datadir}/applications \ --mode 0644 \ --remove-category="Application" \ --copy-name-to-generic-name \ $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop install -D -p -m 644 %{name}.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS COPYING README ChangeLog TODO %{_bindir}/%{name} %{_datadir}/pixmaps/%{name}.png %{_datadir}/icons/hicolor/48x48/apps/%{name}.png %{_datadir}/applications/fedora-%{name}.desktop %changelog * Mon Jan 22 2007 Josef Whiter 0.9.4-6 - fix segfault when specifying invalid keybinding * Mon Jan 22 2007 Josef Whiter 0.9.4-5 - install icon into the size specific folder as well * Mon Jan 22 2007 Josef Whiter 0.9.4-4 - fixed changelog entry - removed NEWS from the %%doc section - removed gettext from the BR - added libXt-devel as a BR - added --remove-category and --copy-name-to-generic name to the desktop-file-install - added a comment to the desktop file * Fri Jan 12 2007 Josef Whiter 0.9.4-3 - Removed my ghetto doc install script and added %%doc section * Thu Jan 11 2007 Josef Whiter 0.9.4-2 - Added BR for libconfuse-devel * Thu Jan 11 2007 Josef Whiter 0.9.4-1 - Initial Release From fedora-extras-commits at redhat.com Thu Feb 15 16:59:47 2007 From: fedora-extras-commits at redhat.com (Josef Whiter (josef)) Date: Thu, 15 Feb 2007 11:59:47 -0500 Subject: rpms/tilda/FC-5 sources,1.1,1.2 Message-ID: <200702151659.l1FGxlXd018623@cvs-int.fedora.redhat.com> Author: josef Update of /cvs/extras/rpms/tilda/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18601 Modified Files: sources Log Message: fixing sources file Index: sources =================================================================== RCS file: /cvs/extras/rpms/tilda/FC-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Feb 2007 21:18:05 -0000 1.1 +++ sources 15 Feb 2007 16:59:15 -0000 1.2 @@ -0,0 +1 @@ +773d47e3985f7e778b662a38b053c1df tilda-0.9.4.tar.gz From fedora-extras-commits at redhat.com Thu Feb 15 17:02:09 2007 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 15 Feb 2007 12:02:09 -0500 Subject: rpms/perl-B-Keywords/FC-5 .cvsignore, 1.2, 1.3 perl-B-Keywords.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200702151702.l1FH29cf022206@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-B-Keywords/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22118/FC-5 Modified Files: .cvsignore perl-B-Keywords.spec sources Log Message: Update to 1.06. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-B-Keywords/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Jan 2007 14:03:50 -0000 1.2 +++ .cvsignore 15 Feb 2007 17:01:36 -0000 1.3 @@ -1 +1 @@ -B-Keywords-1.05.tar.gz +B-Keywords-1.06.tar.gz Index: perl-B-Keywords.spec =================================================================== RCS file: /cvs/extras/rpms/perl-B-Keywords/FC-5/perl-B-Keywords.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-B-Keywords.spec 22 Jan 2007 14:03:50 -0000 1.1 +++ perl-B-Keywords.spec 15 Feb 2007 17:01:36 -0000 1.2 @@ -1,5 +1,5 @@ Name: perl-B-Keywords -Version: 1.05 +Version: 1.06 Release: 1%{?dist} Summary: Lists of reserved barewords and symbol names @@ -57,5 +57,8 @@ %changelog +* Thu Feb 15 2007 Jose Pedro Oliveira - 1.06-1 +- Update to 1.06. + * Sat Jan 20 2007 Jose Pedro Oliveira - 1.05-1 - First build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-B-Keywords/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Jan 2007 14:03:50 -0000 1.2 +++ sources 15 Feb 2007 17:01:36 -0000 1.3 @@ -1 +1 @@ -f8b40e7dc864fc27fc69638e58cc651c B-Keywords-1.05.tar.gz +24f311df8a5f0174cc465e1949082db3 B-Keywords-1.06.tar.gz From fedora-extras-commits at redhat.com Thu Feb 15 17:02:11 2007 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 15 Feb 2007 12:02:11 -0500 Subject: rpms/perl-B-Keywords/FC-6 .cvsignore, 1.2, 1.3 perl-B-Keywords.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200702151702.l1FH2BpN022213@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-B-Keywords/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22118/FC-6 Modified Files: .cvsignore perl-B-Keywords.spec sources Log Message: Update to 1.06. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-B-Keywords/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Jan 2007 14:03:50 -0000 1.2 +++ .cvsignore 15 Feb 2007 17:01:39 -0000 1.3 @@ -1 +1 @@ -B-Keywords-1.05.tar.gz +B-Keywords-1.06.tar.gz Index: perl-B-Keywords.spec =================================================================== RCS file: /cvs/extras/rpms/perl-B-Keywords/FC-6/perl-B-Keywords.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-B-Keywords.spec 22 Jan 2007 14:03:50 -0000 1.1 +++ perl-B-Keywords.spec 15 Feb 2007 17:01:39 -0000 1.2 @@ -1,5 +1,5 @@ Name: perl-B-Keywords -Version: 1.05 +Version: 1.06 Release: 1%{?dist} Summary: Lists of reserved barewords and symbol names @@ -57,5 +57,8 @@ %changelog +* Thu Feb 15 2007 Jose Pedro Oliveira - 1.06-1 +- Update to 1.06. + * Sat Jan 20 2007 Jose Pedro Oliveira - 1.05-1 - First build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-B-Keywords/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Jan 2007 14:03:50 -0000 1.2 +++ sources 15 Feb 2007 17:01:39 -0000 1.3 @@ -1 +1 @@ -f8b40e7dc864fc27fc69638e58cc651c B-Keywords-1.05.tar.gz +24f311df8a5f0174cc465e1949082db3 B-Keywords-1.06.tar.gz From fedora-extras-commits at redhat.com Thu Feb 15 17:02:14 2007 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 15 Feb 2007 12:02:14 -0500 Subject: rpms/perl-B-Keywords/devel .cvsignore, 1.2, 1.3 perl-B-Keywords.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200702151702.l1FH2Emc022220@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-B-Keywords/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22118/devel Modified Files: .cvsignore perl-B-Keywords.spec sources Log Message: Update to 1.06. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-B-Keywords/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Jan 2007 14:03:50 -0000 1.2 +++ .cvsignore 15 Feb 2007 17:01:42 -0000 1.3 @@ -1 +1 @@ -B-Keywords-1.05.tar.gz +B-Keywords-1.06.tar.gz Index: perl-B-Keywords.spec =================================================================== RCS file: /cvs/extras/rpms/perl-B-Keywords/devel/perl-B-Keywords.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-B-Keywords.spec 22 Jan 2007 14:03:50 -0000 1.1 +++ perl-B-Keywords.spec 15 Feb 2007 17:01:42 -0000 1.2 @@ -1,5 +1,5 @@ Name: perl-B-Keywords -Version: 1.05 +Version: 1.06 Release: 1%{?dist} Summary: Lists of reserved barewords and symbol names @@ -57,5 +57,8 @@ %changelog +* Thu Feb 15 2007 Jose Pedro Oliveira - 1.06-1 +- Update to 1.06. + * Sat Jan 20 2007 Jose Pedro Oliveira - 1.05-1 - First build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-B-Keywords/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Jan 2007 14:03:50 -0000 1.2 +++ sources 15 Feb 2007 17:01:42 -0000 1.3 @@ -1 +1 @@ -f8b40e7dc864fc27fc69638e58cc651c B-Keywords-1.05.tar.gz +24f311df8a5f0174cc465e1949082db3 B-Keywords-1.06.tar.gz From fedora-extras-commits at redhat.com Thu Feb 15 17:12:24 2007 From: fedora-extras-commits at redhat.com (Josef Whiter (josef)) Date: Thu, 15 Feb 2007 12:12:24 -0500 Subject: rpms/tilda/FC-5 .cvsignore,1.1,1.2 Message-ID: <200702151712.l1FHCOqQ022493@cvs-int.fedora.redhat.com> Author: josef Update of /cvs/extras/rpms/tilda/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22471 Modified Files: .cvsignore Log Message: copying things over so i can build Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tilda/FC-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Feb 2007 21:18:05 -0000 1.1 +++ .cvsignore 15 Feb 2007 17:11:52 -0000 1.2 @@ -0,0 +1 @@ +tilda-0.9.4.tar.gz From fedora-extras-commits at redhat.com Thu Feb 15 17:14:47 2007 From: fedora-extras-commits at redhat.com (Josef Whiter (josef)) Date: Thu, 15 Feb 2007 12:14:47 -0500 Subject: rpms/tilda import.log,1.2,1.3 Message-ID: <200702151714.l1FHElfR022604@cvs-int.fedora.redhat.com> Author: josef Update of /cvs/extras/rpms/tilda In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22577 Modified Files: import.log Log Message: auto-import tilda-0.9.4-6 on branch FC-5 from tilda-0.9.4-6.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/tilda/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 12 Feb 2007 21:45:02 -0000 1.2 +++ import.log 15 Feb 2007 17:14:15 -0000 1.3 @@ -1 +1,2 @@ tilda-0_9_4-6:HEAD:tilda-0.9.4-6.src.rpm:1171316738 +tilda-0_9_4-6:FC-5:tilda-0.9.4-6.src.rpm:1171559729 From fedora-extras-commits at redhat.com Thu Feb 15 17:26:16 2007 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 15 Feb 2007 12:26:16 -0500 Subject: rpms/perl-Perl-Critic/devel .cvsignore, 1.6, 1.7 perl-Perl-Critic.spec, 1.9, 1.10 sources, 1.6, 1.7 Message-ID: <200702151726.l1FHQGE6022755@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Perl-Critic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22718 Modified Files: .cvsignore perl-Perl-Critic.spec sources Log Message: Update to 1.03. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Perl-Critic/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 26 Jan 2007 15:33:26 -0000 1.6 +++ .cvsignore 15 Feb 2007 17:25:44 -0000 1.7 @@ -1 +1 @@ -Perl-Critic-1.01.tar.gz +Perl-Critic-1.03.tar.gz Index: perl-Perl-Critic.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Perl-Critic/devel/perl-Perl-Critic.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Perl-Critic.spec 26 Jan 2007 15:33:26 -0000 1.9 +++ perl-Perl-Critic.spec 15 Feb 2007 17:25:44 -0000 1.10 @@ -1,6 +1,6 @@ Name: perl-Perl-Critic -Version: 1.01 -Release: 2%{?dist} +Version: 1.03 +Release: 1%{?dist} Summary: Critique Perl source code for best-practices Group: Development/Libraries @@ -80,6 +80,9 @@ %changelog +* Thu Feb 15 2007 Jose Pedro Oliveira - 1.03-1 +- Update to 1.03. + * Fri Jan 26 2007 Jose Pedro Oliveira - 1.01-2 - Bumping release (forgot to commit sources and .cvsignore changes). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Perl-Critic/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 26 Jan 2007 15:33:26 -0000 1.6 +++ sources 15 Feb 2007 17:25:44 -0000 1.7 @@ -1 +1 @@ -801d467e8c598dc0c3decdd07fb75e5e Perl-Critic-1.01.tar.gz +86dc16f3a4630cf640acf08bf856c92a Perl-Critic-1.03.tar.gz From fedora-extras-commits at redhat.com Thu Feb 15 17:26:15 2007 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Thu, 15 Feb 2007 12:26:15 -0500 Subject: rpms/gnu-smalltalk/FC-6 gnu-smalltalk.spec,1.6,1.7 Message-ID: <200702151726.l1FHQFwg022750@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/gnu-smalltalk/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22711 Modified Files: gnu-smalltalk.spec Log Message: Rebuild bc/ broken buildsys Index: gnu-smalltalk.spec =================================================================== RCS file: /cvs/extras/rpms/gnu-smalltalk/FC-6/gnu-smalltalk.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gnu-smalltalk.spec 14 Feb 2007 21:41:11 -0000 1.6 +++ gnu-smalltalk.spec 15 Feb 2007 17:25:43 -0000 1.7 @@ -1,7 +1,7 @@ Summary: GNU Smalltalk Name: gnu-smalltalk Version: 2.3.3 -Release: 2%{?dist} +Release: 3%{?dist} Source: ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-%{version}.tar.gz Patch1: gst-2.3.3-am.patch License: GPL @@ -142,6 +142,9 @@ %{_datadir}/emacs/site-lisp/* %changelog +* Thu Feb 15 2007 Jochen Schmitt 2.3.3-3 +- Rebuild + * Wed Feb 14 2007 Jochen Schmitt 2.3.3-2 - New upstream release From fedora-extras-commits at redhat.com Thu Feb 15 17:30:39 2007 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 15 Feb 2007 12:30:39 -0500 Subject: rpms/perl-Perl-Critic/FC-6 .cvsignore, 1.6, 1.7 perl-Perl-Critic.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <200702151730.l1FHUdaQ023002@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Perl-Critic/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22908/FC-6 Modified Files: .cvsignore perl-Perl-Critic.spec sources Log Message: Update to 1.03. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Perl-Critic/FC-6/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 27 Jan 2007 00:29:06 -0000 1.6 +++ .cvsignore 15 Feb 2007 17:30:07 -0000 1.7 @@ -1 +1 @@ -Perl-Critic-1.01.tar.gz +Perl-Critic-1.03.tar.gz Index: perl-Perl-Critic.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Perl-Critic/FC-6/perl-Perl-Critic.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Perl-Critic.spec 27 Jan 2007 00:29:06 -0000 1.5 +++ perl-Perl-Critic.spec 15 Feb 2007 17:30:07 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Perl-Critic -Version: 1.01 -Release: 2%{?dist} +Version: 1.03 +Release: 1%{?dist} Summary: Critique Perl source code for best-practices Group: Development/Libraries @@ -80,6 +80,9 @@ %changelog +* Thu Feb 15 2007 Jose Pedro Oliveira - 1.03-1 +- Update to 1.03. + * Fri Jan 26 2007 Jose Pedro Oliveira - 1.01-2 - Bumping release (forgot to commit sources and .cvsignore changes). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Perl-Critic/FC-6/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 27 Jan 2007 00:29:06 -0000 1.6 +++ sources 15 Feb 2007 17:30:07 -0000 1.7 @@ -1 +1 @@ -801d467e8c598dc0c3decdd07fb75e5e Perl-Critic-1.01.tar.gz +86dc16f3a4630cf640acf08bf856c92a Perl-Critic-1.03.tar.gz From fedora-extras-commits at redhat.com Thu Feb 15 17:30:36 2007 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 15 Feb 2007 12:30:36 -0500 Subject: rpms/perl-Perl-Critic/FC-5 .cvsignore, 1.6, 1.7 perl-Perl-Critic.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <200702151730.l1FHUaWc022997@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Perl-Critic/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22908/FC-5 Modified Files: .cvsignore perl-Perl-Critic.spec sources Log Message: Update to 1.03. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Perl-Critic/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 27 Jan 2007 00:29:05 -0000 1.6 +++ .cvsignore 15 Feb 2007 17:30:04 -0000 1.7 @@ -1 +1 @@ -Perl-Critic-1.01.tar.gz +Perl-Critic-1.03.tar.gz Index: perl-Perl-Critic.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Perl-Critic/FC-5/perl-Perl-Critic.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Perl-Critic.spec 27 Jan 2007 00:29:05 -0000 1.5 +++ perl-Perl-Critic.spec 15 Feb 2007 17:30:04 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Perl-Critic -Version: 1.01 -Release: 2%{?dist} +Version: 1.03 +Release: 1%{?dist} Summary: Critique Perl source code for best-practices Group: Development/Libraries @@ -80,6 +80,9 @@ %changelog +* Thu Feb 15 2007 Jose Pedro Oliveira - 1.03-1 +- Update to 1.03. + * Fri Jan 26 2007 Jose Pedro Oliveira - 1.01-2 - Bumping release (forgot to commit sources and .cvsignore changes). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Perl-Critic/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 27 Jan 2007 00:29:05 -0000 1.6 +++ sources 15 Feb 2007 17:30:04 -0000 1.7 @@ -1 +1 @@ -801d467e8c598dc0c3decdd07fb75e5e Perl-Critic-1.01.tar.gz +86dc16f3a4630cf640acf08bf856c92a Perl-Critic-1.03.tar.gz From fedora-extras-commits at redhat.com Thu Feb 15 17:30:43 2007 From: fedora-extras-commits at redhat.com (Josef Whiter (josef)) Date: Thu, 15 Feb 2007 12:30:43 -0500 Subject: rpms/tilda import.log,1.3,1.4 Message-ID: <200702151730.l1FHUhNh023005@cvs-int.fedora.redhat.com> Author: josef Update of /cvs/extras/rpms/tilda In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22954 Modified Files: import.log Log Message: auto-import tilda-0.9.4-6 on branch FC-6 from tilda-0.9.4-6.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/tilda/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 15 Feb 2007 17:14:15 -0000 1.3 +++ import.log 15 Feb 2007 17:30:10 -0000 1.4 @@ -1,2 +1,3 @@ tilda-0_9_4-6:HEAD:tilda-0.9.4-6.src.rpm:1171316738 tilda-0_9_4-6:FC-5:tilda-0.9.4-6.src.rpm:1171559729 +tilda-0_9_4-6:FC-6:tilda-0.9.4-6.src.rpm:1171560684 From fedora-extras-commits at redhat.com Thu Feb 15 17:30:46 2007 From: fedora-extras-commits at redhat.com (Josef Whiter (josef)) Date: Thu, 15 Feb 2007 12:30:46 -0500 Subject: rpms/tilda/FC-6 tilda-segfault-fix.patch, NONE, 1.1 tilda.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702151730.l1FHUkgg023011@cvs-int.fedora.redhat.com> Author: josef Update of /cvs/extras/rpms/tilda/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22954/FC-6 Modified Files: .cvsignore sources Added Files: tilda-segfault-fix.patch tilda.spec Log Message: auto-import tilda-0.9.4-6 on branch FC-6 from tilda-0.9.4-6.src.rpm tilda-segfault-fix.patch: --- NEW FILE tilda-segfault-fix.patch --- --- tilda-0.9.4/src/key_grabber.c.josef 2007-01-22 11:43:36.000000000 -0500 +++ tilda-0.9.4/src/key_grabber.c 2007-01-22 11:43:49.000000000 -0500 @@ -241,8 +241,10 @@ static void key_grab (tilda_window *tw) if (strstr(tmp_key, "None")) modmask = 0; - if (!strstr(tmp_key, "+")) + if (!strstr(tmp_key, "+")) { perror ("Key Incorrect -- Read the README or tilda.sf.net for info, rerun as 'tilda -C' to set keybinding\n"); + return; + } if (strtok(tmp_key, "+")) key = XStringToKeysym(strtok(NULL, "+")); --- NEW FILE tilda.spec --- Name: tilda Version: 0.9.4 Release: 6%{?dist} Summary: A quake like terminal for GNOME Group: Applications/System License: GPL URL: http://tilda.sourceforge.net/ Source0: http://downloads.sourceforge.net/tilda/%{name}-%{version}.tar.gz Patch0: tilda-segfault-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils, pango-devel, vte-devel BuildRequires: libconfuse-devel, libXt-devel %description Tilda is a Linux terminal taking after the likeness of many classic terminals from first person shooter games, Quake, Doom and Half-Life (to name a few), where the terminal has no border and is hidden from the desktop until a key is pressed. %prep %setup -q %patch0 -p1 -b .segfix echo "Comment=A quake like terminal for GNOME" >> tilda.desktop %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install --delete-original --vendor="fedora" \ --dir=$RPM_BUILD_ROOT/%{_datadir}/applications \ --mode 0644 \ --remove-category="Application" \ --copy-name-to-generic-name \ $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop install -D -p -m 644 %{name}.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS COPYING README ChangeLog TODO %{_bindir}/%{name} %{_datadir}/pixmaps/%{name}.png %{_datadir}/icons/hicolor/48x48/apps/%{name}.png %{_datadir}/applications/fedora-%{name}.desktop %changelog * Mon Jan 22 2007 Josef Whiter 0.9.4-6 - fix segfault when specifying invalid keybinding * Mon Jan 22 2007 Josef Whiter 0.9.4-5 - install icon into the size specific folder as well * Mon Jan 22 2007 Josef Whiter 0.9.4-4 - fixed changelog entry - removed NEWS from the %%doc section - removed gettext from the BR - added libXt-devel as a BR - added --remove-category and --copy-name-to-generic name to the desktop-file-install - added a comment to the desktop file * Fri Jan 12 2007 Josef Whiter 0.9.4-3 - Removed my ghetto doc install script and added %%doc section * Thu Jan 11 2007 Josef Whiter 0.9.4-2 - Added BR for libconfuse-devel * Thu Jan 11 2007 Josef Whiter 0.9.4-1 - Initial Release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tilda/FC-6/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Feb 2007 21:18:05 -0000 1.1 +++ .cvsignore 15 Feb 2007 17:30:13 -0000 1.2 @@ -0,0 +1 @@ +tilda-0.9.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tilda/FC-6/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Feb 2007 21:18:05 -0000 1.1 +++ sources 15 Feb 2007 17:30:13 -0000 1.2 @@ -0,0 +1 @@ +773d47e3985f7e778b662a38b053c1df tilda-0.9.4.tar.gz From fedora-extras-commits at redhat.com Thu Feb 15 17:42:58 2007 From: fedora-extras-commits at redhat.com (Josef Whiter (josef)) Date: Thu, 15 Feb 2007 12:42:58 -0500 Subject: rpms/tilda/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tilda-segfault-fix.patch, 1.1, NONE tilda.spec, 1.1, NONE Message-ID: <200702151742.l1FHgwGE023393@cvs-int.fedora.redhat.com> Author: josef Update of /cvs/extras/rpms/tilda/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23277 Modified Files: .cvsignore sources Removed Files: tilda-segfault-fix.patch tilda.spec Log Message: cleaning things out so I can reimport and get this working Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tilda/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 15 Feb 2007 17:11:52 -0000 1.2 +++ .cvsignore 15 Feb 2007 17:42:25 -0000 1.3 @@ -1 +0,0 @@ -tilda-0.9.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tilda/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Feb 2007 16:59:15 -0000 1.2 +++ sources 15 Feb 2007 17:42:25 -0000 1.3 @@ -1 +0,0 @@ -773d47e3985f7e778b662a38b053c1df tilda-0.9.4.tar.gz --- tilda-segfault-fix.patch DELETED --- --- tilda.spec DELETED --- From fedora-extras-commits at redhat.com Thu Feb 15 17:46:11 2007 From: fedora-extras-commits at redhat.com (Josef Whiter (josef)) Date: Thu, 15 Feb 2007 12:46:11 -0500 Subject: rpms/tilda/FC-5 tilda-segfault-fix.patch, 1.2, 1.3 tilda.spec, 1.2, 1.3 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200702151746.l1FHkB7b023483@cvs-int.fedora.redhat.com> Author: josef Update of /cvs/extras/rpms/tilda/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23442 Modified Files: .cvsignore sources Added Files: tilda-segfault-fix.patch tilda.spec Log Message: copying stuff over to get this to work tilda-segfault-fix.patch: Index: tilda-segfault-fix.patch =================================================================== RCS file: tilda-segfault-fix.patch diff -N tilda-segfault-fix.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ tilda-segfault-fix.patch 15 Feb 2007 17:45:39 -0000 1.3 @@ -0,0 +1,14 @@ +--- tilda-0.9.4/src/key_grabber.c.josef 2007-01-22 11:43:36.000000000 -0500 ++++ tilda-0.9.4/src/key_grabber.c 2007-01-22 11:43:49.000000000 -0500 +@@ -241,8 +241,10 @@ static void key_grab (tilda_window *tw) + if (strstr(tmp_key, "None")) + modmask = 0; + +- if (!strstr(tmp_key, "+")) ++ if (!strstr(tmp_key, "+")) { + perror ("Key Incorrect -- Read the README or tilda.sf.net for info, rerun as 'tilda -C' to set keybinding\n"); ++ return; ++ } + + if (strtok(tmp_key, "+")) + key = XStringToKeysym(strtok(NULL, "+")); Index: tilda.spec =================================================================== RCS file: tilda.spec diff -N tilda.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ tilda.spec 15 Feb 2007 17:45:39 -0000 1.3 @@ -0,0 +1,79 @@ +Name: tilda +Version: 0.9.4 +Release: 6%{?dist} +Summary: A quake like terminal for GNOME + +Group: Applications/System +License: GPL +URL: http://tilda.sourceforge.net/ +Source0: http://downloads.sourceforge.net/tilda/%{name}-%{version}.tar.gz +Patch0: tilda-segfault-fix.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: desktop-file-utils, pango-devel, vte-devel +BuildRequires: libconfuse-devel, libXt-devel + +%description +Tilda is a Linux terminal taking after the likeness of many classic terminals +from first person shooter games, Quake, Doom and Half-Life (to name a few), +where the terminal has no border and is hidden from the desktop until a key is +pressed. + +%prep +%setup -q +%patch0 -p1 -b .segfix +echo "Comment=A quake like terminal for GNOME" >> tilda.desktop + +%build +%configure +make %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT +desktop-file-install --delete-original --vendor="fedora" \ + --dir=$RPM_BUILD_ROOT/%{_datadir}/applications \ + --mode 0644 \ + --remove-category="Application" \ + --copy-name-to-generic-name \ + $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop + +install -D -p -m 644 %{name}.png \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING README ChangeLog TODO +%{_bindir}/%{name} +%{_datadir}/pixmaps/%{name}.png +%{_datadir}/icons/hicolor/48x48/apps/%{name}.png +%{_datadir}/applications/fedora-%{name}.desktop + +%changelog +* Mon Jan 22 2007 Josef Whiter 0.9.4-6 +- fix segfault when specifying invalid keybinding + +* Mon Jan 22 2007 Josef Whiter 0.9.4-5 +- install icon into the size specific folder as well + +* Mon Jan 22 2007 Josef Whiter 0.9.4-4 +- fixed changelog entry +- removed NEWS from the %%doc section +- removed gettext from the BR +- added libXt-devel as a BR +- added --remove-category and --copy-name-to-generic name to the desktop-file-install +- added a comment to the desktop file + +* Fri Jan 12 2007 Josef Whiter 0.9.4-3 +- Removed my ghetto doc install script and added %%doc section + +* Thu Jan 11 2007 Josef Whiter 0.9.4-2 +- Added BR for libconfuse-devel + +* Thu Jan 11 2007 Josef Whiter 0.9.4-1 +- Initial Release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tilda/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 15 Feb 2007 17:42:25 -0000 1.3 +++ .cvsignore 15 Feb 2007 17:45:39 -0000 1.4 @@ -0,0 +1 @@ +tilda-0.9.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tilda/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 15 Feb 2007 17:42:25 -0000 1.3 +++ sources 15 Feb 2007 17:45:39 -0000 1.4 @@ -0,0 +1 @@ +773d47e3985f7e778b662a38b053c1df tilda-0.9.4.tar.gz From fedora-extras-commits at redhat.com Thu Feb 15 18:19:58 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Thu, 15 Feb 2007 13:19:58 -0500 Subject: rpms/jd/devel .cvsignore, 1.69, 1.70 jd.spec, 1.80, 1.81 sources, 1.69, 1.70 Message-ID: <200702151819.l1FIJw7D027469@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27448 Modified Files: .cvsignore jd.spec sources Log Message: * Thu Feb 15 2007 Mamoru Tasaka - 1.8.5-2.cvs070215 - cvs 070215 (24:00 JST) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- .cvsignore 13 Feb 2007 17:12:25 -0000 1.69 +++ .cvsignore 15 Feb 2007 18:19:25 -0000 1.70 @@ -1 +1 @@ -jd-1.8.5-cvs070213.tgz +jd-1.8.5-cvs070215.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- jd.spec 13 Feb 2007 17:12:25 -0000 1.80 +++ jd.spec 15 Feb 2007 18:19:25 -0000 1.81 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 1.8.5 -%define strtag cvs070213 +%define strtag cvs070215 %define repoid 23816 @@ -106,8 +106,8 @@ %{icondir}/%{name}.png %changelog -* Tue Feb 13 2007 Mamoru Tasaka - 1.8.5-2.cvs070213 -- cvs 070213 (23:20 JST) +* Thu Feb 15 2007 Mamoru Tasaka - 1.8.5-2.cvs070215 +- cvs 070215 (24:00 JST) * Fri Feb 2 2007 Mamoru Tasaka - 1.8.5-1 - 1.8.5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- sources 13 Feb 2007 17:12:25 -0000 1.69 +++ sources 15 Feb 2007 18:19:25 -0000 1.70 @@ -1 +1 @@ -1b5b64d8cfe15ec18c6f790aae1048aa jd-1.8.5-cvs070213.tgz +b8543ab126b4d78b53b49f6668d75bf7 jd-1.8.5-cvs070215.tgz From fedora-extras-commits at redhat.com Thu Feb 15 19:25:28 2007 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Thu, 15 Feb 2007 14:25:28 -0500 Subject: rpms/aplus-fsf/devel aplus-fsf-4.20-makefile.patch, 1.4, 1.5 aplus-fsf.spec, 1.7, 1.8 Message-ID: <200702151925.l1FJPSQT031448@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/aplus-fsf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31418 Modified Files: aplus-fsf-4.20-makefile.patch aplus-fsf.spec Log Message: Remove dependency to automake-1.6 aplus-fsf-4.20-makefile.patch: Index: aplus-fsf-4.20-makefile.patch =================================================================== RCS file: /cvs/extras/rpms/aplus-fsf/devel/aplus-fsf-4.20-makefile.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- aplus-fsf-4.20-makefile.patch 11 Dec 2006 17:10:19 -0000 1.4 +++ aplus-fsf-4.20-makefile.patch 15 Feb 2007 19:24:56 -0000 1.5 @@ -1,5 +1,57 @@ +--- aplus-fsf-4.20/src/fonts/X11/pcf/Makefile.am.org 2001-01-19 22:11:24.000000000 +0100 ++++ aplus-fsf-4.20/src/fonts/X11/pcf/Makefile.am 2007-02-15 18:37:36.000000000 +0100 +@@ -8,7 +8,7 @@ + ## ## + ############################################################################### + +-fonts_pcfdir = $(prefix)/fonts/X11/pcf ++fonts_pcfdir = @datadir@/fonts/apl/pcf + + fonts_pcf_DATA = \ + Kapl.alias \ +--- aplus-fsf-4.20/src/fonts/X11/Makefile.am.org 2001-01-19 22:10:32.000000000 +0100 ++++ aplus-fsf-4.20/src/fonts/X11/Makefile.am 2007-02-15 18:37:36.000000000 +0100 +@@ -8,4 +8,4 @@ + ## ## + ############################################################################### + +-SUBDIRS = pcf bdf ++SUBDIRS = pcf +--- aplus-fsf-4.20/src/fonts/TrueType/Makefile.am.org 2001-01-19 22:10:06.000000000 +0100 ++++ aplus-fsf-4.20/src/fonts/TrueType/Makefile.am 2007-02-15 18:37:36.000000000 +0100 +@@ -8,7 +8,7 @@ + ## ## + ############################################################################### + +-TrueTypedir = $(prefix)/fonts/TrueType ++TrueTypedir = @datadir@/fonts/apl/TrueType + + TrueType_DATA = KAPL.TTF + +--- aplus-fsf-4.20/src/MSTypes/Makefile.am.org 2001-01-19 21:46:18.000000000 +0100 ++++ aplus-fsf-4.20/src/MSTypes/Makefile.am 2007-02-15 18:37:36.000000000 +0100 +@@ -298,8 +298,7 @@ + MSTypeMatrix.C\ + MSTypeVector.C + +- +- ++libMSTypes_la_LIBADD = -L../a -la -lstdc++ + + INCLUDES = -I.. + +--- aplus-fsf-4.20/src/cxb/Makefile.am.org 2001-01-19 22:28:09.000000000 +0100 ++++ aplus-fsf-4.20/src/cxb/Makefile.am 2007-02-15 18:37:36.000000000 +0100 +@@ -13,5 +13,7 @@ + libcxb_la_SOURCES = \ + binary.c + ++libcxb_la_LIBADD = -L../a -L../dap -la -ldap ++ + INCLUDES = -I.. + --- aplus-fsf-4.20/src/IPC/Makefile.am.org 2001-01-19 21:38:33.000000000 +0100 -+++ aplus-fsf-4.20/src/IPC/Makefile.am 2006-12-10 23:05:42.000000000 +0100 ++++ aplus-fsf-4.20/src/IPC/Makefile.am 2007-02-15 18:37:36.000000000 +0100 @@ -52,6 +52,8 @@ pString_Connection.H\ pString_Listener.H @@ -10,7 +62,7 @@ idapdir = $(libdir) --- aplus-fsf-4.20/src/cxs/Makefile.am.org 2001-11-25 21:31:02.000000000 +0100 -+++ aplus-fsf-4.20/src/cxs/Makefile.am 2006-12-10 23:04:20.000000000 +0100 ++++ aplus-fsf-4.20/src/cxs/Makefile.am 2007-02-15 18:37:36.000000000 +0100 @@ -12,6 +12,8 @@ libcxs_la_SOURCES = S.c @@ -20,18 +72,8 @@ INCLUDES = -I.. sdir = $(libdir) ---- aplus-fsf-4.20/src/cxb/Makefile.am.org 2001-01-19 22:28:09.000000000 +0100 -+++ aplus-fsf-4.20/src/cxb/Makefile.am 2006-12-10 23:03:38.000000000 +0100 -@@ -13,5 +13,7 @@ - libcxb_la_SOURCES = \ - binary.c - -+libcxb_la_LIBADD = -L../a -L../dap -la -ldap -+ - INCLUDES = -I.. - --- aplus-fsf-4.20/src/AplusGUI/Makefile.am.org 2001-01-30 21:48:35.000000000 +0100 -+++ aplus-fsf-4.20/src/AplusGUI/Makefile.am 2006-12-10 23:03:11.000000000 +0100 ++++ aplus-fsf-4.20/src/AplusGUI/Makefile.am 2007-02-15 18:37:36.000000000 +0100 @@ -125,5 +125,7 @@ EnumTables.H\ Macros.H @@ -40,57 +82,8 @@ + INCLUDES = -I.. -I/usr/X11R6/include ---- aplus-fsf-4.20/src/cxsys/Makefile.am.org 2001-01-19 22:28:29.000000000 +0100 -+++ aplus-fsf-4.20/src/cxsys/Makefile.am 2006-12-10 23:04:40.000000000 +0100 -@@ -20,5 +20,7 @@ - impexp.c \ - impexp.h - -+libcxsys_la_LIBADD = -L../a -L../dap -L../cxc -la -ldap -lcxc -+ - INCLUDES = -I.. - ---- aplus-fsf-4.20/src/cxc/Makefile.am.org 2001-01-19 22:28:18.000000000 +0100 -+++ aplus-fsf-4.20/src/cxc/Makefile.am 2006-12-10 23:03:55.000000000 +0100 -@@ -15,5 +15,7 @@ - cform.c \ - cxc.h - -+libcxc_la_LIBADD = -L../a -la -+ - INCLUDES = -I.. - ---- aplus-fsf-4.20/src/esf/Makefile.am.org 2001-01-19 22:28:59.000000000 +0100 -+++ aplus-fsf-4.20/src/esf/Makefile.am 2006-12-10 23:05:25.000000000 +0100 -@@ -24,5 +24,7 @@ - kcheck.c \ - dyld2.c - -+libesf_la_LIBADD = -L../a -L../dap -la -ldap -+ - INCLUDES = -I.. - ---- aplus-fsf-4.20/src/a/Makefile.am.org 2003-12-30 16:27:54.000000000 +0100 -+++ aplus-fsf-4.20/src/a/Makefile.am 2006-12-10 23:02:46.000000000 +0100 -@@ -49,6 +49,7 @@ - s.h\ - x.h - -+liba_la_LIBADD = -L../dap -ldap - - CFLAGS = @CFLAGS@ -DBSTUB - -@@ -66,7 +67,7 @@ - - EXTRA_DIST = fsftest.+ apter.+ t.+ dio.+ - --a_includedir = $(prefix)/include/a -+a_includedir = $(prefix)/include/a+ - a_include_DATA = \ - beam.h \ - fir.h \ --- aplus-fsf-4.20/src/MSGUI/Makefile.am.org 2001-01-30 21:49:25.000000000 +0100 -+++ aplus-fsf-4.20/src/MSGUI/Makefile.am 2006-12-10 23:06:16.000000000 +0100 ++++ aplus-fsf-4.20/src/MSGUI/Makefile.am 2007-02-15 18:37:36.000000000 +0100 @@ -382,6 +382,8 @@ MSWidgetView.H\ MSWindow.H @@ -100,83 +93,8 @@ EXTRA_DIST = \ MSArrayViewInlines.C\ MSCompositeTextInlines.C\ ---- aplus-fsf-4.20/src/MSIPC/Makefile.am.org 2001-01-19 21:44:13.000000000 +0100 -+++ aplus-fsf-4.20/src/MSIPC/Makefile.am 2006-12-10 23:06:39.000000000 +0100 -@@ -52,6 +52,8 @@ - MSTimer.H\ - MSTv.H - -+libMSIPC_la_LIBADD = -L../MSTypes -lMSTypes -+ - EXTRA_DIST = MSProtocolConnection.C - - INCLUDES = -I.. ---- aplus-fsf-4.20/src/MSTypes/Makefile.am.org 2001-01-19 21:46:18.000000000 +0100 -+++ aplus-fsf-4.20/src/MSTypes/Makefile.am 2006-12-10 23:07:02.000000000 +0100 -@@ -298,8 +298,7 @@ - MSTypeMatrix.C\ - MSTypeVector.C - -- -- -+libMSTypes_la_LIBADD = -L../a -la -lstdc++ - - INCLUDES = -I.. - ---- aplus-fsf-4.20/src/main/aplus_main.c.org 2005-08-29 16:47:10.000000000 +0200 -+++ aplus-fsf-4.20/src/main/aplus_main.c 2006-12-10 22:01:34.000000000 +0100 -@@ -64,7 +64,7 @@ - static C *_whoseTree = ""; - static C *_banner = BANNER; - static C *_copyright = COPYRIGHT; --static C *_defaultATREE = (char *)0; -+static C *_defaultATREE = (char *)"/usr/lib/a+"; - static C *_version = (char *)0; - static C *usage = "usage: a+ [-d display] [-s] [-w workarea] [-q] [-h megsforheap] [-m atmpMode] [script [args]]\n"; - static I _enable_coredump; ---- aplus-fsf-4.20/src/fonts/TrueType/Makefile.am.org 2001-01-19 22:10:06.000000000 +0100 -+++ aplus-fsf-4.20/src/fonts/TrueType/Makefile.am 2006-12-10 22:01:34.000000000 +0100 -@@ -8,7 +8,7 @@ - ## ## - ############################################################################### - --TrueTypedir = $(prefix)/fonts/TrueType -+TrueTypedir = @datadir@/fonts/apl/TrueType - - TrueType_DATA = KAPL.TTF - ---- aplus-fsf-4.20/src/fonts/X11/pcf/Makefile.am.org 2001-01-19 22:11:24.000000000 +0100 -+++ aplus-fsf-4.20/src/fonts/X11/pcf/Makefile.am 2006-12-10 22:01:34.000000000 +0100 -@@ -8,7 +8,7 @@ - ## ## - ############################################################################### - --fonts_pcfdir = $(prefix)/fonts/X11/pcf -+fonts_pcfdir = @datadir@/fonts/apl/pcf - - fonts_pcf_DATA = \ - Kapl.alias \ ---- aplus-fsf-4.20/src/fonts/X11/Makefile.am.org 2001-01-19 22:10:32.000000000 +0100 -+++ aplus-fsf-4.20/src/fonts/X11/Makefile.am 2006-12-10 22:01:34.000000000 +0100 -@@ -8,4 +8,4 @@ - ## ## - ############################################################################### - --SUBDIRS = pcf bdf -+SUBDIRS = pcf ---- aplus-fsf-4.20/src/app-defaults/Makefile.am.org 2001-01-22 21:35:46.000000000 +0100 -+++ aplus-fsf-4.20/src/app-defaults/Makefile.am 2006-12-10 22:01:34.000000000 +0100 -@@ -8,7 +8,7 @@ - ## ## - ############################################################################### - --appdefaultsdir = $(prefix)/app-defaults -+appdefaultsdir = @datadir@/X11/app-defaults - - appdefaults_DATA = XTerm - --- aplus-fsf-4.20/src/lisp.1/Makefile.am.org 2001-03-09 23:38:09.000000000 +0100 -+++ aplus-fsf-4.20/src/lisp.1/Makefile.am 2006-12-10 22:01:34.000000000 +0100 ++++ aplus-fsf-4.20/src/lisp.1/Makefile.am 2007-02-15 18:37:36.000000000 +0100 @@ -8,10 +8,9 @@ ## ## ############################################################################### @@ -197,46 +115,8 @@ a.el \ a-font.el \ aplus.el \ ---- aplus-fsf-4.20/src/lisp.0/Makefile.in.org 2005-08-29 05:22:17.000000000 +0200 -+++ aplus-fsf-4.20/src/lisp.0/Makefile.in 2006-12-10 22:01:44.000000000 +0100 -@@ -69,6 +69,7 @@ - OBJEXT = @OBJEXT@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - AMTAR = @AMTAR@ -+APLVERSION = @APLVERSION@ - AS = @AS@ - AWK = @AWK@ - CC = @CC@ -@@ -80,6 +81,10 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_DEPS = @LIBTOOL_DEPS@ - LN_S = @LN_S@ -+LT_AGE = @LT_AGE@ -+LT_CURRENT = @LT_CURRENT@ -+LT_RELEASE = @LT_RELEASE@ -+LT_REVISION = @LT_REVISION@ - MAINT = @MAINT@ - OBJDUMP = @OBJDUMP@ - PACKAGE = @PACKAGE@ -@@ -88,6 +93,7 @@ - VERSION = @VERSION@ - X_INCLUDES = @X_INCLUDES@ - X_LIBS = @X_LIBS@ -+X_PREFIX = @X_PREFIX@ - am__include = @am__include@ - am__quote = @am__quote@ - install_sh = @install_sh@ -@@ -121,7 +127,7 @@ - .SUFFIXES: - $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign src/lisp.0/Makefile -+ $(AUTOMAKE) --gnu src/lisp.0/Makefile - Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - --- aplus-fsf-4.20/src/Makefile.am.org 2005-08-29 04:55:30.000000000 +0200 -+++ aplus-fsf-4.20/src/Makefile.am 2006-12-10 22:01:34.000000000 +0100 ++++ aplus-fsf-4.20/src/Makefile.am 2007-02-15 18:37:36.000000000 +0100 @@ -9,24 +9,21 @@ ############################################################################### @@ -271,8 +151,510 @@ + lisp.1 EXTRA_DIST = LICENSE +--- aplus-fsf-4.20/src/cxsys/Makefile.am.org 2001-01-19 22:28:29.000000000 +0100 ++++ aplus-fsf-4.20/src/cxsys/Makefile.am 2007-02-15 18:37:36.000000000 +0100 +@@ -20,5 +20,7 @@ + impexp.c \ + impexp.h + ++libcxsys_la_LIBADD = -L../a -L../dap -L../cxc -la -ldap -lcxc ++ + INCLUDES = -I.. + +--- aplus-fsf-4.20/src/esf/Makefile.am.org 2001-01-19 22:28:59.000000000 +0100 ++++ aplus-fsf-4.20/src/esf/Makefile.am 2007-02-15 18:37:36.000000000 +0100 +@@ -24,5 +24,7 @@ + kcheck.c \ + dyld2.c + ++libesf_la_LIBADD = -L../a -L../dap -la -ldap ++ + INCLUDES = -I.. + +--- aplus-fsf-4.20/src/app-defaults/Makefile.am.org 2001-01-22 21:35:46.000000000 +0100 ++++ aplus-fsf-4.20/src/app-defaults/Makefile.am 2007-02-15 18:37:36.000000000 +0100 +@@ -8,7 +8,7 @@ + ## ## + ############################################################################### + +-appdefaultsdir = $(prefix)/app-defaults ++appdefaultsdir = @datadir@/X11/app-defaults + + appdefaults_DATA = XTerm + +--- aplus-fsf-4.20/src/main/aplus_main.c.org 2005-08-29 16:47:10.000000000 +0200 ++++ aplus-fsf-4.20/src/main/aplus_main.c 2007-02-15 18:37:36.000000000 +0100 +@@ -64,7 +64,7 @@ + static C *_whoseTree = ""; + static C *_banner = BANNER; + static C *_copyright = COPYRIGHT; +-static C *_defaultATREE = (char *)0; ++static C *_defaultATREE = (char *)"/usr/lib/a+"; + static C *_version = (char *)0; + static C *usage = "usage: a+ [-d display] [-s] [-w workarea] [-q] [-h megsforheap] [-m atmpMode] [script [args]]\n"; + static I _enable_coredump; +--- aplus-fsf-4.20/src/main/Makefile.am.org 2007-02-15 18:43:29.000000000 +0100 ++++ aplus-fsf-4.20/src/main/Makefile.am 2007-02-15 18:43:46.000000000 +0100 +@@ -21,7 +21,7 @@ + matherr.c \ + version.h + +-CFLAGS = @CFLAGS@ -DBSTUB ++AM_CFLAGS = @CFLAGS@ -DBSTUB + + INCLUDES = -I.. $(X_INCLUDES) + +--- aplus-fsf-4.20/src/MSIPC/Makefile.am.org 2001-01-19 21:44:13.000000000 +0100 ++++ aplus-fsf-4.20/src/MSIPC/Makefile.am 2007-02-15 18:37:36.000000000 +0100 +@@ -52,6 +52,8 @@ + MSTimer.H\ + MSTv.H + ++libMSIPC_la_LIBADD = -L../MSTypes -lMSTypes ++ + EXTRA_DIST = MSProtocolConnection.C + + INCLUDES = -I.. +--- aplus-fsf-4.20/src/a/Makefile.am.org 2007-02-15 18:42:45.000000000 +0100 ++++ aplus-fsf-4.20/src/a/Makefile.am 2007-02-15 18:43:12.000000000 +0100 +@@ -51,7 +51,7 @@ + + liba_la_LIBADD = -L../dap -ldap + +-CFLAGS = @CFLAGS@ -DBSTUB ++AM_CFLAGS = @CFLAGS@ -DBSTUB + + INCLUDES = -I.. + +--- aplus-fsf-4.20/src/lisp.0/Makefile.in.org 2005-08-29 05:22:17.000000000 +0200 ++++ aplus-fsf-4.20/src/lisp.0/Makefile.in 2007-02-15 18:37:43.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.6.3 from Makefile.am. ++# Makefile.in generated by automake 1.9.6 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,84 +16,161 @@ + + ############################################################################### + ############################################################################### +-SHELL = @SHELL@ + + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +-prefix = @prefix@ +-exec_prefix = @exec_prefix@ +- +-bindir = @bindir@ +-sbindir = @sbindir@ +-libexecdir = @libexecdir@ +-datadir = @datadir@ +-sysconfdir = @sysconfdir@ +-sharedstatedir = @sharedstatedir@ +-localstatedir = @localstatedir@ +-libdir = @libdir@ +-infodir = @infodir@ +-mandir = @mandir@ +-includedir = @includedir@ +-oldincludedir = /usr/include + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + top_builddir = ../.. +- +-ACLOCAL = @ACLOCAL@ +-AUTOCONF = @AUTOCONF@ +-AUTOMAKE = @AUTOMAKE@ +-AUTOHEADER = @AUTOHEADER@ +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + INSTALL = @INSTALL@ +-INSTALL_PROGRAM = @INSTALL_PROGRAM@ +-INSTALL_DATA = @INSTALL_DATA@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +-INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_HEADER = $(INSTALL_DATA) +-transform = @program_transform_name@ ++transform = $(program_transform_name) + NORMAL_INSTALL = : + PRE_INSTALL = : + POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-host_alias = @host_alias@ ++build_triplet = @build@ + host_triplet = @host@ +- +-EXEEXT = @EXEEXT@ +-OBJEXT = @OBJEXT@ +-PATH_SEPARATOR = @PATH_SEPARATOR@ ++subdir = src/lisp.0 ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs ++CONFIG_CLEAN_FILES = ++SOURCES = ++DIST_SOURCES = ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__installdirs = "$(DESTDIR)$(lisp0dir)" ++lisp0DATA_INSTALL = $(INSTALL_DATA) ++DATA = $(lisp0_DATA) ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = @ACLOCAL@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ +-AS = @AS@ ++APLVERSION = @APLVERSION@ ++AR = @AR@ ++AUTOCONF = @AUTOCONF@ ++AUTOHEADER = @AUTOHEADER@ ++AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + CC = @CC@ ++CCDEPMODE = @CCDEPMODE@ ++CFLAGS = @CFLAGS@ ++CPP = @CPP@ ++CPPFLAGS = @CPPFLAGS@ + CXX = @CXX@ ++CXXCPP = @CXXCPP@ ++CXXDEPMODE = @CXXDEPMODE@ ++CXXFLAGS = @CXXFLAGS@ ++CYGPATH_W = @CYGPATH_W@ ++DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DLLTOOL = @DLLTOOL@ + ECHO = @ECHO@ ++ECHO_C = @ECHO_C@ ++ECHO_N = @ECHO_N@ ++ECHO_T = @ECHO_T@ ++EGREP = @EGREP@ ++EXEEXT = @EXEEXT@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ ++GREP = @GREP@ ++INSTALL_DATA = @INSTALL_DATA@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ++LDFLAGS = @LDFLAGS@ ++LIBOBJS = @LIBOBJS@ ++LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_DEPS = @LIBTOOL_DEPS@ + LN_S = @LN_S@ ++LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-OBJDUMP = @OBJDUMP@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ ++MAKEINFO = @MAKEINFO@ ++OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ ++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ ++PACKAGE_NAME = @PACKAGE_NAME@ ++PACKAGE_STRING = @PACKAGE_STRING@ ++PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_VERSION = @PACKAGE_VERSION@ ++PATH_SEPARATOR = @PATH_SEPARATOR@ + RANLIB = @RANLIB@ ++SED = @SED@ ++SET_MAKE = @SET_MAKE@ ++SHELL = @SHELL@ + STRIP = @STRIP@ + VERSION = @VERSION@ ++XMKMF = @XMKMF@ + X_INCLUDES = @X_INCLUDES@ + X_LIBS = @X_LIBS@ ++X_PREFIX = @X_PREFIX@ ++ac_ct_CC = @ac_ct_CC@ ++ac_ct_CXX = @ac_ct_CXX@ ++ac_ct_F77 = @ac_ct_F77@ ++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ ++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ ++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ ++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ ++am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ ++bindir = @bindir@ ++build = @build@ ++build_alias = @build_alias@ ++build_cpu = @build_cpu@ ++build_os = @build_os@ ++build_vendor = @build_vendor@ ++datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ ++exec_prefix = @exec_prefix@ ++host = @host@ ++host_alias = @host_alias@ ++host_cpu = @host_cpu@ ++host_os = @host_os@ ++host_vendor = @host_vendor@ ++htmldir = @htmldir@ ++includedir = @includedir@ ++infodir = @infodir@ + install_sh = @install_sh@ +- ++libdir = @libdir@ ++libexecdir = @libexecdir@ ++localedir = @localedir@ ++localstatedir = @localstatedir@ ++mandir = @mandir@ ++mkdir_p = @mkdir_p@ ++oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ ++prefix = @prefix@ ++program_transform_name = @program_transform_name@ ++psdir = @psdir@ ++sbindir = @sbindir@ ++sharedstatedir = @sharedstatedir@ ++sysconfdir = @sysconfdir@ ++target_alias = @target_alias@ + lisp0dir = $(prefix)/lisp.0 +- + lisp0_DATA = \ + .emacs \ + a.el \ +@@ -101,7 +178,6 @@ + keyb.el \ + xa.el + +- + EXTRA_DIST = \ + .emacs \ + a.el \ +@@ -109,21 +185,38 @@ + keyb.el \ + xa.el + +-subdir = src/lisp.0 +-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs +-CONFIG_CLEAN_FILES = +-DIST_SOURCES = +-DATA = $(lisp0_DATA) +- +-DIST_COMMON = Makefile.am Makefile.in + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lisp.0/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign src/lisp.0/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++ $(AUTOMAKE) --gnu src/lisp.0/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + mostlyclean-libtool: + -rm -f *.lo +@@ -134,39 +227,43 @@ + distclean-libtool: + -rm -f libtool + uninstall-info-am: +-lisp0DATA_INSTALL = $(INSTALL_DATA) + install-lisp0DATA: $(lisp0_DATA) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(lisp0dir) ++ test -z "$(lisp0dir)" || $(mkdir_p) "$(DESTDIR)$(lisp0dir)" + @list='$(lisp0_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(lisp0DATA_INSTALL) $$d$$p $(DESTDIR)$(lisp0dir)/$$f"; \ +- $(lisp0DATA_INSTALL) $$d$$p $(DESTDIR)$(lisp0dir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(lisp0DATA_INSTALL) '$$d$$p' '$(DESTDIR)$(lisp0dir)/$$f'"; \ ++ $(lisp0DATA_INSTALL) "$$d$$p" "$(DESTDIR)$(lisp0dir)/$$f"; \ + done + + uninstall-lisp0DATA: + @$(NORMAL_UNINSTALL) + @list='$(lisp0_DATA)'; for p in $$list; do \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " rm -f $(DESTDIR)$(lisp0dir)/$$f"; \ +- rm -f $(DESTDIR)$(lisp0dir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(lisp0dir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(lisp0dir)/$$f"; \ + done + tags: TAGS + TAGS: + +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ctags: CTAGS ++CTAGS: + +-top_distdir = ../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- @list='$(DISTFILES)'; for file in $$list; do \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ++ list='$(DISTFILES)'; for file in $$list; do \ ++ case $$file in \ ++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ++ esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ ++ $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ +@@ -184,10 +281,10 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) +- + installdirs: +- $(mkinstalldirs) $(DESTDIR)$(lisp0dir) +- ++ for dir in "$(DESTDIR)$(lisp0dir)"; do \ ++ test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ done + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -199,7 +296,7 @@ + installcheck: installcheck-am + install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- INSTALL_STRIP_FLAG=-s \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + mostlyclean-generic: +@@ -207,7 +304,7 @@ + clean-generic: + + distclean-generic: +- -rm -f Makefile $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -217,13 +314,15 @@ + clean-am: clean-generic clean-libtool mostlyclean-am + + distclean: distclean-am +- ++ -rm -f Makefile + distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + ++html: html-am ++ + info: info-am + + info-am: +@@ -239,24 +338,32 @@ + installcheck-am: + + maintainer-clean: maintainer-clean-am +- ++ -rm -f Makefile + maintainer-clean-am: distclean-am maintainer-clean-generic + + mostlyclean: mostlyclean-am + + mostlyclean-am: mostlyclean-generic mostlyclean-libtool + ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ + uninstall-am: uninstall-info-am uninstall-lisp0DATA + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am info info-am install install-am install-data \ +- install-data-am install-exec install-exec-am install-info \ +- install-info-am install-lisp0DATA install-man install-strip \ +- installcheck installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic \ +- mostlyclean-libtool uninstall uninstall-am uninstall-info-am \ +- uninstall-lisp0DATA ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-exec install-exec-am \ ++ install-info install-info-am install-lisp0DATA install-man \ ++ install-strip installcheck installcheck-am installdirs \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ uninstall uninstall-am uninstall-info-am uninstall-lisp0DATA + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +--- aplus-fsf-4.20/src/cxc/Makefile.am.org 2001-01-19 22:28:18.000000000 +0100 ++++ aplus-fsf-4.20/src/cxc/Makefile.am 2007-02-15 18:37:36.000000000 +0100 +@@ -15,5 +15,7 @@ + cform.c \ + cxc.h + ++libcxc_la_LIBADD = -L../a -la ++ + INCLUDES = -I.. + --- aplus-fsf-4.20/configure.in.org 2005-08-29 05:22:02.000000000 +0200 -+++ aplus-fsf-4.20/configure.in 2006-12-10 23:08:05.000000000 +0100 ++++ aplus-fsf-4.20/configure.in 2007-02-15 18:37:36.000000000 +0100 @@ -17,6 +17,10 @@ AM_PROG_LIBTOOL AC_SUBST(LIBTOOL_DEPS) Index: aplus-fsf.spec =================================================================== RCS file: /cvs/extras/rpms/aplus-fsf/devel/aplus-fsf.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- aplus-fsf.spec 13 Feb 2007 17:32:04 -0000 1.7 +++ aplus-fsf.spec 15 Feb 2007 19:24:56 -0000 1.8 @@ -15,7 +15,7 @@ Name: %name Version: 4.20.2 -Release: 13%{?dist} +Release: 15%{?dist} License: GPL Summary: Advanced APL interpreter with s interface @@ -31,7 +31,7 @@ Patch4: aplus-fsf-4.20-atree.patch BuildRequires: xorg-x11-proto-devel -BuildRequires: automake16 autoconf +BuildRequires: automake autoconf Requires: xterm @@ -106,15 +106,16 @@ # export CXXFLAGS=-O3 CFLAGS=-O3 export CFLAGS=$RPM_OPT_FLAGS export CXXLFAGS=$RPM_OPT_FLAGS -automake-1.6 +aclocal +automake autoconf %configure --prefix=/usr -make %{?_smp_mflags} +make %{?_smp_mflags} LIBTOOL="/usr/bin/libtool" %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL='/usr/bin/libtool' rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.a @@ -142,7 +143,11 @@ cp -R src/scripts samples +mv $RPM_BUILD_ROOT/%{_includedir}/a $RPM_BUILD_ROOT/%{_includedir}/a+ + +%ifarch x86_64 mv samples/Makefile samples/Makefile-%{_arch} +%endif pushd $RPM_BUILD_ROOT/%{_x11fonts}/ @@ -258,6 +263,12 @@ %ghost %verify(not md5 size mtime) %{_ttffonts}/fonts.cache-* %Changelog +* Thu Feb 15 2007 Jochen Schmitt 4.20.2-15 +- Remove dependency to automake-1.6 + +* Wed Feb 14 2007 Jochen Schmitt 4.20.2-14 +- A beeter solution for the multilib issue + * Tue Feb 13 2007 Jochen Schmitt 4.20.2-13 - Solve multilib issue (#228353) From fedora-extras-commits at redhat.com Thu Feb 15 19:43:30 2007 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Thu, 15 Feb 2007 14:43:30 -0500 Subject: rpms/aplus-fsf/devel aplus-fsf-4.20-makefile.patch, 1.5, 1.6 aplus-fsf.spec, 1.8, 1.9 Message-ID: <200702151943.l1FJhUro031767@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/aplus-fsf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31740 Modified Files: aplus-fsf-4.20-makefile.patch aplus-fsf.spec Log Message: Try it again aplus-fsf-4.20-makefile.patch: Index: aplus-fsf-4.20-makefile.patch =================================================================== RCS file: /cvs/extras/rpms/aplus-fsf/devel/aplus-fsf-4.20-makefile.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- aplus-fsf-4.20-makefile.patch 15 Feb 2007 19:24:56 -0000 1.5 +++ aplus-fsf-4.20-makefile.patch 15 Feb 2007 19:42:57 -0000 1.6 @@ -1,5 +1,5 @@ --- aplus-fsf-4.20/src/fonts/X11/pcf/Makefile.am.org 2001-01-19 22:11:24.000000000 +0100 -+++ aplus-fsf-4.20/src/fonts/X11/pcf/Makefile.am 2007-02-15 18:37:36.000000000 +0100 ++++ aplus-fsf-4.20/src/fonts/X11/pcf/Makefile.am 2007-02-15 20:37:49.000000000 +0100 @@ -8,7 +8,7 @@ ## ## ############################################################################### @@ -10,7 +10,7 @@ fonts_pcf_DATA = \ Kapl.alias \ --- aplus-fsf-4.20/src/fonts/X11/Makefile.am.org 2001-01-19 22:10:32.000000000 +0100 -+++ aplus-fsf-4.20/src/fonts/X11/Makefile.am 2007-02-15 18:37:36.000000000 +0100 ++++ aplus-fsf-4.20/src/fonts/X11/Makefile.am 2007-02-15 20:37:49.000000000 +0100 @@ -8,4 +8,4 @@ ## ## ############################################################################### @@ -18,7 +18,7 @@ -SUBDIRS = pcf bdf +SUBDIRS = pcf --- aplus-fsf-4.20/src/fonts/TrueType/Makefile.am.org 2001-01-19 22:10:06.000000000 +0100 -+++ aplus-fsf-4.20/src/fonts/TrueType/Makefile.am 2007-02-15 18:37:36.000000000 +0100 ++++ aplus-fsf-4.20/src/fonts/TrueType/Makefile.am 2007-02-15 20:37:49.000000000 +0100 @@ -8,7 +8,7 @@ ## ## ############################################################################### @@ -29,7 +29,7 @@ TrueType_DATA = KAPL.TTF --- aplus-fsf-4.20/src/MSTypes/Makefile.am.org 2001-01-19 21:46:18.000000000 +0100 -+++ aplus-fsf-4.20/src/MSTypes/Makefile.am 2007-02-15 18:37:36.000000000 +0100 ++++ aplus-fsf-4.20/src/MSTypes/Makefile.am 2007-02-15 20:37:49.000000000 +0100 @@ -298,8 +298,7 @@ MSTypeMatrix.C\ MSTypeVector.C @@ -41,7 +41,7 @@ INCLUDES = -I.. --- aplus-fsf-4.20/src/cxb/Makefile.am.org 2001-01-19 22:28:09.000000000 +0100 -+++ aplus-fsf-4.20/src/cxb/Makefile.am 2007-02-15 18:37:36.000000000 +0100 ++++ aplus-fsf-4.20/src/cxb/Makefile.am 2007-02-15 20:37:49.000000000 +0100 @@ -13,5 +13,7 @@ libcxb_la_SOURCES = \ binary.c @@ -51,7 +51,7 @@ INCLUDES = -I.. --- aplus-fsf-4.20/src/IPC/Makefile.am.org 2001-01-19 21:38:33.000000000 +0100 -+++ aplus-fsf-4.20/src/IPC/Makefile.am 2007-02-15 18:37:36.000000000 +0100 ++++ aplus-fsf-4.20/src/IPC/Makefile.am 2007-02-15 20:37:49.000000000 +0100 @@ -52,6 +52,8 @@ pString_Connection.H\ pString_Listener.H @@ -62,7 +62,7 @@ idapdir = $(libdir) --- aplus-fsf-4.20/src/cxs/Makefile.am.org 2001-11-25 21:31:02.000000000 +0100 -+++ aplus-fsf-4.20/src/cxs/Makefile.am 2007-02-15 18:37:36.000000000 +0100 ++++ aplus-fsf-4.20/src/cxs/Makefile.am 2007-02-15 20:37:49.000000000 +0100 @@ -12,6 +12,8 @@ libcxs_la_SOURCES = S.c @@ -73,7 +73,7 @@ sdir = $(libdir) --- aplus-fsf-4.20/src/AplusGUI/Makefile.am.org 2001-01-30 21:48:35.000000000 +0100 -+++ aplus-fsf-4.20/src/AplusGUI/Makefile.am 2007-02-15 18:37:36.000000000 +0100 ++++ aplus-fsf-4.20/src/AplusGUI/Makefile.am 2007-02-15 20:37:49.000000000 +0100 @@ -125,5 +125,7 @@ EnumTables.H\ Macros.H @@ -83,7 +83,7 @@ INCLUDES = -I.. -I/usr/X11R6/include --- aplus-fsf-4.20/src/MSGUI/Makefile.am.org 2001-01-30 21:49:25.000000000 +0100 -+++ aplus-fsf-4.20/src/MSGUI/Makefile.am 2007-02-15 18:37:36.000000000 +0100 ++++ aplus-fsf-4.20/src/MSGUI/Makefile.am 2007-02-15 20:37:49.000000000 +0100 @@ -382,6 +382,8 @@ MSWidgetView.H\ MSWindow.H @@ -94,7 +94,7 @@ MSArrayViewInlines.C\ MSCompositeTextInlines.C\ --- aplus-fsf-4.20/src/lisp.1/Makefile.am.org 2001-03-09 23:38:09.000000000 +0100 -+++ aplus-fsf-4.20/src/lisp.1/Makefile.am 2007-02-15 18:37:36.000000000 +0100 ++++ aplus-fsf-4.20/src/lisp.1/Makefile.am 2007-02-15 20:37:49.000000000 +0100 @@ -8,10 +8,9 @@ ## ## ############################################################################### @@ -116,7 +116,7 @@ a-font.el \ aplus.el \ --- aplus-fsf-4.20/src/Makefile.am.org 2005-08-29 04:55:30.000000000 +0200 -+++ aplus-fsf-4.20/src/Makefile.am 2007-02-15 18:37:36.000000000 +0100 ++++ aplus-fsf-4.20/src/Makefile.am 2007-02-15 20:37:49.000000000 +0100 @@ -9,24 +9,21 @@ ############################################################################### @@ -152,7 +152,7 @@ EXTRA_DIST = LICENSE --- aplus-fsf-4.20/src/cxsys/Makefile.am.org 2001-01-19 22:28:29.000000000 +0100 -+++ aplus-fsf-4.20/src/cxsys/Makefile.am 2007-02-15 18:37:36.000000000 +0100 ++++ aplus-fsf-4.20/src/cxsys/Makefile.am 2007-02-15 20:37:49.000000000 +0100 @@ -20,5 +20,7 @@ impexp.c \ impexp.h @@ -162,7 +162,7 @@ INCLUDES = -I.. --- aplus-fsf-4.20/src/esf/Makefile.am.org 2001-01-19 22:28:59.000000000 +0100 -+++ aplus-fsf-4.20/src/esf/Makefile.am 2007-02-15 18:37:36.000000000 +0100 ++++ aplus-fsf-4.20/src/esf/Makefile.am 2007-02-15 20:37:49.000000000 +0100 @@ -24,5 +24,7 @@ kcheck.c \ dyld2.c @@ -172,7 +172,7 @@ INCLUDES = -I.. --- aplus-fsf-4.20/src/app-defaults/Makefile.am.org 2001-01-22 21:35:46.000000000 +0100 -+++ aplus-fsf-4.20/src/app-defaults/Makefile.am 2007-02-15 18:37:36.000000000 +0100 ++++ aplus-fsf-4.20/src/app-defaults/Makefile.am 2007-02-15 20:37:49.000000000 +0100 @@ -8,7 +8,7 @@ ## ## ############################################################################### @@ -183,7 +183,7 @@ appdefaults_DATA = XTerm --- aplus-fsf-4.20/src/main/aplus_main.c.org 2005-08-29 16:47:10.000000000 +0200 -+++ aplus-fsf-4.20/src/main/aplus_main.c 2007-02-15 18:37:36.000000000 +0100 ++++ aplus-fsf-4.20/src/main/aplus_main.c 2007-02-15 20:37:49.000000000 +0100 @@ -64,7 +64,7 @@ static C *_whoseTree = ""; static C *_banner = BANNER; @@ -193,8 +193,8 @@ static C *_version = (char *)0; static C *usage = "usage: a+ [-d display] [-s] [-w workarea] [-q] [-h megsforheap] [-m atmpMode] [script [args]]\n"; static I _enable_coredump; ---- aplus-fsf-4.20/src/main/Makefile.am.org 2007-02-15 18:43:29.000000000 +0100 -+++ aplus-fsf-4.20/src/main/Makefile.am 2007-02-15 18:43:46.000000000 +0100 +--- aplus-fsf-4.20/src/main/Makefile.am.org 2005-08-29 03:32:27.000000000 +0200 ++++ aplus-fsf-4.20/src/main/Makefile.am 2007-02-15 20:37:49.000000000 +0100 @@ -21,7 +21,7 @@ matherr.c \ version.h @@ -205,7 +205,7 @@ INCLUDES = -I.. $(X_INCLUDES) --- aplus-fsf-4.20/src/MSIPC/Makefile.am.org 2001-01-19 21:44:13.000000000 +0100 -+++ aplus-fsf-4.20/src/MSIPC/Makefile.am 2007-02-15 18:37:36.000000000 +0100 ++++ aplus-fsf-4.20/src/MSIPC/Makefile.am 2007-02-15 20:37:49.000000000 +0100 @@ -52,6 +52,8 @@ MSTimer.H\ MSTv.H @@ -215,11 +215,11 @@ EXTRA_DIST = MSProtocolConnection.C INCLUDES = -I.. ---- aplus-fsf-4.20/src/a/Makefile.am.org 2007-02-15 18:42:45.000000000 +0100 -+++ aplus-fsf-4.20/src/a/Makefile.am 2007-02-15 18:43:12.000000000 +0100 -@@ -51,7 +51,7 @@ +--- aplus-fsf-4.20/src/a/Makefile.am.org 2003-12-30 16:27:54.000000000 +0100 ++++ aplus-fsf-4.20/src/a/Makefile.am 2007-02-15 20:37:49.000000000 +0100 +@@ -50,7 +50,7 @@ + x.h - liba_la_LIBADD = -L../dap -ldap -CFLAGS = @CFLAGS@ -DBSTUB +AM_CFLAGS = @CFLAGS@ -DBSTUB @@ -227,7 +227,7 @@ INCLUDES = -I.. --- aplus-fsf-4.20/src/lisp.0/Makefile.in.org 2005-08-29 05:22:17.000000000 +0200 -+++ aplus-fsf-4.20/src/lisp.0/Makefile.in 2007-02-15 18:37:43.000000000 +0100 ++++ aplus-fsf-4.20/src/lisp.0/Makefile.in 2007-02-15 20:37:49.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.6.3 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. @@ -644,7 +644,7 @@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- aplus-fsf-4.20/src/cxc/Makefile.am.org 2001-01-19 22:28:18.000000000 +0100 -+++ aplus-fsf-4.20/src/cxc/Makefile.am 2007-02-15 18:37:36.000000000 +0100 ++++ aplus-fsf-4.20/src/cxc/Makefile.am 2007-02-15 20:37:49.000000000 +0100 @@ -15,5 +15,7 @@ cform.c \ cxc.h @@ -654,9 +654,13 @@ INCLUDES = -I.. --- aplus-fsf-4.20/configure.in.org 2005-08-29 05:22:02.000000000 +0200 -+++ aplus-fsf-4.20/configure.in 2007-02-15 18:37:36.000000000 +0100 -@@ -17,6 +17,10 @@ - AM_PROG_LIBTOOL ++++ aplus-fsf-4.20/configure.in 2007-02-15 20:40:12.000000000 +0100 +@@ -14,9 +14,13 @@ + AC_PROG_CC + AC_PROG_CXX + +-AM_PROG_LIBTOOL ++AC_PROG_LIBTOOL AC_SUBST(LIBTOOL_DEPS) +APLVERSION=4.20.2 Index: aplus-fsf.spec =================================================================== RCS file: /cvs/extras/rpms/aplus-fsf/devel/aplus-fsf.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- aplus-fsf.spec 15 Feb 2007 19:24:56 -0000 1.8 +++ aplus-fsf.spec 15 Feb 2007 19:42:57 -0000 1.9 @@ -15,7 +15,7 @@ Name: %name Version: 4.20.2 -Release: 15%{?dist} +Release: 16%{?dist} License: GPL Summary: Advanced APL interpreter with s interface @@ -263,7 +263,7 @@ %ghost %verify(not md5 size mtime) %{_ttffonts}/fonts.cache-* %Changelog -* Thu Feb 15 2007 Jochen Schmitt 4.20.2-15 +* Thu Feb 15 2007 Jochen Schmitt 4.20.2-16 - Remove dependency to automake-1.6 * Wed Feb 14 2007 Jochen Schmitt 4.20.2-14 From fedora-extras-commits at redhat.com Thu Feb 15 19:53:52 2007 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Thu, 15 Feb 2007 14:53:52 -0500 Subject: rpms/libdnet/devel libdnet-shrext.patch, NONE, 1.1 libdnet.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200702151953.l1FJrqqW031934@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/libdnet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31912 Modified Files: libdnet.spec sources Added Files: libdnet-shrext.patch Log Message: * Thu Feb 15 2007 Patrick "Jima" Laughton 1.12-1 - New upstream version - New upstream web site (thanks JPO!) - Patch for inconsistent shrext variable - Minor edits for consistency libdnet-shrext.patch: --- NEW FILE libdnet-shrext.patch --- diff -urN libdnet-1.12/configure libdnet-1.12-patched/configure --- libdnet-1.12/configure 2007-01-20 05:39:54.000000000 -0600 +++ libdnet-1.12-patched/configure 2007-02-15 09:06:27.000000000 -0600 @@ -7053,7 +7053,7 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext=".dll" + shrext_cmds=".dll" # FIXME: Setting linknames here is a bad hack. archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll${_S_}linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -7580,7 +7580,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext=".so" +shrext_cmds=".so" postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -7693,7 +7693,7 @@ cygwin* | mingw* | pw32*) version_type=windows - shrext=".dll" + shrext_cmds=".dll" need_version=no need_lib_prefix=no @@ -7761,7 +7761,7 @@ soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext='$(test .$module = .yes && echo .so || echo .dylib)' + shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` @@ -7830,7 +7830,7 @@ need_version=no case "$host_cpu" in ia64*) - shrext='.so' + shrext_cmds='.so' hardcode_into_libs=yes dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH @@ -7845,7 +7845,7 @@ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) - shrext='.sl' + shrext_cmds='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH @@ -7856,7 +7856,7 @@ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; *) - shrext='.sl' + shrext_cmds='.sl' dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH @@ -7992,7 +7992,7 @@ os2*) libname_spec='$name' - shrext=".dll" + shrext_cmds=".dll" need_lib_prefix=no library_names_spec='$libname${shared_ext} $libname.a' dynamic_linker='OS/2 ld.exe' @@ -9201,7 +9201,7 @@ libext="$libext" # Shared library suffix (normally ".so"). -shrext='$shrext' +shrext_cmds='$shrext_cmds' # Executable file suffix (normally ""). exeext="$exeext" @@ -11257,7 +11257,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext=".so" +shrext_cmds=".so" postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -11370,7 +11370,7 @@ cygwin* | mingw* | pw32*) version_type=windows - shrext=".dll" + shrext_cmds=".dll" need_version=no need_lib_prefix=no @@ -11438,7 +11438,7 @@ soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext='$(test .$module = .yes && echo .so || echo .dylib)' + shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` @@ -11507,7 +11507,7 @@ need_version=no case "$host_cpu" in ia64*) - shrext='.so' + shrext_cmds='.so' hardcode_into_libs=yes dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH @@ -11522,7 +11522,7 @@ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) - shrext='.sl' + shrext_cmds='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH @@ -11533,7 +11533,7 @@ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; *) - shrext='.sl' + shrext_cmds='.sl' dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH @@ -11669,7 +11669,7 @@ os2*) libname_spec='$name' - shrext=".dll" + shrext_cmds=".dll" need_lib_prefix=no library_names_spec='$libname${shared_ext} $libname.a' dynamic_linker='OS/2 ld.exe' @@ -12751,7 +12751,7 @@ libext="$libext" # Shared library suffix (normally ".so"). -shrext='$shrext' +shrext_cmds='$shrext_cmds' # Executable file suffix (normally ""). exeext="$exeext" @@ -13832,7 +13832,7 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext=".dll" + shrext_cmds=".dll" # FIXME: Setting linknames here is a bad hack. archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll${_S_}linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -14359,7 +14359,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext=".so" +shrext_cmds=".so" postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -14472,7 +14472,7 @@ cygwin* | mingw* | pw32*) version_type=windows - shrext=".dll" + shrext_cmds=".dll" need_version=no need_lib_prefix=no @@ -14540,7 +14540,7 @@ soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext='$(test .$module = .yes && echo .so || echo .dylib)' + shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` @@ -14609,7 +14609,7 @@ need_version=no case "$host_cpu" in ia64*) - shrext='.so' + shrext_cmds='.so' hardcode_into_libs=yes dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH @@ -14624,7 +14624,7 @@ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) - shrext='.sl' + shrext_cmds='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH @@ -14635,7 +14635,7 @@ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; *) - shrext='.sl' + shrext_cmds='.sl' dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH @@ -14771,7 +14771,7 @@ os2*) libname_spec='$name' - shrext=".dll" + shrext_cmds=".dll" need_lib_prefix=no library_names_spec='$libname${shared_ext} $libname.a' dynamic_linker='OS/2 ld.exe' @@ -15047,7 +15047,7 @@ libext="$libext" # Shared library suffix (normally ".so"). -shrext='$shrext' +shrext_cmds='$shrext_cmds' # Executable file suffix (normally ""). exeext="$exeext" @@ -16130,7 +16130,7 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext=".dll" + shrext_cmds=".dll" # FIXME: Setting linknames here is a bad hack. archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll${_S_}linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -16657,7 +16657,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext=".so" +shrext_cmds=".so" postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -16770,7 +16770,7 @@ cygwin* | mingw* | pw32*) version_type=windows - shrext=".dll" + shrext_cmds=".dll" need_version=no need_lib_prefix=no @@ -16838,7 +16838,7 @@ soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext='$(test .$module = .yes && echo .so || echo .dylib)' + shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` @@ -16907,7 +16907,7 @@ need_version=no case "$host_cpu" in ia64*) - shrext='.so' + shrext_cmds='.so' hardcode_into_libs=yes dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH @@ -16922,7 +16922,7 @@ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) - shrext='.sl' + shrext_cmds='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH @@ -16933,7 +16933,7 @@ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; *) - shrext='.sl' + shrext_cmds='.sl' dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH @@ -17069,7 +17069,7 @@ os2*) libname_spec='$name' - shrext=".dll" + shrext_cmds=".dll" need_lib_prefix=no library_names_spec='$libname${shared_ext} $libname.a' dynamic_linker='OS/2 ld.exe' @@ -18151,7 +18151,7 @@ libext="$libext" # Shared library suffix (normally ".so"). -shrext='$shrext' +shrext_cmds='$shrext_cmds' # Executable file suffix (normally ""). exeext="$exeext" @@ -18595,7 +18595,7 @@ libext="$libext" # Shared library suffix (normally ".so"). -shrext='$shrext' +shrext_cmds='$shrext_cmds' # Executable file suffix (normally ""). exeext="$exeext" Index: libdnet.spec =================================================================== RCS file: /cvs/extras/rpms/libdnet/devel/libdnet.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libdnet.spec 24 Jan 2007 15:04:00 -0000 1.6 +++ libdnet.spec 15 Feb 2007 19:53:20 -0000 1.7 @@ -1,14 +1,15 @@ Summary: Simple portable interface to lowlevel networking routines Name: libdnet -Version: 1.10 -Release: 5%{?dist} +Version: 1.12 +Release: 1%{?dist} License: BSD-like Group: System Environment/Libraries -URL: http://libdnet.sf.net/ +URL: http://code.google.com/p/%{name}/ -Source: http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz +Source: http://%{name}.googlecode.com/files/%{name}-%{version}.tgz +Patch0: %{name}-shrext.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -20,23 +21,24 @@ packet and Ethernet frame, and data transmission. %package devel -Summary: Header files for libdnet library -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Summary: Header files for libdnet library +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} %description devel %{summary}. %package progs -Summary: Sample applications to use with libdnet -Group: Applications/Internet -Requires: %{name} = %{version}-%{release} +Summary: Sample applications to use with libdnet +Group: Applications/Internet +Requires: %{name} = %{version}-%{release} %description progs %{summary}. %prep %setup -q +%patch0 -p1 %build %configure @@ -44,7 +46,7 @@ %install %{__rm} -rf %{buildroot} -make install DESTDIR=%{buildroot} +%{__make} install DESTDIR=%{buildroot} %clean %{__rm} -rf %{buildroot} @@ -75,6 +77,12 @@ %{_mandir}/man8/*.8* %changelog +* Thu Feb 15 2007 Patrick "Jima" Laughton 1.12-1 +- New upstream version +- New upstream web site (thanks JPO!) +- Patch for inconsistent shrext variable +- Minor edits for consistency + * Wed Jan 24 2007 Patrick "Jima" Laughton 1.10-5 - Converted spec to UTF-8 to fix BZ#222794 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libdnet/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 Oct 2006 21:13:41 -0000 1.4 +++ sources 15 Feb 2007 19:53:20 -0000 1.5 @@ -1 +1 @@ -416b765e9d9961501ac85e9a366fd219 libdnet-1.10.tar.gz +9253ef6de1b5e28e9c9a62b882e44cc9 libdnet-1.12.tgz From fedora-extras-commits at redhat.com Thu Feb 15 20:40:50 2007 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Thu, 15 Feb 2007 15:40:50 -0500 Subject: rpms/lilypond/devel .cvsignore, 1.13, 1.14 lilypond.spec, 1.13, 1.14 sources, 1.13, 1.14 Message-ID: <200702152040.l1FKeoUX003402@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/lilypond/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3358 Modified Files: .cvsignore lilypond.spec sources Log Message: New release & bugfix for info file issue (#225410). Apparently there's no easy way to fix this via configure or make options, so it's either the sed solution I used or a patch. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lilypond/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 25 Jan 2007 15:49:24 -0000 1.13 +++ .cvsignore 15 Feb 2007 20:40:17 -0000 1.14 @@ -1 +1 @@ -lilypond-2.10.13.tar.gz +lilypond-2.10.17.tar.gz Index: lilypond.spec =================================================================== RCS file: /cvs/extras/rpms/lilypond/devel/lilypond.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- lilypond.spec 25 Jan 2007 15:49:24 -0000 1.13 +++ lilypond.spec 15 Feb 2007 20:40:17 -0000 1.14 @@ -1,5 +1,5 @@ Name: lilypond -Version: 2.10.13 +Version: 2.10.17 Release: 1%{?dist} Summary: A typesetting system for music notation @@ -54,6 +54,7 @@ pushd $RPM_BUILD_ROOT%{_infodir} iconv -f iso-8859-1 -t utf-8 music-glossary.info > music-glossary.info.utf8 mv music-glossary.info.utf8 music-glossary.info +sed -e s,lilypond/,, -i *.info popd rm -f $RPM_BUILD_ROOT%{_infodir}/dir @@ -66,14 +67,14 @@ %post -/sbin/install-info --info-dir=%{_infodir} %{_infodir}/lilypond.info.gz || : -/sbin/install-info --info-dir=%{_infodir} %{_infodir}/music-glossary.info.gz || : +/sbin/install-info --info-dir=%{_infodir} %{_infodir}/lilypond.info || : +/sbin/install-info --info-dir=%{_infodir} %{_infodir}/music-glossary.info || : %preun if [ "$1" = "0" ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/lilypond.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/music-glossary.info.gz || : + /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/lilypond.info || : + /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/music-glossary.info || : fi %files -f %{name}.lang @@ -91,6 +92,9 @@ %changelog +* Thu Feb 15 2007 Quentin Spencer 2.10.17-1 +- New release. Fix bug 225410. + * Thu Jan 25 2007 Quentin Spencer 2.10.13-1 - New release. Index: sources =================================================================== RCS file: /cvs/extras/rpms/lilypond/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 25 Jan 2007 15:49:24 -0000 1.13 +++ sources 15 Feb 2007 20:40:17 -0000 1.14 @@ -1 +1 @@ -545534fb365e7deb8b6b911182c2027b lilypond-2.10.13.tar.gz +a535c04c967022fcfc522714201c1052 lilypond-2.10.17.tar.gz From fedora-extras-commits at redhat.com Thu Feb 15 21:13:03 2007 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Thu, 15 Feb 2007 16:13:03 -0500 Subject: rpms/mkvtoolnix/devel .cvsignore, 1.2, 1.3 mkvtoolnix.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200702152113.l1FLD37C007147@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/extras/rpms/mkvtoolnix/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7112 Modified Files: .cvsignore mkvtoolnix.spec sources Log Message: - updated to 2.0.0 - rebuilt against new flac Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mkvtoolnix/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 6 Dec 2006 12:16:36 -0000 1.2 +++ .cvsignore 15 Feb 2007 21:12:31 -0000 1.3 @@ -1 +1 @@ -mkvtoolnix-1.8.1.tar.bz2 +mkvtoolnix-2.0.0.tar.bz2 Index: mkvtoolnix.spec =================================================================== RCS file: /cvs/extras/rpms/mkvtoolnix/devel/mkvtoolnix.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mkvtoolnix.spec 16 Dec 2006 21:09:54 -0000 1.2 +++ mkvtoolnix.spec 15 Feb 2007 21:12:31 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Matroska container manipulation utilities Name: mkvtoolnix -Version: 1.8.1 -Release: 2%{?dist} +Version: 2.0.0 +Release: 1%{?dist} License: GPL Group: Applications/Multimedia Source0: http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.bz2 @@ -101,6 +101,10 @@ %{_datadir}/icons/hicolor/32x32/apps/mmg.xpm %changelog +* Thu Feb 15 2007 Dominik Mierzejewski 2.0.0-1 +- updated to 2.0.0 +- rebuilt against new flac + * Sat Dec 16 2006 Dominik Mierzejewski 1.8.1-2 - rebuilt with new wxGTK Index: sources =================================================================== RCS file: /cvs/extras/rpms/mkvtoolnix/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 Dec 2006 12:16:36 -0000 1.2 +++ sources 15 Feb 2007 21:12:31 -0000 1.3 @@ -1 +1 @@ -d8afc54ac136af8061c0e2f42de198cf mkvtoolnix-1.8.1.tar.bz2 +d8a1d1f014f2ee5e69da04a46305f9dd mkvtoolnix-2.0.0.tar.bz2 From fedora-extras-commits at redhat.com Thu Feb 15 21:14:14 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Thu, 15 Feb 2007 16:14:14 -0500 Subject: rpms/audacity/FC-6 audacity.spec,1.23,1.24 Message-ID: <200702152114.l1FLEELP007180@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/audacity/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7159 Modified Files: audacity.spec Log Message: compile with jack support Index: audacity.spec =================================================================== RCS file: /cvs/extras/rpms/audacity/FC-6/audacity.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- audacity.spec 5 Feb 2007 20:40:10 -0000 1.23 +++ audacity.spec 15 Feb 2007 21:13:41 -0000 1.24 @@ -1,6 +1,6 @@ Name: audacity Version: 1.3.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A multitrack audio editor Group: Applications/Multimedia @@ -23,12 +23,12 @@ BuildRequires: libid3tag-devel BuildRequires: desktop-file-utils BuildRequires: wxGTK2-devel +BuildRequires: jack-audio-connection-kit-devel Requires(post): shared-mime-info, desktop-file-utils Requires(postun): shared-mime-info, desktop-file-utils # Compile options: # --with mp3 : enable mp3 support -# --with portaudiov19 : enable version 19 of portaudio (disables portmixer) %description @@ -56,7 +56,7 @@ %build -%configure --with-help --with-libsndfile=system --without-libresample --with-libsamplerate=system --with-libflac=system --with-ladspa --with-vorbis=system --with-id3tag=system %{?_with_mp3:--with-libmad=system} %{?_with_portaudiov19:--with-portaudio=v19 --without-portmixer} +%configure --with-help --with-libsndfile=system --without-libresample --with-libsamplerate=system --with-libflac=system --with-ladspa --with-vorbis=system --with-id3tag=system --with-portaudio=v19 --without-portmixer %{?_with_mp3:--with-libmad=system} make @@ -117,6 +117,9 @@ %doc %{_datadir}/doc/* %changelog +* Thu Feb 15 2007 Gerard Milmeister - 1.3.2-5 +- compile with jack support + * Mon Feb 5 2007 Gerard Milmeister - 1.3.2-4 - compile with libsamplerate From fedora-extras-commits at redhat.com Thu Feb 15 21:19:14 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Thu, 15 Feb 2007 16:19:14 -0500 Subject: rpms/audacity/devel audacity.spec,1.26,1.27 Message-ID: <200702152119.l1FLJEj8007300@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/audacity/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7275 Modified Files: audacity.spec Log Message: compile with jack support Index: audacity.spec =================================================================== RCS file: /cvs/extras/rpms/audacity/devel/audacity.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- audacity.spec 5 Feb 2007 20:43:24 -0000 1.26 +++ audacity.spec 15 Feb 2007 21:18:42 -0000 1.27 @@ -1,6 +1,6 @@ Name: audacity Version: 1.3.2 -Release: 7.20070106cvs%{?dist} +Release: 8.20070106cvs%{?dist} Summary: A multitrack audio editor Group: Applications/Multimedia @@ -23,12 +23,12 @@ BuildRequires: libid3tag-devel BuildRequires: desktop-file-utils BuildRequires: wxGTK2-devel +BuildRequires: jack-audio-connection-kit-devel Requires(post): shared-mime-info, desktop-file-utils Requires(postun): shared-mime-info, desktop-file-utils # Compile options: # --with mp3 : enable mp3 support -# --with portaudiov19 : enable version 19 of portaudio (disables portmixer) %description @@ -56,7 +56,7 @@ %build -%configure --with-help --with-libsndfile=system --without-libresample --with-libsamplerate=system --with-libflac=system --with-ladspa --with-vorbis=system --with-id3tag=system %{?_with_mp3:--with-libmad=system} %{?_with_portaudiov19:--with-portaudio=v19 --without-portmixer} +%configure --with-help --with-libsndfile=system --without-libresample --with-libsamplerate=system --with-libflac=system --with-ladspa --with-vorbis=system --with-id3tag=system --with-portaudio=v19 --without-portmixer %{?_with_mp3:--with-libmad=system} make @@ -118,6 +118,9 @@ %changelog +* Thu Feb 15 2007 Gerard Milmeister - 1.3.2-8.20070106cvs +- compile with jack + * Mon Feb 5 2007 Gerard Milmeister - 1.3.2-7.20070106cvs - compile with libsamplerate From fedora-extras-commits at redhat.com Thu Feb 15 21:21:42 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik)) Date: Thu, 15 Feb 2007 16:21:42 -0500 Subject: rpms/sonata/FC-6 .cvsignore,1.1,1.2 sources,1.1,1.2 Message-ID: <200702152121.l1FLLg3b007390@cvs-int.fedora.redhat.com> Author: ecik Update of /cvs/extras/rpms/sonata/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7366 Modified Files: .cvsignore sources Log Message: Add missing sources and .cvsignore Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sonata/FC-6/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Feb 2007 22:01:40 -0000 1.1 +++ .cvsignore 15 Feb 2007 21:21:10 -0000 1.2 @@ -0,0 +1 @@ +sonata-1.0.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sonata/FC-6/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Feb 2007 22:01:40 -0000 1.1 +++ sources 15 Feb 2007 21:21:10 -0000 1.2 @@ -0,0 +1 @@ +aa7dd98cf31d719328adf7afba4c0c83 sonata-1.0.1.tar.bz2 From fedora-extras-commits at redhat.com Thu Feb 15 21:32:35 2007 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Thu, 15 Feb 2007 16:32:35 -0500 Subject: rpms/lilypond/FC-6 .cvsignore, 1.12, 1.13 lilypond.spec, 1.12, 1.13 sources, 1.12, 1.13 Message-ID: <200702152132.l1FLWZkd007577@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/lilypond/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7552 Modified Files: .cvsignore lilypond.spec sources Log Message: New release & fix bug 225410. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lilypond/FC-6/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 25 Jan 2007 17:23:25 -0000 1.12 +++ .cvsignore 15 Feb 2007 21:32:03 -0000 1.13 @@ -1 +1 @@ -lilypond-2.10.13.tar.gz +lilypond-2.10.17.tar.gz Index: lilypond.spec =================================================================== RCS file: /cvs/extras/rpms/lilypond/FC-6/lilypond.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- lilypond.spec 25 Jan 2007 17:23:25 -0000 1.12 +++ lilypond.spec 15 Feb 2007 21:32:03 -0000 1.13 @@ -1,5 +1,5 @@ Name: lilypond -Version: 2.10.13 +Version: 2.10.17 Release: 1%{?dist} Summary: A typesetting system for music notation @@ -54,6 +54,7 @@ pushd $RPM_BUILD_ROOT%{_infodir} iconv -f iso-8859-1 -t utf-8 music-glossary.info > music-glossary.info.utf8 mv music-glossary.info.utf8 music-glossary.info +sed -e s,lilypond/,, -i *.info popd rm -f $RPM_BUILD_ROOT%{_infodir}/dir @@ -66,14 +67,14 @@ %post -/sbin/install-info --info-dir=%{_infodir} %{_infodir}/lilypond.info.gz || : -/sbin/install-info --info-dir=%{_infodir} %{_infodir}/music-glossary.info.gz || : +/sbin/install-info --info-dir=%{_infodir} %{_infodir}/lilypond.info || : +/sbin/install-info --info-dir=%{_infodir} %{_infodir}/music-glossary.info || : %preun if [ "$1" = "0" ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/lilypond.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/music-glossary.info.gz || : + /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/lilypond.info || : + /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/music-glossary.info || : fi %files -f %{name}.lang @@ -91,6 +92,9 @@ %changelog +* Thu Feb 15 2007 Quentin Spencer 2.10.17-1 +- New release. Fix bug 225410. + * Thu Jan 25 2007 Quentin Spencer 2.10.13-1 - New release. Index: sources =================================================================== RCS file: /cvs/extras/rpms/lilypond/FC-6/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 25 Jan 2007 17:23:25 -0000 1.12 +++ sources 15 Feb 2007 21:32:03 -0000 1.13 @@ -1 +1 @@ -545534fb365e7deb8b6b911182c2027b lilypond-2.10.13.tar.gz +a535c04c967022fcfc522714201c1052 lilypond-2.10.17.tar.gz From fedora-extras-commits at redhat.com Thu Feb 15 21:37:18 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Thu, 15 Feb 2007 16:37:18 -0500 Subject: rpms/audacity/devel audacity.spec,1.27,1.28 Message-ID: <200702152137.l1FLbITi007631@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/audacity/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7613 Modified Files: audacity.spec Log Message: disable flac for now Index: audacity.spec =================================================================== RCS file: /cvs/extras/rpms/audacity/devel/audacity.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- audacity.spec 15 Feb 2007 21:18:42 -0000 1.27 +++ audacity.spec 15 Feb 2007 21:36:46 -0000 1.28 @@ -1,6 +1,6 @@ Name: audacity Version: 1.3.2 -Release: 8.20070106cvs%{?dist} +Release: 9.20070106cvs%{?dist} Summary: A multitrack audio editor Group: Applications/Multimedia @@ -16,7 +16,7 @@ BuildRequires: perl BuildRequires: gettext BuildRequires: zip -BuildRequires: flac-devel +#BuildRequires: flac-devel BuildRequires: ladspa-devel BuildRequires: libsamplerate-devel BuildRequires: libsndfile-devel @@ -118,6 +118,9 @@ %changelog +* Thu Feb 15 2007 Gerard Milmeister - 1.3.2-9.20070106cvs +- disable flac for now + * Thu Feb 15 2007 Gerard Milmeister - 1.3.2-8.20070106cvs - compile with jack From fedora-extras-commits at redhat.com Thu Feb 15 21:46:15 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Thu, 15 Feb 2007 16:46:15 -0500 Subject: rpms/wings/FC-6 wings-optflags.patch,NONE,1.1 wings.spec,1.5,1.6 Message-ID: <200702152146.l1FLkFS1007890@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/wings/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7870 Modified Files: wings.spec Added Files: wings-optflags.patch Log Message: add optflags wings-optflags.patch: --- NEW FILE wings-optflags.patch --- --- wings-0.98.32b/plugins_src/accel/Makefile~ 2005-04-06 21:11:46.000000000 +0300 +++ wings-0.98.32b/plugins_src/accel/Makefile 2007-02-15 23:25:13.000000000 +0200 @@ -58,7 +58,7 @@ else $(LIBDIR)/wings_ogla_drv.so: wings_ogla_drv.c install -d $(LIBDIR) - gcc -o $(LIBDIR)/wings_ogla_drv.so -I$(ERL_INC) \ + gcc $(RPM_OPT_FLAGS) -o $(LIBDIR)/wings_ogla_drv.so -I$(ERL_INC) \ wings_ogla_drv.c $(LIBS) $(GL_LIBS) endif Index: wings.spec =================================================================== RCS file: /cvs/extras/rpms/wings/FC-6/wings.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- wings.spec 10 Dec 2006 10:56:47 -0000 1.5 +++ wings.spec 15 Feb 2007 21:45:43 -0000 1.6 @@ -10,6 +10,7 @@ Source1: http://prdownloads.sourceforge.net/wings/wings3d_manual1.6.1.pdf Source2: http://www.midcoast.com.au/~rgcoy/downloads/wingspov-0.98.28_v1.tgz Source3: wings.png +Patch0: wings-optflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: erlang-esdl-devel BuildRequires: libGL-devel @@ -44,6 +45,7 @@ %prep %setup -q +%patch0 -p1 cp %{SOURCE1} . tar zxf %{SOURCE2} @@ -158,6 +160,9 @@ %changelog +* Thu Feb 15 2007 Gerard Milmeister - 0.98.32b-10 +- add optflags (bugzilla 228925) + * Sun Dec 10 2006 Gerard Milmeister - 0.98.32b-10 - split off povray plug-in From fedora-extras-commits at redhat.com Thu Feb 15 21:47:25 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Thu, 15 Feb 2007 16:47:25 -0500 Subject: rpms/wings/FC-6 wings.spec,1.6,1.7 Message-ID: <200702152147.l1FLlPS5007951@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/wings/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7926 Modified Files: wings.spec Log Message: add optflags Index: wings.spec =================================================================== RCS file: /cvs/extras/rpms/wings/FC-6/wings.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- wings.spec 15 Feb 2007 21:45:43 -0000 1.6 +++ wings.spec 15 Feb 2007 21:46:52 -0000 1.7 @@ -1,6 +1,6 @@ Name: wings Version: 0.98.32b -Release: 10%{?dist} +Release: 11%{?dist} Summary: 3D Subdivision Modeler Group: Applications/Multimedia @@ -160,7 +160,7 @@ %changelog -* Thu Feb 15 2007 Gerard Milmeister - 0.98.32b-10 +* Thu Feb 15 2007 Gerard Milmeister - 0.98.32b-11 - add optflags (bugzilla 228925) * Sun Dec 10 2006 Gerard Milmeister - 0.98.32b-10 From fedora-extras-commits at redhat.com Thu Feb 15 21:49:33 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Thu, 15 Feb 2007 16:49:33 -0500 Subject: rpms/wings/devel wings-optflags.patch,NONE,1.1 wings.spec,1.5,1.6 Message-ID: <200702152149.l1FLnXpa008023@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/wings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8003 Modified Files: wings.spec Added Files: wings-optflags.patch Log Message: add optflags wings-optflags.patch: --- NEW FILE wings-optflags.patch --- --- wings-0.98.32b/plugins_src/accel/Makefile~ 2005-04-06 21:11:46.000000000 +0300 +++ wings-0.98.32b/plugins_src/accel/Makefile 2007-02-15 23:25:13.000000000 +0200 @@ -58,7 +58,7 @@ else $(LIBDIR)/wings_ogla_drv.so: wings_ogla_drv.c install -d $(LIBDIR) - gcc -o $(LIBDIR)/wings_ogla_drv.so -I$(ERL_INC) \ + gcc $(RPM_OPT_FLAGS) -o $(LIBDIR)/wings_ogla_drv.so -I$(ERL_INC) \ wings_ogla_drv.c $(LIBS) $(GL_LIBS) endif Index: wings.spec =================================================================== RCS file: /cvs/extras/rpms/wings/devel/wings.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- wings.spec 10 Dec 2006 10:58:48 -0000 1.5 +++ wings.spec 15 Feb 2007 21:49:00 -0000 1.6 @@ -1,6 +1,6 @@ Name: wings Version: 0.98.32b -Release: 10%{?dist} +Release: 11%{?dist} Summary: 3D Subdivision Modeler Group: Applications/Multimedia @@ -10,6 +10,7 @@ Source1: http://prdownloads.sourceforge.net/wings/wings3d_manual1.6.1.pdf Source2: http://www.midcoast.com.au/~rgcoy/downloads/wingspov-0.98.28_v1.tgz Source3: wings.png +Patch0: wings-optflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: erlang-esdl-devel BuildRequires: libGL-devel @@ -44,6 +45,7 @@ %prep %setup -q +%patch0 -p1 cp %{SOURCE1} . tar zxf %{SOURCE2} @@ -158,6 +160,9 @@ %changelog +* Thu Feb 15 2007 Gerard Milmeister - 0.98.32b-11 +- add optflags (bugzilla 228925) + * Sun Dec 10 2006 Gerard Milmeister - 0.98.32b-10 - split off povray plug-in From fedora-extras-commits at redhat.com Thu Feb 15 22:16:12 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?= (sindrepb)) Date: Thu, 15 Feb 2007 17:16:12 -0500 Subject: rpms/flac123/devel flac123.spec,1.1,1.2 Message-ID: <200702152216.l1FMGCCZ011745@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/flac123/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11728 Modified Files: flac123.spec Log Message: Rebuild against new libflac Index: flac123.spec =================================================================== RCS file: /cvs/extras/rpms/flac123/devel/flac123.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- flac123.spec 26 Dec 2006 08:53:58 -0000 1.1 +++ flac123.spec 15 Feb 2007 22:15:40 -0000 1.2 @@ -1,6 +1,6 @@ Name: flac123 Version: 0.0.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Command-line program for playing FLAC audio files Group: Applications/Multimedia @@ -41,5 +41,7 @@ %{_bindir}/* %changelog +* Thu Feb 15 2006 Sindre Pedersen Bj??rdal - 0.0.9-2 +- Rebuild against new libflac * Mon Dec 11 2006 Sindre Pedersen Bj??rdal - 0.0.9-1 - Initial build From fedora-extras-commits at redhat.com Thu Feb 15 22:17:31 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?= (sindrepb)) Date: Thu, 15 Feb 2007 17:17:31 -0500 Subject: rpms/flac123/devel flac123.spec,1.2,1.3 Message-ID: <200702152217.l1FMHVbe011771@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/flac123/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11753 Modified Files: flac123.spec Log Message: fix typo Index: flac123.spec =================================================================== RCS file: /cvs/extras/rpms/flac123/devel/flac123.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- flac123.spec 15 Feb 2007 22:15:40 -0000 1.2 +++ flac123.spec 15 Feb 2007 22:16:59 -0000 1.3 @@ -41,7 +41,7 @@ %{_bindir}/* %changelog -* Thu Feb 15 2006 Sindre Pedersen Bj??rdal - 0.0.9-2 +* Thu Feb 15 2007 Sindre Pedersen Bj??rdal - 0.0.9-2 - Rebuild against new libflac * Mon Dec 11 2006 Sindre Pedersen Bj??rdal - 0.0.9-1 - Initial build From fedora-extras-commits at redhat.com Thu Feb 15 22:23:01 2007 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Thu, 15 Feb 2007 17:23:01 -0500 Subject: rpms/lilypond/FC-5 .cvsignore, 1.11, 1.12 lilypond.spec, 1.14, 1.15 sources, 1.11, 1.12 Message-ID: <200702152223.l1FMN15W011890@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/lilypond/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11867 Modified Files: .cvsignore lilypond.spec sources Log Message: New release & fix bug 225410. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lilypond/FC-5/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 25 Jan 2007 17:26:23 -0000 1.11 +++ .cvsignore 15 Feb 2007 22:22:29 -0000 1.12 @@ -1 +1 @@ -lilypond-2.10.13.tar.gz +lilypond-2.10.17.tar.gz Index: lilypond.spec =================================================================== RCS file: /cvs/extras/rpms/lilypond/FC-5/lilypond.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- lilypond.spec 25 Jan 2007 17:26:23 -0000 1.14 +++ lilypond.spec 15 Feb 2007 22:22:29 -0000 1.15 @@ -1,5 +1,5 @@ Name: lilypond -Version: 2.10.13 +Version: 2.10.17 Release: 1%{?dist} Summary: A typesetting system for music notation @@ -56,6 +56,7 @@ pushd $RPM_BUILD_ROOT%{_infodir} iconv -f iso-8859-1 -t utf-8 music-glossary.info > music-glossary.info.utf8 mv music-glossary.info.utf8 music-glossary.info +sed -e s,lilypond/,, -i *.info popd rm -f $RPM_BUILD_ROOT%{_infodir}/dir @@ -68,14 +69,14 @@ %post -/sbin/install-info --info-dir=%{_infodir} %{_infodir}/lilypond.info.gz || : -/sbin/install-info --info-dir=%{_infodir} %{_infodir}/music-glossary.info.gz || : +/sbin/install-info --info-dir=%{_infodir} %{_infodir}/lilypond.info || : +/sbin/install-info --info-dir=%{_infodir} %{_infodir}/music-glossary.info || : %preun if [ "$1" = "0" ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/lilypond.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/music-glossary.info.gz || : + /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/lilypond.info || : + /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/music-glossary.info || : fi @@ -94,6 +95,9 @@ %changelog +* Thu Feb 15 2007 Quentin Spencer 2.10.17-1 +- New release. Fix bug 225410. + * Thu Jan 25 2007 Quentin Spencer 2.10.13-1 - New release. Index: sources =================================================================== RCS file: /cvs/extras/rpms/lilypond/FC-5/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 25 Jan 2007 17:26:23 -0000 1.11 +++ sources 15 Feb 2007 22:22:29 -0000 1.12 @@ -1 +1 @@ -545534fb365e7deb8b6b911182c2027b lilypond-2.10.13.tar.gz +a535c04c967022fcfc522714201c1052 lilypond-2.10.17.tar.gz From fedora-extras-commits at redhat.com Thu Feb 15 22:25:45 2007 From: fedora-extras-commits at redhat.com (Jakub Hrozek (jhrozek)) Date: Thu, 15 Feb 2007 17:25:45 -0500 Subject: rpms/dwdiff import.log,1.1,1.2 Message-ID: <200702152225.l1FMPjYD011993@cvs-int.fedora.redhat.com> Author: jhrozek Update of /cvs/extras/rpms/dwdiff In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11947 Modified Files: import.log Log Message: auto-import dwdiff-1.2.1-3 on branch devel from dwdiff-1.2.1-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dwdiff/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Feb 2007 19:38:27 -0000 1.1 +++ import.log 15 Feb 2007 22:25:12 -0000 1.2 @@ -0,0 +1 @@ +dwdiff-1_2_1-3:HEAD:dwdiff-1.2.1-3.src.rpm:1171578308 From fedora-extras-commits at redhat.com Thu Feb 15 22:25:48 2007 From: fedora-extras-commits at redhat.com (Jakub Hrozek (jhrozek)) Date: Thu, 15 Feb 2007 17:25:48 -0500 Subject: rpms/dwdiff/devel dwdiff.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702152225.l1FMPmLn011997@cvs-int.fedora.redhat.com> Author: jhrozek Update of /cvs/extras/rpms/dwdiff/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11947/devel Modified Files: .cvsignore sources Added Files: dwdiff.spec Log Message: auto-import dwdiff-1.2.1-3 on branch devel from dwdiff-1.2.1-3.src.rpm --- NEW FILE dwdiff.spec --- Name: dwdiff Version: 1.2.1 Release: 3%{?dist} Summary: Front end to diff for comparing files on a word per word basis Group: Applications/Text License: OSL URL: http://os.ghalkes.nl/dwdiff.html Source0: http://os.ghalkes.nl/dist/%{name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: diffutils BuildRequires: gettext %description dwdiff is a front-end for the diff program that operates at the word level instead of the line level. It is different from wdiff in that it allows the user to specify what should be considered whitespace, and in that it takes an optional list of characters that should be considered delimiters. Delimiters are single characters that are treated as if they are words, even when there is no whitespace separating them from preceding words or delimiters. %prep %setup -q %build #dwdiff uses its own custom configure script ./configure --prefix=%{?buildroot:%{buildroot}}%{_prefix} \ CFLAGS="%{optflags}" make %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} %find_lang %{name} #get rid of manpages other than UTF8 rm -rf %{buildroot}%{_mandir}/nl.ISO8859-1/man1/ rm -rf %{buildroot}%{_mandir}/nl.ISO8859-15/man1/ mkdir %{buildroot}%{_mandir}/man1/nl/ mv %{buildroot}%{_mandir}/nl.UTF-8/man1/dwdiff.1 %{buildroot}%{_mandir}/nl/man1/dwdiff.1 %clean rm -rf %{buildroot} %files -f %{name}.lang %defattr(-,root,root,-) %{_bindir}/dwdiff %doc README COPYING Changelog %{_mandir}/man1/dwdiff.1* %lang(nl) %{_mandir}/nl/man1/dwdiff.1* %changelog * Thu Oct 12 2006 Jakub Hrozek 1.2-3 Fixed NL manpages packaging according to BZ #209608 comment #3 * Sat Oct 7 2006 Jakub Hrozek 1.2-2 Fixed bugs in the specfile according to BZ #209608 comment #1 * Fri Oct 6 2006 Jakub Hrozek 1.2-1 -initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dwdiff/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Feb 2007 19:38:35 -0000 1.1 +++ .cvsignore 15 Feb 2007 22:25:15 -0000 1.2 @@ -0,0 +1 @@ +dwdiff-1.2.1.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/dwdiff/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Feb 2007 19:38:35 -0000 1.1 +++ sources 15 Feb 2007 22:25:15 -0000 1.2 @@ -0,0 +1 @@ +3e4b6ed3c565d01ab1ca741473142a91 dwdiff-1.2.1.tgz From fedora-extras-commits at redhat.com Thu Feb 15 22:48:15 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Thu, 15 Feb 2007 17:48:15 -0500 Subject: rpms/audacity/FC-6 audacity.spec,1.24,1.25 Message-ID: <200702152248.l1FMmFQ5012352@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/audacity/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12335 Modified Files: audacity.spec Log Message: build with system expat Index: audacity.spec =================================================================== RCS file: /cvs/extras/rpms/audacity/FC-6/audacity.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- audacity.spec 15 Feb 2007 21:13:41 -0000 1.24 +++ audacity.spec 15 Feb 2007 22:47:43 -0000 1.25 @@ -1,6 +1,6 @@ Name: audacity Version: 1.3.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A multitrack audio editor Group: Applications/Multimedia @@ -10,20 +10,22 @@ Source1: audacity.png Patch4: audacity-1.3.2-destdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libogg-devel -BuildRequires: libvorbis-devel -BuildRequires: zlib-devel -BuildRequires: perl -BuildRequires: gettext -BuildRequires: zip +BuildRequires: alsa-lib-devel +BuildRequires: desktop-file-utils +BuildRequires: expat-devel BuildRequires: flac-devel +BuildRequires: gettext +BuildRequires: jack-audio-connection-kit-devel BuildRequires: ladspa-devel -BuildRequires: libsamplerate-devel +BuildRequires: libid3tag-devel +BuildRequires: libogg-devel +BuildRequires: libsamplerate-devel BuildRequires: libsndfile-devel -BuildRequires: libid3tag-devel -BuildRequires: desktop-file-utils +BuildRequires: libvorbis-devel +BuildRequires: perl BuildRequires: wxGTK2-devel -BuildRequires: jack-audio-connection-kit-devel +BuildRequires: zip +BuildRequires: zlib-devel Requires(post): shared-mime-info, desktop-file-utils Requires(postun): shared-mime-info, desktop-file-utils @@ -56,7 +58,7 @@ %build -%configure --with-help --with-libsndfile=system --without-libresample --with-libsamplerate=system --with-libflac=system --with-ladspa --with-vorbis=system --with-id3tag=system --with-portaudio=v19 --without-portmixer %{?_with_mp3:--with-libmad=system} +%configure --with-help --with-libsndfile=system --without-libresample --with-libsamplerate=system --with-libflac=system --with-ladspa --with-vorbis=system --with-id3tag=system --with-expat=system --with-portaudio=v19 --without-portmixer %{?_with_mp3:--with-libmad=system} make @@ -117,6 +119,10 @@ %doc %{_datadir}/doc/* %changelog +* Thu Feb 15 2007 Gerard Milmeister - 1.3.2-6 +- build with system expat +- added BuildReq alsa-lib-devel + * Thu Feb 15 2007 Gerard Milmeister - 1.3.2-5 - compile with jack support From fedora-extras-commits at redhat.com Thu Feb 15 23:03:14 2007 From: fedora-extras-commits at redhat.com (Jakub Hrozek (jhrozek)) Date: Thu, 15 Feb 2007 18:03:14 -0500 Subject: rpms/dwdiff/FC-6 dwdiff.spec,NONE,1.1 Message-ID: <200702152303.l1FN3ECN015980@cvs-int.fedora.redhat.com> Author: jhrozek Update of /cvs/extras/rpms/dwdiff/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15972 Added Files: dwdiff.spec Log Message: Added specfiles to fc-{5,6} branches to allow make tag --- NEW FILE dwdiff.spec --- Name: dwdiff Version: 1.2.1 Release: 3%{?dist} Summary: Front end to diff for comparing files on a word per word basis Group: Applications/Text License: OSL URL: http://os.ghalkes.nl/dwdiff.html Source0: http://os.ghalkes.nl/dist/%{name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: diffutils BuildRequires: gettext %description dwdiff is a front-end for the diff program that operates at the word level instead of the line level. It is different from wdiff in that it allows the user to specify what should be considered whitespace, and in that it takes an optional list of characters that should be considered delimiters. Delimiters are single characters that are treated as if they are words, even when there is no whitespace separating them from preceding words or delimiters. %prep %setup -q %build #dwdiff uses its own custom configure script ./configure --prefix=%{?buildroot:%{buildroot}}%{_prefix} \ CFLAGS="%{optflags}" make %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} %find_lang %{name} #get rid of manpages other than UTF8 rm -rf %{buildroot}%{_mandir}/nl.ISO8859-1/man1/ rm -rf %{buildroot}%{_mandir}/nl.ISO8859-15/man1/ mkdir %{buildroot}%{_mandir}/man1/nl/ mv %{buildroot}%{_mandir}/nl.UTF-8/man1/dwdiff.1 %{buildroot}%{_mandir}/nl/man1/dwdiff.1 %clean rm -rf %{buildroot} %files -f %{name}.lang %defattr(-,root,root,-) %{_bindir}/dwdiff %doc README COPYING Changelog %{_mandir}/man1/dwdiff.1* %lang(nl) %{_mandir}/nl/man1/dwdiff.1* %changelog * Thu Oct 12 2006 Jakub Hrozek 1.2-3 Fixed NL manpages packaging according to BZ #209608 comment #3 * Sat Oct 7 2006 Jakub Hrozek 1.2-2 Fixed bugs in the specfile according to BZ #209608 comment #1 * Fri Oct 6 2006 Jakub Hrozek 1.2-1 -initial packaging From fedora-extras-commits at redhat.com Thu Feb 15 23:27:49 2007 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Thu, 15 Feb 2007 18:27:49 -0500 Subject: rpms/pungi/devel .cvsignore, 1.8, 1.9 pungi.spec, 1.8, 1.9 sources, 1.8, 1.9 Message-ID: <200702152327.l1FNRnxp016332@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/extras/rpms/pungi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16291/devel Modified Files: .cvsignore pungi.spec sources Log Message: auto-import pungi-0.2.4-1 on branch devel from pungi-0.2.4-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pungi/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 6 Feb 2007 22:45:31 -0000 1.8 +++ .cvsignore 15 Feb 2007 23:27:17 -0000 1.9 @@ -1 +1 @@ -pungi-0.2.3.tar.gz +pungi-0.2.4.tar.gz Index: pungi.spec =================================================================== RCS file: /cvs/extras/rpms/pungi/devel/pungi.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- pungi.spec 6 Feb 2007 22:45:31 -0000 1.8 +++ pungi.spec 15 Feb 2007 23:27:17 -0000 1.9 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: pungi -Version: 0.2.3 +Version: 0.2.4 Release: 1%{?dist} Summary: Distribution compose tool @@ -46,6 +46,25 @@ %changelog +* Thu Feb 15 2007 Jesse Keating - 0.2.4-1 +- Add support for globbing in manifest +- Add new Make targets (Essien Ita Essien) +- Add runtime flags for doing specific stages of the compose (Essien Ita Essien) +- Add ability to define destdir on the cli to override conf file +- Clean up optionparse stuff, print usage if arg list is too small +- Fix part of the patch from Essien +- Add Contributors to the Authors file +- Adjust the Makefile so that srpm doesn't cause a tag +- Merged changes from Will Woods + - Write out some tree description files + - Don't traceback on existing files in download area (not sure this will stay) +- Style fixed some stuff from Will +- Add logging patch from jbowes +- Various logging tweaks +- Use -d flag in createrepo for sqlite blobs +- Add pydoc stuff to various functions +- Support comments in the package manifest + * Tue Feb 06 2007 Jesse Keating - 0.2.3-1 - Be able to opt-out of a bugurl since buildinstall supports this - Make isodir an object of pungi (wwoods) Index: sources =================================================================== RCS file: /cvs/extras/rpms/pungi/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 6 Feb 2007 22:45:31 -0000 1.8 +++ sources 15 Feb 2007 23:27:17 -0000 1.9 @@ -1 +1 @@ -fc8d6c41fdd15061e94232f9993fce40 pungi-0.2.3.tar.gz +723ac528763acf0e47be836e96050495 pungi-0.2.4.tar.gz From fedora-extras-commits at redhat.com Thu Feb 15 23:27:46 2007 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Thu, 15 Feb 2007 18:27:46 -0500 Subject: rpms/pungi import.log,1.9,1.10 Message-ID: <200702152327.l1FNRkvX016327@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/extras/rpms/pungi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16291 Modified Files: import.log Log Message: auto-import pungi-0.2.4-1 on branch devel from pungi-0.2.4-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pungi/import.log,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- import.log 6 Feb 2007 22:45:28 -0000 1.9 +++ import.log 15 Feb 2007 23:27:14 -0000 1.10 @@ -6,3 +6,4 @@ pungi-0_2_1-1:HEAD:pungi-0.2.1-1.src.rpm:1169748817 pungi-0_2_2-1:HEAD:pungi-0.2.2-1.src.rpm:1170105534 pungi-0_2_3-1:HEAD:pungi-0.2.3-1.src.rpm:1170801926 +pungi-0_2_4-1:HEAD:pungi-0.2.4-1.src.rpm:1171582109 From fedora-extras-commits at redhat.com Thu Feb 15 23:41:07 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Thu, 15 Feb 2007 18:41:07 -0500 Subject: rpms/graveman/devel graveman.spec,1.17,1.18 Message-ID: <200702152341.l1FNf7Qg016617@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/graveman/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16591 Modified Files: graveman.spec Log Message: rebuild Index: graveman.spec =================================================================== RCS file: /cvs/extras/rpms/graveman/devel/graveman.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- graveman.spec 11 Feb 2007 16:44:25 -0000 1.17 +++ graveman.spec 15 Feb 2007 23:40:35 -0000 1.18 @@ -1,6 +1,6 @@ Name: graveman Version: 0.3.12.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A frontend for cdrtools, dvd+rw-tools and sox Group: Applications/Archiving @@ -81,6 +81,9 @@ %changelog +* Fri Feb 16 2007 Gerard Milmeister - 0.3.12.5-4 +- rebuild + * Sun Feb 11 2007 Gerard Milmeister - 0.3.12.5-3 - build with flac support - enable optflags (bugzilla 227381) From fedora-extras-commits at redhat.com Thu Feb 15 23:50:09 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Thu, 15 Feb 2007 18:50:09 -0500 Subject: rpms/audacity/devel audacity.spec,1.28,1.29 Message-ID: <200702152350.l1FNo9kv016716@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/audacity/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16697 Modified Files: audacity.spec Log Message: Index: audacity.spec =================================================================== RCS file: /cvs/extras/rpms/audacity/devel/audacity.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- audacity.spec 15 Feb 2007 21:36:46 -0000 1.28 +++ audacity.spec 15 Feb 2007 23:49:37 -0000 1.29 @@ -1,6 +1,6 @@ Name: audacity Version: 1.3.2 -Release: 9.20070106cvs%{?dist} +Release: 10.20070106cvs%{?dist} Summary: A multitrack audio editor Group: Applications/Multimedia @@ -10,20 +10,22 @@ Source1: audacity.png Patch4: audacity-1.3.2-destdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libogg-devel -BuildRequires: libvorbis-devel -BuildRequires: zlib-devel -BuildRequires: perl -BuildRequires: gettext -BuildRequires: zip -#BuildRequires: flac-devel +BuildRequires: alsa-lib-devel +BuildRequires: desktop-file-utils +BuildRequires: expat-devel +BuildRequires: flac-devel +BuildRequires: gettext +BuildRequires: jack-audio-connection-kit-devel BuildRequires: ladspa-devel -BuildRequires: libsamplerate-devel +BuildRequires: libid3tag-devel +BuildRequires: libogg-devel +BuildRequires: libsamplerate-devel BuildRequires: libsndfile-devel -BuildRequires: libid3tag-devel -BuildRequires: desktop-file-utils +BuildRequires: libvorbis-devel +BuildRequires: perl BuildRequires: wxGTK2-devel -BuildRequires: jack-audio-connection-kit-devel +BuildRequires: zip +BuildRequires: zlib-devel Requires(post): shared-mime-info, desktop-file-utils Requires(postun): shared-mime-info, desktop-file-utils @@ -56,7 +58,7 @@ %build -%configure --with-help --with-libsndfile=system --without-libresample --with-libsamplerate=system --with-libflac=system --with-ladspa --with-vorbis=system --with-id3tag=system --with-portaudio=v19 --without-portmixer %{?_with_mp3:--with-libmad=system} +%configure --with-help --with-libsndfile=system --without-libresample --with-libsamplerate=system --with-libflac=system --with-ladspa --with-vorbis=system --with-id3tag=system --with-expat=system --with-portaudio=v19 --without-portmixer %{?_with_mp3:--with-libmad=system} %{!?_with_mp3:--without-libmad} --without-flac make From fedora-extras-commits at redhat.com Fri Feb 16 00:07:44 2007 From: fedora-extras-commits at redhat.com (Michael Rice (errr)) Date: Thu, 15 Feb 2007 19:07:44 -0500 Subject: rpms/etherape/FC-5 etherape.spec,1.1,1.2 Message-ID: <200702160007.l1G07iwQ020289@cvs-int.fedora.redhat.com> Author: errr Update of /cvs/extras/rpms/etherape/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20270 Modified Files: etherape.spec Log Message: adjust BR for libpcap for fc-5 Index: etherape.spec =================================================================== RCS file: /cvs/extras/rpms/etherape/FC-5/etherape.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- etherape.spec 14 Feb 2007 03:59:55 -0000 1.1 +++ etherape.spec 16 Feb 2007 00:07:12 -0000 1.2 @@ -1,6 +1,6 @@ Name: etherape Version: 0.9.7 -Release: 4%{?dist} +Release: 4.1%{?dist} Summary: Graphical network monitor for Unix Group: Applications/System @@ -9,7 +9,7 @@ Source0: http://umn.dl.sourceforge.net/sourceforge/etherape/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libpcap-devel, libglade2-devel +BuildRequires: libpcap, libglade2-devel BuildRequires: gettext, desktop-file-utils, libgnomeui-devel BuildRequires: scrollkeeper Requires(post): scrollkeeper @@ -85,6 +85,9 @@ %changelog +* Thu Feb 15 2007 Michael Rice - 0.9.7-4.1 +- Fix BR to build for FC-5 + * Mon Feb 12 2007 Michael Rice - 0.9.7-4 - Fix desktop file install From fedora-extras-commits at redhat.com Fri Feb 16 00:18:41 2007 From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa)) Date: Thu, 15 Feb 2007 19:18:41 -0500 Subject: rpms/icewm/FC-5 sources,1.1,1.2 Message-ID: <200702160018.l1G0IfZn020650@cvs-int.fedora.redhat.com> Author: gilboa Update of /cvs/extras/rpms/icewm/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20604/icewm/FC-5 Modified Files: sources Log Message: Index: sources =================================================================== RCS file: /cvs/extras/rpms/icewm/FC-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Feb 2007 19:36:05 -0000 1.1 +++ sources 16 Feb 2007 00:18:08 -0000 1.2 @@ -0,0 +1 @@ +8a302c5e629bb81d87cc02004a694ece icewm-1.2.30.tar.gz From fedora-extras-commits at redhat.com Fri Feb 16 00:18:43 2007 From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa)) Date: Thu, 15 Feb 2007 19:18:43 -0500 Subject: rpms/icewm/FC-6 sources,1.1,1.2 Message-ID: <200702160018.l1G0Ihv3020653@cvs-int.fedora.redhat.com> Author: gilboa Update of /cvs/extras/rpms/icewm/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20604/icewm/FC-6 Modified Files: sources Log Message: Index: sources =================================================================== RCS file: /cvs/extras/rpms/icewm/FC-6/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Feb 2007 19:36:05 -0000 1.1 +++ sources 16 Feb 2007 00:18:11 -0000 1.2 @@ -0,0 +1 @@ +8a302c5e629bb81d87cc02004a694ece icewm-1.2.30.tar.gz From fedora-extras-commits at redhat.com Fri Feb 16 00:32:24 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 19:32:24 -0500 Subject: rpms/hunspell-ms Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702160032.l1G0WOeN020977@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-ms In directory cvs-int.fedora.redhat.com:/home/fedora/ausil/bin/tmpcvsT20906/rpms/hunspell-ms Added Files: Makefile import.log pkg.acl Log Message: Setup of module hunspell-ms --- NEW FILE Makefile --- # Top level Makefile for module hunspell-ms all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Fri Feb 16 00:32:21 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 19:32:21 -0500 Subject: rpms/hunspell-ms/devel - New directory Message-ID: <200702160032.l1G0WLkb020945@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-ms/devel In directory cvs-int.fedora.redhat.com:/home/fedora/ausil/bin/tmpcvsT20906/rpms/hunspell-ms/devel Log Message: Directory /cvs/extras/rpms/hunspell-ms/devel added to the repository From fedora-extras-commits at redhat.com Fri Feb 16 00:32:18 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 19:32:18 -0500 Subject: rpms/hunspell-ms - New directory Message-ID: <200702160032.l1G0WIC3020932@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-ms In directory cvs-int.fedora.redhat.com:/home/fedora/ausil/bin/tmpcvsT20906/rpms/hunspell-ms Log Message: Directory /cvs/extras/rpms/hunspell-ms added to the repository From fedora-extras-commits at redhat.com Fri Feb 16 00:32:32 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 15 Feb 2007 19:32:32 -0500 Subject: rpms/hunspell-ms/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702160032.l1G0WW4H020996@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/hunspell-ms/devel In directory cvs-int.fedora.redhat.com:/home/fedora/ausil/bin/tmpcvsT20906/rpms/hunspell-ms/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module hunspell-ms --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: hunspell-ms # $Id: Makefile,v 1.1 2007/02/16 00:32:29 ausil Exp $ NAME := hunspell-ms SPECFILE = hunspell-ms.spec define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Feb 16 00:44:43 2007 From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa)) Date: Thu, 15 Feb 2007 19:44:43 -0500 Subject: rpms/icewm/FC-6 icewm-configure.patch, NONE, 1.1 icewm.desktop, NONE, 1.1 icewm-keys.patch, NONE, 1.1 icewm-menu.patch, NONE, 1.1 icewm.spec, NONE, 1.1 icewm-startup, NONE, 1.1 icewm-toolbar.patch, NONE, 1.1 icewm-xdg-menu, NONE, 1.1 Message-ID: <200702160044.l1G0ihWG021156@cvs-int.fedora.redhat.com> Author: gilboa Update of /cvs/extras/rpms/icewm/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21137/FC-6 Added Files: icewm-configure.patch icewm.desktop icewm-keys.patch icewm-menu.patch icewm.spec icewm-startup icewm-toolbar.patch icewm-xdg-menu Log Message: Missing files from FC-6 branch. icewm-configure.patch: --- NEW FILE icewm-configure.patch --- --- icewm-1.2.30/configure.in.old 2007-01-16 16:12:51.000000000 +0200 +++ icewm-1.2.30/configure.in 2007-01-16 16:13:31.000000000 +0200 @@ -814,7 +814,7 @@ APPLICATIONS="${APPLICATIONS} icewm-menu-gnome2" GNOME2_PREFIX=`pkg-config --variable=prefix gnome-desktop-2.0` GWMDIR="${GNOME2_PREFIX}/share/gnome/wm-properties/" - CONFIG_GNOME2_MENU_DIR="${GNOME2_PREFIX}/share/gnome/vfolders/" + CONFIG_GNOME2_MENU_DIR="${GNOME2_PREFIX}/share/desktop-directories/ fi if test "${GNOME2_CFLAGS}" = ""; then --- icewm-1.2.30/configure.old 2007-01-16 17:44:10.000000000 +0200 +++ icewm-1.2.30/configure 2007-01-16 17:44:31.000000000 +0200 @@ -12000,7 +12000,7 @@ APPLICATIONS="${APPLICATIONS} icewm-menu-gnome2" GNOME2_PREFIX=`pkg-config --variable=prefix gnome-desktop-2.0` GWMDIR="${GNOME2_PREFIX}/share/gnome/wm-properties/" - CONFIG_GNOME2_MENU_DIR="${GNOME2_PREFIX}/share/gnome/vfolders/" + CONFIG_GNOME2_MENU_DIR="${GNOME2_PREFIX}/share/desktop-directories/" fi if test "${GNOME2_CFLAGS}" = ""; then --- NEW FILE icewm.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Icewm Comment=Simple and fast window manger Exec=icewm-session Terminal=False TryExec=icewm [Window Manager] SessionManaged=true # vi: encoding=utf-8 icewm-keys.patch: --- NEW FILE icewm-keys.patch --- --- icewm-1.2.30/lib/keys.in.old 2007-01-18 13:55:20.000000000 +0200 +++ icewm-1.2.30/lib/keys.in 2007-01-18 16:07:07.000000000 +0200 @@ -9,28 +9,21 @@ # You'll have to omit XK_ prefixs and to replace XF86XK_ prefixes by # XF86. Valid modifiers are Alt, Ctrl, Shift, Meta, Super and Hyper. # -key "Alt+Ctrl+t" xterm -key "Alt+Ctrl+f" fte -key "Alt+Ctrl+e" nedit -key "Alt+Ctrl+g" gimp -key "Alt+Ctrl+n" netscape -noraise -remote openBrowser -key "Alt+Ctrl+b" netscape -noraise -remote openBookmarks -key "Alt+Ctrl+m" netscape -noraise -remote openURL(mailto:,new-window) +key "Alt+Ctrl+t" xterm +key "Alt+Ctrl+b" htmlview +key "Alt+Ctrl+s" htmlview http://www.google.com -key "Alt+Ctrl+KP_Divide" aumix -v -5 # lower volume -key "Alt+Ctrl+KP_Multiply" aumix -v +5 # raise volume +key "Super+KP_Subtract" amixer sset PCM 5%- +key "Super+KP_Add" amixer sset PCM 5%+ # "Multimedia key" bindings for XFree86. Gather the keycodes of your # advanced function keys by watching the output of the xev command whilest # pressing those keys and map those symbols by using xmodmap. -key "XF86Standby" killall -QUIT icewm -key "XF86AudioLowerVolume" aumix -v -5 -key "XF86AudioRaiseVolume" aumix -v +5 -key "XF86AudioMute" aumix -v 0 -key "XF86AudioPlay" cdplay play 1 -key "XF86AudioStop" cdplay stop -key "XF86HomePage" netscape -noraise -remote openHomepage -key "XF86Mail" netscape -noraise -remote openURL(mailto:,new-window) -key "XF86Search" netscape -noraise -remote openURL(http://www.google.com/) -key "XF86Eject" eject +key "XF86Standby" killall -QUIT icewm +key "XF86AudioLowerVolume" amixer sset PCM 5%- +key "XF86AudioRaiseVolume" amixer sset PCM 5%+ +key "XF86AudioMute" amixer sset PCM 0% +key "XF86HomePage" htmlview +key "XF86Search" htmlview http://www.google.com +key "XF86Eject" eject icewm-menu.patch: --- NEW FILE icewm-menu.patch --- --- icewm-1.2.30/lib/menu.in.old 2007-01-28 15:14:30.000000000 +0200 +++ icewm-1.2.30/lib/menu.in 2007-01-28 15:17:12.000000000 +0200 @@ -4,16 +4,7 @@ # since modifications to this file will be discarded when you # (re)install icewm. # -prog xterm xterm xterm -prog rxvt xterm rxvt -bg black -cr green -fg white -C -fn 9x15 -sl 500 -prog fte fte fte -prog NEdit nedit nedit -prog Mozilla mozilla mozilla -prog XChat xchat xchat -prog Gimp gimp gimp +prog xterm /usr/share/icons/Bluecurve/32x32/apps/gnome-terminal.png xterm +prog "Web browser" /usr/share/icons/Bluecurve/32x32/apps/mozilla-icon.png htmlview separator -menuprog Gnome folder icewm-menu-gnome1 --list @CONFIG_GNOME1_MENU_DIR@ -menuprog Gnome folder icewm-menu-gnome2 --list @CONFIG_GNOME2_MENU_DIR@ -menuprog KDE folder icewm-menu-gnome at GNOME_VER@ --list @CONFIG_KDE_MENU_DIR@ -menufile Programs folder programs -menufile Tool_bar folder toolbar +menufile Programs folder programs.autogen --- NEW FILE icewm.spec --- Name: icewm Version: 1.2.30 Release: 12%{?dist} Summary: Light and configurable window manager Group: User Interface/Desktops License: LGPL URL: http://www.icewm.org Source0: http://heanet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz Source1: http://lostclus.linux.kiev.ua/scripts/icewm-xdg-menu Source2: icewm.desktop Source4: icewm-startup BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: imlib-devel BuildRequires: xorg-x11-proto-devel BuildRequires: libXinerama-devel BuildRequires: libXft-devel BuildRequires: libICE-devel BuildRequires: gettext BuildRequires: gnome-desktop-devel Requires: redhat-artwork Requires: alsa-utils Requires: htmlview Requires: xterm Patch0: icewm-configure.patch Patch1: icewm-menu.patch Patch2: icewm-toolbar.patch Patch3: icewm-keys.patch %description IceWM is a window manager for the X Window System (freedesktop, XFree86). The goal of IceWM is speed, simplicity, and not getting in the user's way. %package gnome Summary: GNOME menu support for IceWM window manager Group: User Interface/Desktops Requires: gnome-menus Requires: icewm = %{version}-%{release} %description gnome IceWM-gnome adds gnome-menu support for the IceWM window manager. %package xdgmenu Summary: Automatically generate the main IceWM menu Group: User Interface/Desktops Requires: pyxdg Requires: icewm = %{version}-%{release} %description xdgmenu IceWM-xdgmenu generates static IceWM menu files from the existing freedesktop.org .desktop files. Files are re-generated each time the user logs-in. %prep %setup -q %patch0 -p1 -b .configure %patch1 -p1 -b .menu %patch2 -p1 -b .toolbar %patch3 -p1 -b .keys %build # Configure sets the CXXFLAGS to: -fpermissive -fno-exceptions -fno-rtti -Wxxx... # In general it doesn't seem to break anything. BZ# if you hit something bad. %configure --enable-gradients \ --enable-antialiasing \ --enable-menus-gnome2 \ --disable-menus-gnome1 \ --with-cfgdir=%{_sysconfdir}/icewm make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p" mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 %{__install} -p -m 644 doc/icewm.1.man $RPM_BUILD_ROOT/%{_mandir}/man1/icewm.1 %{__install} -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir} %{__install} -p -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/icewm/startup mkdir -p $RPM_BUILD_ROOT/%{_datadir}/xsessions/ %{__install} -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/xsessions/ %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS BUGS CHANGES COPYING README README.wm-session TODO doc/*.html %exclude %{_datadir}/icewm/startup %{_datadir}/icewm/ %{_datadir}/xsessions/icewm.desktop %{_mandir}/man1/icewm.1* %{_bindir}/icewmbg %{_bindir}/icehelp %{_bindir}/icesh %{_bindir}/icewm %{_bindir}/icewm-session %{_bindir}/icewmhint %{_bindir}/icewmtray %files gnome %defattr(-,root,root,-) %{_bindir}/icewm-menu-gnome2 %files xdgmenu %defattr(-,root,root,-) %{_bindir}/icewm-xdg-menu* %{_datadir}/icewm/startup %changelog * Sat Feb 10 2007 - 1.2.30-12 - Add missing dot in the -gnome sub-package description. - Replace REQ icewm (in both -gnome and -xdgmenu) with icewm-x.x.x. - Fix -xdgmenu file list and %%install section. - Preserve the source time-stamp. * Sun Feb 04 2007 - 1.2.30-11 - Remove .Xdefaults fix from startup. (reported upstream). - Replace buildroot with RPM_BUILD_ROOT. * Sun Jan 28 2007 - 1.2.30-10 - Missing REQ: icewm (both -gnome and -xdgmenu) - Updated menu.in patch. - Updated startup script. (-xdgmenu) - Updated icewm-xdg-menu script. (-xdgmenu) * Thu Jan 25 2007 - 1.2.30-9 - Remove redundant icewm-xdg-menu* %%file entry. - Change sub-package name to xdgmenu. - Move icewm-xdg-menu to xdgmenu sub-package. - Removed the icewm-generate-menu script. * Sat Jan 20 2007 - 1.2.30-8 - Fix source1 URL. (2nd is a winner) - Fix -gnome summery. - New sub-package: icewm-xdg-menu - ALPHA: icewm-generate-menu script added to use icewm-xdg-menu to generate static menus. * Sat Jan 20 2007 - 1.2.30-7 - Fix source1 URL. - Fix xdg-menu* owner. - Replace default terminal icon to reduce dep-chain. - Fix icewm-gnome description. - Replace install with %%{_install} - Push -gnome's BR to main package. - Change hard-coded sysconf path. * Tue Jan 18 2007 - 1.2.30-6 - Change license back to LGPL. - Change summery. - New sub-package: -gnome. (GNOME menu support.) - Missing REQ: xterm. - Missing REQ: htmlview. - Remove redundant %%_sysconf section. - Remove redundant redhat-xxx icons. - New REQ: redhat-artwork. (icons) - Better man pages handling. - Customize keys to better match fedora. - New REQ: eject. (keys) - New REQ: alsautils. (keys) * Wed Jan 17 2007 - 1.2.30-5 - Fix Source0 URL. - Replace cp with install. - Do not gzip the man page, just copy it. - Use htmlview instead of firefox. - Use BlueCurve icons instead of the mozilla ones. - Re-fix lang support. - Return the default configuration files to %%_datadir - Add gdm session support. - Remove gnome-menus from default menu - replace it with pyxdg/icewm-xdg-menu. * Tue Jan 16 2007 - 1.2.30-4 - Fix man page name. - Remove missing menu items. - Convert GNOME-menu patch to configure.in patch. - Push default configuration into /etc/icewm - Remove the default KDE support. (At least for now) - Require firefox (default browser in Fedora). - Add missing firefox icon. (No source - manual convert) - Add missing gnome-menus. (required for GNOME2 menus) - Fix missing gettext BR. - Fix missing lang support. * Sat Jan 13 2007 - 1.2.30-3 - Fix wrong license. (Was LGPL, should be GPL.) * Tue Jan 11 2007 - 1.2.30-2 - Manually add missing man page. * Tue Jan 11 2007 - 1.2.30-1 - Initial release. --- NEW FILE icewm-startup --- #!/bin/sh [ ! -d ~/.icewm ] && mkdir ~/.icewm icewm-xdg-menu --entire-menu --with-theme-paths --icon-size 16 --theme Bluecurve > ~/.icewm/programs.autogen icewm-toolbar.patch: --- NEW FILE icewm-toolbar.patch --- --- icewm-1.2.30/lib/toolbar.in.old 2007-01-18 18:51:55.000000000 +0200 +++ icewm-1.2.30/lib/toolbar.in 2007-01-18 18:55:50.000000000 +0200 @@ -4,6 +4,6 @@ # since modifications to this file will be discarded when you # (re)install icewm. # -prog XTerm xterm xterm -prog FTE fte fte -prog Netscape netscape netscape +prog xterm /usr/share/icons/Bluecurve/32x32/apps/gnome-terminal.png xterm +prog "Web browser" /usr/share/icons/Bluecurve/32x32/apps/mozilla-icon.png htmlview + --- NEW FILE icewm-xdg-menu --- #!/usr/bin/python """ This script generates FreeDesktop application menu for IceWM window manager. Written by Konstantin Korikov , put in the public domain Requires pyxdg http://cvs.freedesktop.org/cgi-bin/viewcvs.cgi/pyxdg/ USAGE EXAMPLE Add to $HOME/.icewm/menu this line: menuprog Applications - icewm-xdg-menu and restart IceWM. """ import sys import locale import getopt import re import xdg.Menu import xdg.DesktopEntry import xdg.IconTheme import xdg.Config version = "0.3" def print_usage(exit_code = 1): print """Usage: %s [options] Options: --locale=locale set output languege and encoding --root-folder folder folder to generate (for example: /Games) --terminal command set terminal emulator command (default: xterm -e %%s) --default-folder-icon icon icon for folders that not provide Icon option --default-entry-icon icon icon for entries that not provide Icon option --with-theme-paths convert icon base names to icon absolute paths using icon theme --entire-menu print entire menu --icon-size set default icon size --theme theme set icon theme --help print this help and exit --version print version and exit """ % sys.argv[0] sys.exit(exit_code) def print_version(): print "%s version %s" % ( os.path.basename(sys.argv[0]), version) sys.exit(0) root_folder = "" terminal = "xterm -e %s" default_folder_icon = "folder" default_entry_icon = "-" entire_menu = False with_theme_paths = False icon_size = 16 exec_clean1_re = re.compile(r'%[a-zA-Z]') exec_clean2_re = re.compile(r'%%') encoding = None locale_str = None def find_icon(entry): icon = entry.getIcon() if icon and with_theme_paths: icon = xdg.IconTheme.getIconPath(icon, icon_size) or icon return icon def process_menu(menu): for entry in menu.getEntries(): if isinstance(entry, xdg.Menu.Menu): name = entry.getName() or entry.DesktopFileID icon = find_icon(entry) or default_folder_icon if entire_menu: print ("menu \"%s\" \"%s\" {" % (name, icon)).encode(encoding) process_menu(entry) print "}".encode(encoding) else: print (("menuprog \"%s\" \"%s\" %s" % (name, icon, sys.argv[0])) + (" --root-folder \"%s\"" % entry.getPath(org=True)) + (" --terminal \"%s\"" % terminal) + (" --default-folder-icon \"%s\"" % default_folder_icon) + (" --default-entry-icon \"%s\"" % default_entry_icon) + (" --theme \"%s\"" % xdg.Config.icon_theme) + (" --icon-size \"%d\"" % icon_size) + (with_theme_paths and " --with-theme-paths" or "")).encode(encoding), if locale_str: print (" --locale \"%s\"" % locale_str).encode(encoding), print elif isinstance(entry, xdg.Menu.MenuEntry): de = entry.DesktopEntry name = de.getName() or entry.DesktopFileID icon = find_icon(de) or default_entry_icon execute = exec_clean2_re.sub('%', exec_clean1_re.sub('', de.getExec())) if de.getTerminal(): execute = terminal % execute print ("prog \"%s\" \"%s\" %s" % (name, icon, execute)).encode(encoding) try: opts, args = getopt.getopt(sys.argv[1:], "", ("help", "version", "locale=", "root-folder=", "terminal=", "default-folder-icon=", "default-entry-icon=", "entire-menu", "theme=", "with-theme-paths", "icon-size=")) except getopt.GetoptError: print_usage() locale.setlocale(locale.LC_ALL, "") for o, v in opts: if o == "--locale": locale_str = v locale.setlocale(locale.LC_ALL, locale_str) if o == "--root-folder": root_folder = v elif o == "--terminal": terminal = v elif o == "--default-folder-icon": default_folder_icon = v elif o == "--default-entry-icon": default_entry_icon = v elif o == "--entire-menu" : entire_menu = True elif o == "--with-theme-paths" : with_theme_paths = True elif o == "--icon-size": icon_size = int(v) elif o == "--theme" : xdg.Config.setIconTheme(v) elif o in ("-h", "-?", "--help"): print_usage(0) elif o in ("-v", "--version"): print_version() encoding = locale.getlocale()[1] or 'UTF-8' menu = xdg.Menu.parse() if root_folder: menu = menu.getMenu(root_folder) process_menu(menu) From fedora-extras-commits at redhat.com Fri Feb 16 00:45:13 2007 From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa)) Date: Thu, 15 Feb 2007 19:45:13 -0500 Subject: rpms/icewm/FC-5 icewm-configure.patch, NONE, 1.1 icewm.desktop, NONE, 1.1 icewm-keys.patch, NONE, 1.1 icewm-menu.patch, NONE, 1.1 icewm.spec, NONE, 1.1 icewm-startup, NONE, 1.1 icewm-toolbar.patch, NONE, 1.1 icewm-xdg-menu, NONE, 1.1 Message-ID: <200702160045.l1G0jDSG021208@cvs-int.fedora.redhat.com> Author: gilboa Update of /cvs/extras/rpms/icewm/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21191/FC-5 Added Files: icewm-configure.patch icewm.desktop icewm-keys.patch icewm-menu.patch icewm.spec icewm-startup icewm-toolbar.patch icewm-xdg-menu Log Message: Missing files from the FC-5 branch icewm-configure.patch: --- NEW FILE icewm-configure.patch --- --- icewm-1.2.30/configure.in.old 2007-01-16 16:12:51.000000000 +0200 +++ icewm-1.2.30/configure.in 2007-01-16 16:13:31.000000000 +0200 @@ -814,7 +814,7 @@ APPLICATIONS="${APPLICATIONS} icewm-menu-gnome2" GNOME2_PREFIX=`pkg-config --variable=prefix gnome-desktop-2.0` GWMDIR="${GNOME2_PREFIX}/share/gnome/wm-properties/" - CONFIG_GNOME2_MENU_DIR="${GNOME2_PREFIX}/share/gnome/vfolders/" + CONFIG_GNOME2_MENU_DIR="${GNOME2_PREFIX}/share/desktop-directories/ fi if test "${GNOME2_CFLAGS}" = ""; then --- icewm-1.2.30/configure.old 2007-01-16 17:44:10.000000000 +0200 +++ icewm-1.2.30/configure 2007-01-16 17:44:31.000000000 +0200 @@ -12000,7 +12000,7 @@ APPLICATIONS="${APPLICATIONS} icewm-menu-gnome2" GNOME2_PREFIX=`pkg-config --variable=prefix gnome-desktop-2.0` GWMDIR="${GNOME2_PREFIX}/share/gnome/wm-properties/" - CONFIG_GNOME2_MENU_DIR="${GNOME2_PREFIX}/share/gnome/vfolders/" + CONFIG_GNOME2_MENU_DIR="${GNOME2_PREFIX}/share/desktop-directories/" fi if test "${GNOME2_CFLAGS}" = ""; then --- NEW FILE icewm.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Icewm Comment=Simple and fast window manger Exec=icewm-session Terminal=False TryExec=icewm [Window Manager] SessionManaged=true # vi: encoding=utf-8 icewm-keys.patch: --- NEW FILE icewm-keys.patch --- --- icewm-1.2.30/lib/keys.in.old 2007-01-18 13:55:20.000000000 +0200 +++ icewm-1.2.30/lib/keys.in 2007-01-18 16:07:07.000000000 +0200 @@ -9,28 +9,21 @@ # You'll have to omit XK_ prefixs and to replace XF86XK_ prefixes by # XF86. Valid modifiers are Alt, Ctrl, Shift, Meta, Super and Hyper. # -key "Alt+Ctrl+t" xterm -key "Alt+Ctrl+f" fte -key "Alt+Ctrl+e" nedit -key "Alt+Ctrl+g" gimp -key "Alt+Ctrl+n" netscape -noraise -remote openBrowser -key "Alt+Ctrl+b" netscape -noraise -remote openBookmarks -key "Alt+Ctrl+m" netscape -noraise -remote openURL(mailto:,new-window) +key "Alt+Ctrl+t" xterm +key "Alt+Ctrl+b" htmlview +key "Alt+Ctrl+s" htmlview http://www.google.com -key "Alt+Ctrl+KP_Divide" aumix -v -5 # lower volume -key "Alt+Ctrl+KP_Multiply" aumix -v +5 # raise volume +key "Super+KP_Subtract" amixer sset PCM 5%- +key "Super+KP_Add" amixer sset PCM 5%+ # "Multimedia key" bindings for XFree86. Gather the keycodes of your # advanced function keys by watching the output of the xev command whilest # pressing those keys and map those symbols by using xmodmap. -key "XF86Standby" killall -QUIT icewm -key "XF86AudioLowerVolume" aumix -v -5 -key "XF86AudioRaiseVolume" aumix -v +5 -key "XF86AudioMute" aumix -v 0 -key "XF86AudioPlay" cdplay play 1 -key "XF86AudioStop" cdplay stop -key "XF86HomePage" netscape -noraise -remote openHomepage -key "XF86Mail" netscape -noraise -remote openURL(mailto:,new-window) -key "XF86Search" netscape -noraise -remote openURL(http://www.google.com/) -key "XF86Eject" eject +key "XF86Standby" killall -QUIT icewm +key "XF86AudioLowerVolume" amixer sset PCM 5%- +key "XF86AudioRaiseVolume" amixer sset PCM 5%+ +key "XF86AudioMute" amixer sset PCM 0% +key "XF86HomePage" htmlview +key "XF86Search" htmlview http://www.google.com +key "XF86Eject" eject icewm-menu.patch: --- NEW FILE icewm-menu.patch --- --- icewm-1.2.30/lib/menu.in.old 2007-01-28 15:14:30.000000000 +0200 +++ icewm-1.2.30/lib/menu.in 2007-01-28 15:17:12.000000000 +0200 @@ -4,16 +4,7 @@ # since modifications to this file will be discarded when you # (re)install icewm. # -prog xterm xterm xterm -prog rxvt xterm rxvt -bg black -cr green -fg white -C -fn 9x15 -sl 500 -prog fte fte fte -prog NEdit nedit nedit -prog Mozilla mozilla mozilla -prog XChat xchat xchat -prog Gimp gimp gimp +prog xterm /usr/share/icons/Bluecurve/32x32/apps/gnome-terminal.png xterm +prog "Web browser" /usr/share/icons/Bluecurve/32x32/apps/mozilla-icon.png htmlview separator -menuprog Gnome folder icewm-menu-gnome1 --list @CONFIG_GNOME1_MENU_DIR@ -menuprog Gnome folder icewm-menu-gnome2 --list @CONFIG_GNOME2_MENU_DIR@ -menuprog KDE folder icewm-menu-gnome at GNOME_VER@ --list @CONFIG_KDE_MENU_DIR@ -menufile Programs folder programs -menufile Tool_bar folder toolbar +menufile Programs folder programs.autogen --- NEW FILE icewm.spec --- Name: icewm Version: 1.2.30 Release: 12%{?dist} Summary: Light and configurable window manager Group: User Interface/Desktops License: LGPL URL: http://www.icewm.org Source0: http://heanet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz Source1: http://lostclus.linux.kiev.ua/scripts/icewm-xdg-menu Source2: icewm.desktop Source4: icewm-startup BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: imlib-devel BuildRequires: xorg-x11-proto-devel BuildRequires: libXinerama-devel BuildRequires: libXft-devel BuildRequires: libICE-devel BuildRequires: gettext BuildRequires: gnome-desktop-devel Requires: redhat-artwork Requires: alsa-utils Requires: htmlview Requires: xterm Patch0: icewm-configure.patch Patch1: icewm-menu.patch Patch2: icewm-toolbar.patch Patch3: icewm-keys.patch %description IceWM is a window manager for the X Window System (freedesktop, XFree86). The goal of IceWM is speed, simplicity, and not getting in the user's way. %package gnome Summary: GNOME menu support for IceWM window manager Group: User Interface/Desktops Requires: gnome-menus Requires: icewm = %{version}-%{release} %description gnome IceWM-gnome adds gnome-menu support for the IceWM window manager. %package xdgmenu Summary: Automatically generate the main IceWM menu Group: User Interface/Desktops Requires: pyxdg Requires: icewm = %{version}-%{release} %description xdgmenu IceWM-xdgmenu generates static IceWM menu files from the existing freedesktop.org .desktop files. Files are re-generated each time the user logs-in. %prep %setup -q %patch0 -p1 -b .configure %patch1 -p1 -b .menu %patch2 -p1 -b .toolbar %patch3 -p1 -b .keys %build # Configure sets the CXXFLAGS to: -fpermissive -fno-exceptions -fno-rtti -Wxxx... # In general it doesn't seem to break anything. BZ# if you hit something bad. %configure --enable-gradients \ --enable-antialiasing \ --enable-menus-gnome2 \ --disable-menus-gnome1 \ --with-cfgdir=%{_sysconfdir}/icewm make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p" mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 %{__install} -p -m 644 doc/icewm.1.man $RPM_BUILD_ROOT/%{_mandir}/man1/icewm.1 %{__install} -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir} %{__install} -p -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/icewm/startup mkdir -p $RPM_BUILD_ROOT/%{_datadir}/xsessions/ %{__install} -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/xsessions/ %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS BUGS CHANGES COPYING README README.wm-session TODO doc/*.html %exclude %{_datadir}/icewm/startup %{_datadir}/icewm/ %{_datadir}/xsessions/icewm.desktop %{_mandir}/man1/icewm.1* %{_bindir}/icewmbg %{_bindir}/icehelp %{_bindir}/icesh %{_bindir}/icewm %{_bindir}/icewm-session %{_bindir}/icewmhint %{_bindir}/icewmtray %files gnome %defattr(-,root,root,-) %{_bindir}/icewm-menu-gnome2 %files xdgmenu %defattr(-,root,root,-) %{_bindir}/icewm-xdg-menu* %{_datadir}/icewm/startup %changelog * Sat Feb 10 2007 - 1.2.30-12 - Add missing dot in the -gnome sub-package description. - Replace REQ icewm (in both -gnome and -xdgmenu) with icewm-x.x.x. - Fix -xdgmenu file list and %%install section. - Preserve the source time-stamp. * Sun Feb 04 2007 - 1.2.30-11 - Remove .Xdefaults fix from startup. (reported upstream). - Replace buildroot with RPM_BUILD_ROOT. * Sun Jan 28 2007 - 1.2.30-10 - Missing REQ: icewm (both -gnome and -xdgmenu) - Updated menu.in patch. - Updated startup script. (-xdgmenu) - Updated icewm-xdg-menu script. (-xdgmenu) * Thu Jan 25 2007 - 1.2.30-9 - Remove redundant icewm-xdg-menu* %%file entry. - Change sub-package name to xdgmenu. - Move icewm-xdg-menu to xdgmenu sub-package. - Removed the icewm-generate-menu script. * Sat Jan 20 2007 - 1.2.30-8 - Fix source1 URL. (2nd is a winner) - Fix -gnome summery. - New sub-package: icewm-xdg-menu - ALPHA: icewm-generate-menu script added to use icewm-xdg-menu to generate static menus. * Sat Jan 20 2007 - 1.2.30-7 - Fix source1 URL. - Fix xdg-menu* owner. - Replace default terminal icon to reduce dep-chain. - Fix icewm-gnome description. - Replace install with %%{_install} - Push -gnome's BR to main package. - Change hard-coded sysconf path. * Tue Jan 18 2007 - 1.2.30-6 - Change license back to LGPL. - Change summery. - New sub-package: -gnome. (GNOME menu support.) - Missing REQ: xterm. - Missing REQ: htmlview. - Remove redundant %%_sysconf section. - Remove redundant redhat-xxx icons. - New REQ: redhat-artwork. (icons) - Better man pages handling. - Customize keys to better match fedora. - New REQ: eject. (keys) - New REQ: alsautils. (keys) * Wed Jan 17 2007 - 1.2.30-5 - Fix Source0 URL. - Replace cp with install. - Do not gzip the man page, just copy it. - Use htmlview instead of firefox. - Use BlueCurve icons instead of the mozilla ones. - Re-fix lang support. - Return the default configuration files to %%_datadir - Add gdm session support. - Remove gnome-menus from default menu - replace it with pyxdg/icewm-xdg-menu. * Tue Jan 16 2007 - 1.2.30-4 - Fix man page name. - Remove missing menu items. - Convert GNOME-menu patch to configure.in patch. - Push default configuration into /etc/icewm - Remove the default KDE support. (At least for now) - Require firefox (default browser in Fedora). - Add missing firefox icon. (No source - manual convert) - Add missing gnome-menus. (required for GNOME2 menus) - Fix missing gettext BR. - Fix missing lang support. * Sat Jan 13 2007 - 1.2.30-3 - Fix wrong license. (Was LGPL, should be GPL.) * Tue Jan 11 2007 - 1.2.30-2 - Manually add missing man page. * Tue Jan 11 2007 - 1.2.30-1 - Initial release. --- NEW FILE icewm-startup --- #!/bin/sh [ ! -d ~/.icewm ] && mkdir ~/.icewm icewm-xdg-menu --entire-menu --with-theme-paths --icon-size 16 --theme Bluecurve > ~/.icewm/programs.autogen icewm-toolbar.patch: --- NEW FILE icewm-toolbar.patch --- --- icewm-1.2.30/lib/toolbar.in.old 2007-01-18 18:51:55.000000000 +0200 +++ icewm-1.2.30/lib/toolbar.in 2007-01-18 18:55:50.000000000 +0200 @@ -4,6 +4,6 @@ # since modifications to this file will be discarded when you # (re)install icewm. # -prog XTerm xterm xterm -prog FTE fte fte -prog Netscape netscape netscape +prog xterm /usr/share/icons/Bluecurve/32x32/apps/gnome-terminal.png xterm +prog "Web browser" /usr/share/icons/Bluecurve/32x32/apps/mozilla-icon.png htmlview + --- NEW FILE icewm-xdg-menu --- #!/usr/bin/python """ This script generates FreeDesktop application menu for IceWM window manager. Written by Konstantin Korikov , put in the public domain Requires pyxdg http://cvs.freedesktop.org/cgi-bin/viewcvs.cgi/pyxdg/ USAGE EXAMPLE Add to $HOME/.icewm/menu this line: menuprog Applications - icewm-xdg-menu and restart IceWM. """ import sys import locale import getopt import re import xdg.Menu import xdg.DesktopEntry import xdg.IconTheme import xdg.Config version = "0.3" def print_usage(exit_code = 1): print """Usage: %s [options] Options: --locale=locale set output languege and encoding --root-folder folder folder to generate (for example: /Games) --terminal command set terminal emulator command (default: xterm -e %%s) --default-folder-icon icon icon for folders that not provide Icon option --default-entry-icon icon icon for entries that not provide Icon option --with-theme-paths convert icon base names to icon absolute paths using icon theme --entire-menu print entire menu --icon-size set default icon size --theme theme set icon theme --help print this help and exit --version print version and exit """ % sys.argv[0] sys.exit(exit_code) def print_version(): print "%s version %s" % ( os.path.basename(sys.argv[0]), version) sys.exit(0) root_folder = "" terminal = "xterm -e %s" default_folder_icon = "folder" default_entry_icon = "-" entire_menu = False with_theme_paths = False icon_size = 16 exec_clean1_re = re.compile(r'%[a-zA-Z]') exec_clean2_re = re.compile(r'%%') encoding = None locale_str = None def find_icon(entry): icon = entry.getIcon() if icon and with_theme_paths: icon = xdg.IconTheme.getIconPath(icon, icon_size) or icon return icon def process_menu(menu): for entry in menu.getEntries(): if isinstance(entry, xdg.Menu.Menu): name = entry.getName() or entry.DesktopFileID icon = find_icon(entry) or default_folder_icon if entire_menu: print ("menu \"%s\" \"%s\" {" % (name, icon)).encode(encoding) process_menu(entry) print "}".encode(encoding) else: print (("menuprog \"%s\" \"%s\" %s" % (name, icon, sys.argv[0])) + (" --root-folder \"%s\"" % entry.getPath(org=True)) + (" --terminal \"%s\"" % terminal) + (" --default-folder-icon \"%s\"" % default_folder_icon) + (" --default-entry-icon \"%s\"" % default_entry_icon) + (" --theme \"%s\"" % xdg.Config.icon_theme) + (" --icon-size \"%d\"" % icon_size) + (with_theme_paths and " --with-theme-paths" or "")).encode(encoding), if locale_str: print (" --locale \"%s\"" % locale_str).encode(encoding), print elif isinstance(entry, xdg.Menu.MenuEntry): de = entry.DesktopEntry name = de.getName() or entry.DesktopFileID icon = find_icon(de) or default_entry_icon execute = exec_clean2_re.sub('%', exec_clean1_re.sub('', de.getExec())) if de.getTerminal(): execute = terminal % execute print ("prog \"%s\" \"%s\" %s" % (name, icon, execute)).encode(encoding) try: opts, args = getopt.getopt(sys.argv[1:], "", ("help", "version", "locale=", "root-folder=", "terminal=", "default-folder-icon=", "default-entry-icon=", "entire-menu", "theme=", "with-theme-paths", "icon-size=")) except getopt.GetoptError: print_usage() locale.setlocale(locale.LC_ALL, "") for o, v in opts: if o == "--locale": locale_str = v locale.setlocale(locale.LC_ALL, locale_str) if o == "--root-folder": root_folder = v elif o == "--terminal": terminal = v elif o == "--default-folder-icon": default_folder_icon = v elif o == "--default-entry-icon": default_entry_icon = v elif o == "--entire-menu" : entire_menu = True elif o == "--with-theme-paths" : with_theme_paths = True elif o == "--icon-size": icon_size = int(v) elif o == "--theme" : xdg.Config.setIconTheme(v) elif o in ("-h", "-?", "--help"): print_usage(0) elif o in ("-v", "--version"): print_version() encoding = locale.getlocale()[1] or 'UTF-8' menu = xdg.Menu.parse() if root_folder: menu = menu.getMenu(root_folder) process_menu(menu) From fedora-extras-commits at redhat.com Fri Feb 16 01:02:09 2007 From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa)) Date: Thu, 15 Feb 2007 20:02:09 -0500 Subject: rpms/gmrun/FC-6 gmrun-gmrunrc.patch, NONE, 1.1 gmrun.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200702160102.l1G129mG025197@cvs-int.fedora.redhat.com> Author: gilboa Update of /cvs/extras/rpms/gmrun/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25167/FC-6 Modified Files: sources Added Files: gmrun-gmrunrc.patch gmrun.spec Log Message: Missing files in the FC-6 branch gmrun-gmrunrc.patch: --- NEW FILE gmrun-gmrunrc.patch --- --- gmrun-0.9.2/config/gmrunrc.old 2003-11-16 12:43:41.000000000 +0200 +++ gmrun-0.9.2/config/gmrunrc 2007-01-18 16:05:47.000000000 +0200 @@ -3,7 +3,7 @@ # GPL v2.0 applies # Set terminal -Terminal = gnome-terminal --start-factory-server --use-factory +Terminal = xterm TermExec = ${Terminal} -e AlwaysInTerm = ssh telnet ftp lynx mc vi vim pine centericq perldoc man @@ -32,18 +32,13 @@ # - %u gets replaced with the whole URL ("http://www.google.com") # - %s gets replaced with "//www.google.com". This is useful for URL-s # like "man:printf" --> %s will get replaced with "printf" -URL_http = mozilla -remote "openURL(%u, new-window)" -URL_mailto = mozilla -remote "mailto(%s)" +URL_http = htmlview %u +URL_mailto = htmlview %u +URL_file = xdg-open %s URL_man = ${TermExec} 'man %s' URL_info = ${TermExec} 'info %s' -URL_pd = ${TermExec} 'perldoc %s' -URL_file = nautilus %s -URL_readme = ${TermExec} 'less /usr/doc/%s/README' -URL_info = ${TermExec} 'info %s' -URL_sh = sh -c '%s' +URL_search = htmlview 'http://www.google.co.il/search?q=%s' # extension handlers -EXT:doc,rtf = AbiWord %s -EXT:txt,cc,cpp,h,java,html,htm,epl,tex,latex,js,css,xml,xsl,am = emacs %s -EXT:ps = gv %s -EXT:pdf = xpdf %s +# Customize your own extension handler. +EXT:doc,rtf,txt,cc,cpp,h,java,html,htm,epl,tex,latex,js,css,xml,xsl,am,ps,pdf = xdg-open %s + --- NEW FILE gmrun.spec --- Name: gmrun Version: 0.9.2 Release: 7%{?dist} Summary: Lightweight "Run program" dialog box with search history and tab completion Group: User Interface/Desktops License: GPL URL: http://sourceforge.net/projects/gmrun Source0: http://heanet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz Patch0: gmrun-gmrunrc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel BuildRequires: popt Requires: htmlview Requires: xterm Requires: man Requires: info Requires: xdg-utils %description A simple GTK program which provides a "run program" window. It features a bash-like TAB completion, Ctrl-R/Ctrl-S for searching through the history and URL handlers for any user defined prefix. %prep %setup -q %patch0 -p1 -b .gmrunrc %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p" %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog AUTHORS COPYING README NEWS %{_datadir}/gmrun/ %{_bindir}/gmrun %changelog * Sat Feb 10 2007 - 0.9.2-7 - Preserve the source time-stamp. * Sun Feb 04 2007 - 0.9.2-6 - Fixed summery. - Remove redundant fileattr. * Sun Jan 28 2007 - 0.9.2-5 - Missing REQ: man. - Missing REQ: info. - Missing REQ: xdg-open. - Use xdg-open to handle files. * Sat Jan 20 2007 - 0.9.2-4 - Add missing NEWS to %%doc. * Thu Jan 18 2007 - 0.9.2-3 - Fix wrong group and project URLs. - Fix summery, description. - Remove BR: glib2-devel. (REQ by gtk2-devel). - Add BR: popt - Remove gmrunrc from %%config section. - Set gmrunrc to 0644 (by default it's 0600) - Configure gmrunrc to better handle Fedora URI's. - Add REQ: htmlview. (gmrunrc) - Add REQ: xterm. (gmrunrc) * Sat Jan 13 2007 - 0.9.2-2 - Fix Source0 URL. - Remove redundant %%doc files. * Sat Jan 13 2007 - 0.9.2-1 - Initial release. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gmrun/FC-6/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Feb 2007 19:37:33 -0000 1.1 +++ sources 16 Feb 2007 01:01:37 -0000 1.2 @@ -0,0 +1 @@ +6cef37a968006d9496fc56a7099c603c gmrun-0.9.2.tar.gz From fedora-extras-commits at redhat.com Fri Feb 16 01:03:01 2007 From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa)) Date: Thu, 15 Feb 2007 20:03:01 -0500 Subject: rpms/gmrun/FC-5 gmrun-gmrunrc.patch, NONE, 1.1 gmrun.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200702160103.l1G131hs025229@cvs-int.fedora.redhat.com> Author: gilboa Update of /cvs/extras/rpms/gmrun/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25207/FC-5 Modified Files: sources Added Files: gmrun-gmrunrc.patch gmrun.spec Log Message: Missing files in the FC-5 branch gmrun-gmrunrc.patch: --- NEW FILE gmrun-gmrunrc.patch --- --- gmrun-0.9.2/config/gmrunrc.old 2003-11-16 12:43:41.000000000 +0200 +++ gmrun-0.9.2/config/gmrunrc 2007-01-18 16:05:47.000000000 +0200 @@ -3,7 +3,7 @@ # GPL v2.0 applies # Set terminal -Terminal = gnome-terminal --start-factory-server --use-factory +Terminal = xterm TermExec = ${Terminal} -e AlwaysInTerm = ssh telnet ftp lynx mc vi vim pine centericq perldoc man @@ -32,18 +32,13 @@ # - %u gets replaced with the whole URL ("http://www.google.com") # - %s gets replaced with "//www.google.com". This is useful for URL-s # like "man:printf" --> %s will get replaced with "printf" -URL_http = mozilla -remote "openURL(%u, new-window)" -URL_mailto = mozilla -remote "mailto(%s)" +URL_http = htmlview %u +URL_mailto = htmlview %u +URL_file = xdg-open %s URL_man = ${TermExec} 'man %s' URL_info = ${TermExec} 'info %s' -URL_pd = ${TermExec} 'perldoc %s' -URL_file = nautilus %s -URL_readme = ${TermExec} 'less /usr/doc/%s/README' -URL_info = ${TermExec} 'info %s' -URL_sh = sh -c '%s' +URL_search = htmlview 'http://www.google.co.il/search?q=%s' # extension handlers -EXT:doc,rtf = AbiWord %s -EXT:txt,cc,cpp,h,java,html,htm,epl,tex,latex,js,css,xml,xsl,am = emacs %s -EXT:ps = gv %s -EXT:pdf = xpdf %s +# Customize your own extension handler. +EXT:doc,rtf,txt,cc,cpp,h,java,html,htm,epl,tex,latex,js,css,xml,xsl,am,ps,pdf = xdg-open %s + --- NEW FILE gmrun.spec --- Name: gmrun Version: 0.9.2 Release: 7%{?dist} Summary: Lightweight "Run program" dialog box with search history and tab completion Group: User Interface/Desktops License: GPL URL: http://sourceforge.net/projects/gmrun Source0: http://heanet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz Patch0: gmrun-gmrunrc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel BuildRequires: popt Requires: htmlview Requires: xterm Requires: man Requires: info Requires: xdg-utils %description A simple GTK program which provides a "run program" window. It features a bash-like TAB completion, Ctrl-R/Ctrl-S for searching through the history and URL handlers for any user defined prefix. %prep %setup -q %patch0 -p1 -b .gmrunrc %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p" %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog AUTHORS COPYING README NEWS %{_datadir}/gmrun/ %{_bindir}/gmrun %changelog * Sat Feb 10 2007 - 0.9.2-7 - Preserve the source time-stamp. * Sun Feb 04 2007 - 0.9.2-6 - Fixed summery. - Remove redundant fileattr. * Sun Jan 28 2007 - 0.9.2-5 - Missing REQ: man. - Missing REQ: info. - Missing REQ: xdg-open. - Use xdg-open to handle files. * Sat Jan 20 2007 - 0.9.2-4 - Add missing NEWS to %%doc. * Thu Jan 18 2007 - 0.9.2-3 - Fix wrong group and project URLs. - Fix summery, description. - Remove BR: glib2-devel. (REQ by gtk2-devel). - Add BR: popt - Remove gmrunrc from %%config section. - Set gmrunrc to 0644 (by default it's 0600) - Configure gmrunrc to better handle Fedora URI's. - Add REQ: htmlview. (gmrunrc) - Add REQ: xterm. (gmrunrc) * Sat Jan 13 2007 - 0.9.2-2 - Fix Source0 URL. - Remove redundant %%doc files. * Sat Jan 13 2007 - 0.9.2-1 - Initial release. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gmrun/FC-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Feb 2007 19:37:33 -0000 1.1 +++ sources 16 Feb 2007 01:02:29 -0000 1.2 @@ -0,0 +1 @@ +6cef37a968006d9496fc56a7099c603c gmrun-0.9.2.tar.gz From fedora-extras-commits at redhat.com Fri Feb 16 01:52:25 2007 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 15 Feb 2007 20:52:25 -0500 Subject: rpms/gdeskcal import.log,1.10,1.11 Message-ID: <200702160152.l1G1qP4V025741@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/gdeskcal In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25703 Modified Files: import.log Log Message: auto-import gdeskcal-1.0-11 on branch devel from gdeskcal-1.0-11.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gdeskcal/import.log,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- import.log 1 Nov 2006 10:55:19 -0000 1.10 +++ import.log 16 Feb 2007 01:51:52 -0000 1.11 @@ -7,3 +7,4 @@ gdeskcal-1_0-4:FC-5:gdeskcal-1.0-4.src.rpm:1162378335 gdeskcal-1_0-4:FC-6:gdeskcal-1.0-4.src.rpm:1162378419 gdeskcal-1_0-4:HEAD:gdeskcal-1.0-4.src.rpm:1162378504 +gdeskcal-1_0-11:HEAD:gdeskcal-1.0-11.src.rpm:1171590699 From fedora-extras-commits at redhat.com Fri Feb 16 01:52:27 2007 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 15 Feb 2007 20:52:27 -0500 Subject: rpms/gdeskcal/devel gdeskcal.patch, NONE, 1.1 gdeskcal.spec, 1.19, 1.20 Message-ID: <200702160152.l1G1qRcT025746@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/gdeskcal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25703/devel Modified Files: gdeskcal.spec Added Files: gdeskcal.patch Log Message: auto-import gdeskcal-1.0-11 on branch devel from gdeskcal-1.0-11.src.rpm gdeskcal.patch: --- NEW FILE gdeskcal.patch --- --- gDeskCal-1.0/code/CalMediator.py 2006-08-06 11:48:56.000000000 +0100 +++ gDeskCal-1.0/code/CalMediator-new.py 2006-12-27 22:49:15.000000000 +0000 @@ -329,7 +329,7 @@ about.set_comments(_("Keep in touch with your appointments.")) about.show() - + about.destroy() # Index: gdeskcal.spec =================================================================== RCS file: /cvs/extras/rpms/gdeskcal/devel/gdeskcal.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- gdeskcal.spec 27 Dec 2006 22:55:35 -0000 1.19 +++ gdeskcal.spec 16 Feb 2007 01:51:55 -0000 1.20 @@ -1,6 +1,6 @@ Name: gdeskcal Version: 1.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Eye-candy calendar for your desktop Group: User Interface/Desktops License: GPL @@ -8,6 +8,7 @@ Source0: http://www.pycage.de/download/gDeskCal-1.0.tar.gz Source1: gdeskcal.png Source2: gdeskcal.desktop +Patch0: gdeskcal.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils, pygtk2-devel, perl(XML::Parser), gettext @@ -22,8 +23,16 @@ transparency with smooth alpha-blending and its appearance can be changed completely by using skins. +%package languages +Summary: Locale language files for gdesklets +Group: Documentation + +%description languages +Locale language files for gdesklets + %prep %setup -q -n gDeskCal-%{version} +%patch0 -p1 -b .original %build %configure @@ -62,9 +71,14 @@ %{_datadir}/pixmaps/%{name}.png %{_libdir}/%{name}/ +%files languages -f gdesklets.lang + %changelog +* Fri Feb 16 2007 Paul F. Johnson 1.0-11 +- removed the languages files from the main package + * Wed Dec 27 2006 Paul F. Johnson 1.0-10 -- rebuild +- added fix for about dialog * Fri Nov 03 2006 Paul F. Johnson 1.0-9 - added BR gettext From fedora-extras-commits at redhat.com Fri Feb 16 01:53:53 2007 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 15 Feb 2007 20:53:53 -0500 Subject: rpms/gdeskcal import.log,1.11,1.12 Message-ID: <200702160153.l1G1rrQv025845@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/gdeskcal In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25808 Modified Files: import.log Log Message: auto-import gdeskcal-1.0-11 on branch FC-6 from gdeskcal-1.0-11.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gdeskcal/import.log,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- import.log 16 Feb 2007 01:51:52 -0000 1.11 +++ import.log 16 Feb 2007 01:53:20 -0000 1.12 @@ -8,3 +8,4 @@ gdeskcal-1_0-4:FC-6:gdeskcal-1.0-4.src.rpm:1162378419 gdeskcal-1_0-4:HEAD:gdeskcal-1.0-4.src.rpm:1162378504 gdeskcal-1_0-11:HEAD:gdeskcal-1.0-11.src.rpm:1171590699 +gdeskcal-1_0-11:FC-6:gdeskcal-1.0-11.src.rpm:1171590789 From fedora-extras-commits at redhat.com Fri Feb 16 01:53:55 2007 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 15 Feb 2007 20:53:55 -0500 Subject: rpms/gdeskcal/FC-6 gdeskcal.patch,NONE,1.1 gdeskcal.spec,1.18,1.19 Message-ID: <200702160153.l1G1rtbv025848@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/gdeskcal/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25808/FC-6 Modified Files: gdeskcal.spec Added Files: gdeskcal.patch Log Message: auto-import gdeskcal-1.0-11 on branch FC-6 from gdeskcal-1.0-11.src.rpm gdeskcal.patch: --- NEW FILE gdeskcal.patch --- --- gDeskCal-1.0/code/CalMediator.py 2006-08-06 11:48:56.000000000 +0100 +++ gDeskCal-1.0/code/CalMediator-new.py 2006-12-27 22:49:15.000000000 +0000 @@ -329,7 +329,7 @@ about.set_comments(_("Keep in touch with your appointments.")) about.show() - + about.destroy() # Index: gdeskcal.spec =================================================================== RCS file: /cvs/extras/rpms/gdeskcal/FC-6/gdeskcal.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- gdeskcal.spec 3 Nov 2006 12:39:05 -0000 1.18 +++ gdeskcal.spec 16 Feb 2007 01:53:23 -0000 1.19 @@ -1,6 +1,6 @@ Name: gdeskcal Version: 1.0 -Release: 9%{?dist} +Release: 11%{?dist} Summary: Eye-candy calendar for your desktop Group: User Interface/Desktops License: GPL @@ -8,6 +8,7 @@ Source0: http://www.pycage.de/download/gDeskCal-1.0.tar.gz Source1: gdeskcal.png Source2: gdeskcal.desktop +Patch0: gdeskcal.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils, pygtk2-devel, perl(XML::Parser), gettext @@ -22,12 +23,21 @@ transparency with smooth alpha-blending and its appearance can be changed completely by using skins. +%package languages +Summary: Locale language files for gdesklets +Group: Documentation + +%description languages +Locale language files for gdesklets + %prep %setup -q -n gDeskCal-%{version} +%patch0 -p1 -b .original %build %configure -make %{?_smp_mflags} +make +# no multi build as it's annoying the buildsys %install rm -rf %{buildroot} @@ -61,9 +71,20 @@ %{_datadir}/pixmaps/%{name}.png %{_libdir}/%{name}/ +%files languages -f gdesklets.lang + %changelog +* Fri Feb 16 2007 Paul F. Johnson 1.0-11 +- removed the languages files from the main package + +* Wed Dec 27 2006 Paul F. Johnson 1.0-10 +- added fix for about dialog + * Fri Nov 03 2006 Paul F. Johnson 1.0-9 -- added gettext +- added BR gettext + +* Thu Nov 02 2006 Paul F. Johnson 1.0-8 +- removed the smp_mflags as it was annoying the RH buildsys * Thu Nov 02 2006 Paul F. Johnson 1.0-7 - added perl(xml::parser) From fedora-extras-commits at redhat.com Fri Feb 16 02:58:17 2007 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 15 Feb 2007 21:58:17 -0500 Subject: rpms/gtk2hs/FC-5 gtk2hs.spec,1.2,1.3 Message-ID: <200702160258.l1G2wHmp029944@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/gtk2hs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29927 Modified Files: gtk2hs.spec Log Message: remove explicit mozilla-devel version for -devel requires Index: gtk2hs.spec =================================================================== RCS file: /cvs/extras/rpms/gtk2hs/FC-5/gtk2hs.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gtk2hs.spec 22 Jan 2007 04:16:07 -0000 1.2 +++ gtk2hs.spec 16 Feb 2007 02:57:45 -0000 1.3 @@ -1,6 +1,5 @@ %define ghc_version 6.4.2 %define ghcver ghc642 -%define mozver 37:1.7.13 %define build_mozembed 1 %define build_cairo 1 @@ -8,7 +7,7 @@ Summary: A Haskell GUI library based on the Gtk+ GUI toolkit Name: gtk2hs Version: 0.9.10 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL Group: Development/Libraries Source: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz @@ -82,7 +81,7 @@ Group: Development/Libraries Requires: %{ghcver} Requires: %{ghcver}-%{name} = %{version}-%{release} -Requires: mozilla-devel = %{mozver} +Requires: mozilla-devel PreReq: %{_bindir}/ghc-pkg-%{ghc_version} %description -n %{ghcver}-%{name}-mozembed @@ -260,9 +259,11 @@ %changelog +* Fri Feb 16 2007 Jens Petersen - 0.9.10-3.fc5 +- remove explicit mozilla-devel version for -devel requires too + * Mon Jan 22 2007 Jens Petersen - 0.9.10-2.fc5 -- drop explicit mozilla-devel version to avoid rebuild every time it changes - (cf #202395) +- drop explicit mozilla-devel version for buildrequires (cf #202395) * Mon May 15 2006 Jens Petersen - 0.9.10-1 - rework packaging to keep all the ghc packages together except mozembed From fedora-extras-commits at redhat.com Fri Feb 16 03:40:27 2007 From: fedora-extras-commits at redhat.com (Yuichi Nakamura (ynakam)) Date: Thu, 15 Feb 2007 22:40:27 -0500 Subject: rpms/seedit/FC-6 2.1.0-5.patch,NONE,1.1 seedit.spec,1.6,1.7 Message-ID: <200702160340.l1G3eRd6001512@cvs-int.fedora.redhat.com> Author: ynakam Update of /cvs/extras/rpms/seedit/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1491 Modified Files: seedit.spec Added Files: 2.1.0-5.patch Log Message: update for 2.1.0-5 FC6 build 2.1.0-5.patch: --- NEW FILE 2.1.0-5.patch --- Index: Changelog =================================================================== --- Changelog (??????????????? 644) +++ Changelog (???????????????) @@ -1,3 +1,7 @@ +*2007/02/14 + - Fixed bug + -- seedit-converter did not work when "//" is included in path + *2007/02/05 - Fixed installhelper-include.sh for asianux 2 - Add seedit-load.conf to customize obj_type filed of audit Index: core/converter/action.c =================================================================== --- core/converter/action.c (??????????????? 644) +++ core/converter/action.c (???????????????) @@ -516,12 +516,42 @@ } +/*replace '//' with '/' */ +char *remove_slash(char *path) { + char *buf; + char *result; + int len; + int i; + int j; + result = strdup(path); + len = strlen(path); + buf = (char *)my_malloc(sizeof(char) * (len + 1)); + memset(buf, 0, sizeof(char) * (len + 1)); + + j = 0; + for (i=0; i < len; i++) { + if(path[i] == '/') { + if (i > 0 && path[i-1] == '/'){ + /*do nothing*/ + } else { + buf[j] = path[i]; + j++; + } + } else { + buf[j] = path[i]; + j++; + } + } + memcpy(result,buf,len+1); + free(buf); + return result; +} + int register_file_rule(char *path){ char **dir_list; - char *filename; - + char *filename; int state; - + path = remove_slash(path); state = get_file_state(path); filename = get_filename(path, state); add_file_user_list(filename); @@ -540,7 +570,8 @@ /* when allow * is described, add dummy permission to dummy domain. */ label_child_dir(filename); } - + + free(path); return 0; } Index: core/utils/seedit-load.py =================================================================== --- core/utils/seedit-load.py (??????????????? 644) +++ core/utils/seedit-load.py (???????????????) @@ -24,7 +24,7 @@ import string import gettext -gSeeditLoadConf="/etc/seedit/seedit-load.conf" +gSeeditLoadConf="/usr/share/seedit/seedit-load.conf" gMakeFlags="CONFDIR=/etc/seedit/policy OUTDIR=/usr/share/seedit/sepolicy BASEPOLICYDIR=/usr/share/seedit/base_policy MACRODIR=/usr/share/seedit/macros" gAuditCtl="/sbin/auditctl" Index: core/config/Makefile =================================================================== --- core/config/Makefile (??????????????? 644) +++ core/config/Makefile (???????????????) @@ -63,7 +63,7 @@ mkdir -p $(BUILD_ROOT_DIR)/sepolicy mkdir -p $(SEEDITCONFROOT) mkdir -p $(sysconfdir)/seedit - install -p -m 0644 seedit-load.conf $(sysconfdir)/seedit + install -p -m 0644 seedit-load.conf $(SEEDITCONFROOT) cp -p -r base_policy $(SEEDITCONFROOT) cp -p -r macros $(SEEDITCONFROOT) mv $(SEEDITCONFROOT)/base_policy/spdl_spec.xml.expand $(SEEDITCONFROOT)/base_policy/spdl_spec.xml Index: seedit.spec =================================================================== RCS file: /cvs/extras/rpms/seedit/FC-6/seedit.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- seedit.spec 15 Feb 2007 02:32:38 -0000 1.6 +++ seedit.spec 16 Feb 2007 03:39:54 -0000 1.7 @@ -1,5 +1,6 @@ -%define buildnum 4 +%define buildnum 5 %define python_sitelib %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib()') +%define selinuxenabled /usr/sbin/selinuxenabled %define selinuxconf %{_sysconfdir}/selinux/config %define auditrules %{_sysconfdir}/audit/audit.rules @@ -24,11 +25,11 @@ Source0: http://osdn.dl.sourceforge.jp/selpe/23577/%{name}-%{version}.tar.gz Source1: seedit-gui.desktop Source2: seedit-gui.png -Patch0: 2.1.0-4.patch +Patch0: 2.1.0-5.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{betatag}-root-%(%{__id_u} -n) BuildRequires: libselinux-devel >= 1.19, libsepol-devel >= 1.1.1, byacc, flex Requires: checkpolicy, m4, audit, libselinux >= 1.19, libsepol >= 1.1.1 -Provides: seedit-converter +Provides: seedit-converter = %{version}-%{release} %description SELinux Policy Editor(SEEdit) is a tool to make SELinux easy. @@ -99,8 +100,7 @@ %{_datadir}/%{name}/macros %{_datadir}/%{name}/base_policy %dir %{_datadir}/%{name}/sepolicy -%dir %{_sysconfdir}/%{name} -%{_sysconfdir}/%{name}/seedit-load.conf +%{_datadir}/%{name}/seedit-load.conf %package policy Summary: SELinux Policy Editor: Sample simplified policy @@ -124,6 +124,9 @@ %postun policy if [ $1 = 0 ]; then sed -i 's/^SELINUXTYPE=.*/SELINUXTYPE=targeted/g' %{_sysconfdir}/selinux/config + if [ %{selinuxenabled} ]; then + sed -i 's/^SELINUX=.*/SELINUX=permissive/g' %{_sysconfdir}/selinux/config + fi touch /.autorelabel fi @@ -168,6 +171,11 @@ %changelog +* Thu Feb 15 2007 Yuichi Nakamura 2.1.0-5 + - SELINUX= is set permissive when uninstall, +because relabel fails in enforcing mode. + - Modified path to seedit-load.conf + * Thu Feb 15 2007 Yuichi Nakamura 2.1.0-4 - Fixed bug, seedit-converter did not work when "//" is included in path From fedora-extras-commits at redhat.com Fri Feb 16 05:03:50 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Fri, 16 Feb 2007 00:03:50 -0500 Subject: rpms/perl-Text-Quoted/devel .cvsignore, 1.2, 1.3 perl-Text-Quoted.spec, 1.5, 1.6 sources, 1.2, 1.3 Message-ID: <200702160503.l1G53ov8009186@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Text-Quoted/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9163 Modified Files: .cvsignore perl-Text-Quoted.spec sources Log Message: * Fri Feb 16 2007 Ralf Cors??pius - 1.10-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Text-Quoted/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Aug 2005 13:19:30 -0000 1.2 +++ .cvsignore 16 Feb 2007 05:03:18 -0000 1.3 @@ -1 +1 @@ -Text-Quoted-1.8.tar.gz +Text-Quoted-1.10.tar.gz Index: perl-Text-Quoted.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Text-Quoted/devel/perl-Text-Quoted.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Text-Quoted.spec 5 Sep 2006 09:00:05 -0000 1.5 +++ perl-Text-Quoted.spec 16 Feb 2007 05:03:18 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Text-Quoted -Version: 1.8 -Release: 5%{?dist} +Version: 1.10 +Release: 1%{?dist} Summary: Extract the structure of a quoted mail message License: GPL or Artistic Group: Development/Libraries @@ -21,7 +21,7 @@ %prep %setup -q -n Text-Quoted-%{version} -# Shipped +x in perl-Text-Quoted-1.8 +# Shipped +x in perl-Text-Quoted-1.8/1.10 chmod -x Quoted.pm %build @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Fri Feb 16 2007 Ralf Cors??pius - 1.10-1 +- Upstream update. + * Tue Sep 05 2006 Ralf Cors??pius - 1.8-5 - Mass rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Text-Quoted/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Aug 2005 13:19:30 -0000 1.2 +++ sources 16 Feb 2007 05:03:18 -0000 1.3 @@ -1 +1 @@ -cab9d462b480437bab72b6044ac6c788 Text-Quoted-1.8.tar.gz +cfe3acfef95fc33b580b5cfdd5272196 Text-Quoted-1.10.tar.gz From fedora-extras-commits at redhat.com Fri Feb 16 05:05:22 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Fri, 16 Feb 2007 00:05:22 -0500 Subject: rpms/perl-Text-Quoted/FC-6 .cvsignore, 1.2, 1.3 perl-Text-Quoted.spec, 1.5, 1.6 sources, 1.2, 1.3 Message-ID: <200702160505.l1G55MXf009253@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Text-Quoted/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9231 Modified Files: .cvsignore perl-Text-Quoted.spec sources Log Message: * Fri Feb 16 2007 Ralf Cors??pius - 1.10-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Text-Quoted/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Aug 2005 13:19:30 -0000 1.2 +++ .cvsignore 16 Feb 2007 05:04:50 -0000 1.3 @@ -1 +1 @@ -Text-Quoted-1.8.tar.gz +Text-Quoted-1.10.tar.gz Index: perl-Text-Quoted.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Text-Quoted/FC-6/perl-Text-Quoted.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Text-Quoted.spec 5 Sep 2006 09:00:05 -0000 1.5 +++ perl-Text-Quoted.spec 16 Feb 2007 05:04:50 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Text-Quoted -Version: 1.8 -Release: 5%{?dist} +Version: 1.10 +Release: 1%{?dist} Summary: Extract the structure of a quoted mail message License: GPL or Artistic Group: Development/Libraries @@ -21,7 +21,7 @@ %prep %setup -q -n Text-Quoted-%{version} -# Shipped +x in perl-Text-Quoted-1.8 +# Shipped +x in perl-Text-Quoted-1.8/1.10 chmod -x Quoted.pm %build @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Fri Feb 16 2007 Ralf Cors??pius - 1.10-1 +- Upstream update. + * Tue Sep 05 2006 Ralf Cors??pius - 1.8-5 - Mass rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Text-Quoted/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Aug 2005 13:19:30 -0000 1.2 +++ sources 16 Feb 2007 05:04:50 -0000 1.3 @@ -1 +1 @@ -cab9d462b480437bab72b6044ac6c788 Text-Quoted-1.8.tar.gz +cfe3acfef95fc33b580b5cfdd5272196 Text-Quoted-1.10.tar.gz From fedora-extras-commits at redhat.com Fri Feb 16 05:07:44 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Fri, 16 Feb 2007 00:07:44 -0500 Subject: rpms/perl-Text-Quoted/FC-5 .cvsignore, 1.2, 1.3 perl-Text-Quoted.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200702160507.l1G57iQg009336@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Text-Quoted/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9307 Modified Files: .cvsignore perl-Text-Quoted.spec sources Log Message: * Fri Feb 16 2007 Ralf Cors??pius - 1.10-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Text-Quoted/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Aug 2005 13:19:30 -0000 1.2 +++ .cvsignore 16 Feb 2007 05:07:12 -0000 1.3 @@ -1 +1 @@ -Text-Quoted-1.8.tar.gz +Text-Quoted-1.10.tar.gz Index: perl-Text-Quoted.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Text-Quoted/FC-5/perl-Text-Quoted.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Text-Quoted.spec 28 Feb 2006 22:40:11 -0000 1.4 +++ perl-Text-Quoted.spec 16 Feb 2007 05:07:12 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-Text-Quoted -Version: 1.8 -Release: 4%{?dist} +Version: 1.10 +Release: 1%{?dist} Summary: Extract the structure of a quoted mail message License: GPL or Artistic Group: Development/Libraries @@ -21,7 +21,7 @@ %prep %setup -q -n Text-Quoted-%{version} -# Shipped +x in perl-Text-Quoted-1.8 +# Shipped +x in perl-Text-Quoted-1.8/1.10 chmod -x Quoted.pm %build @@ -48,6 +48,12 @@ %{_mandir}/man3/* %changelog +* Fri Feb 16 2007 Ralf Cors??pius - 1.10-1 +- Upstream update. + +* Tue Sep 05 2006 Ralf Cors??pius - 1.8-5 +- Mass rebuild. + * Tue Feb 28 2006 Ralf Cors??pius - 1.8-4 - Rebuild for perl-5.8.8. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Text-Quoted/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Aug 2005 13:19:30 -0000 1.2 +++ sources 16 Feb 2007 05:07:12 -0000 1.3 @@ -1 +1 @@ -cab9d462b480437bab72b6044ac6c788 Text-Quoted-1.8.tar.gz +cfe3acfef95fc33b580b5cfdd5272196 Text-Quoted-1.10.tar.gz From fedora-extras-commits at redhat.com Fri Feb 16 05:12:13 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Fri, 16 Feb 2007 00:12:13 -0500 Subject: rpms/beryl-core/devel .cvsignore, 1.7, 1.8 beryl-core.spec, 1.14, 1.15 sources, 1.7, 1.8 Message-ID: <200702160512.l1G5CDfO009439@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/beryl-core/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9416 Modified Files: .cvsignore beryl-core.spec sources Log Message: beryl 0.1.9999.2, aka 0.2.0-rc2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/beryl-core/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 5 Feb 2007 15:09:49 -0000 1.7 +++ .cvsignore 16 Feb 2007 05:11:41 -0000 1.8 @@ -6,3 +6,4 @@ beryl-core-0.1.99.2.tar.bz2 beryl-mesa-0.1.99.2.tar.bz2 beryl-core-0.1.9999.1.tar.bz2 +beryl-core-0.1.9999.2.tar.bz2 Index: beryl-core.spec =================================================================== RCS file: /cvs/extras/rpms/beryl-core/devel/beryl-core.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- beryl-core.spec 8 Feb 2007 15:38:43 -0000 1.14 +++ beryl-core.spec 16 Feb 2007 05:11:41 -0000 1.15 @@ -2,8 +2,8 @@ Url: http://www.beryl-project.org/ License: GPL Group: User Interface/Desktops -Version: 0.1.9999.1 -Release: 3%{?dist} +Version: 0.1.9999.2 +Release: 1%{?dist} Summary: Beryl OpenGL window and compositing manager BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -160,6 +160,9 @@ %defattr(-,root,root,-) %changelog +* Fri Feb 16 2007 Jarod Wilson 0.1.9999.2-1 +- beryl 0.1.9999.2 (aka 0.2.0-rc2) + * Thu Feb 08 2007 Jarod Wilson 0.1.9999.1-3 - Upstream changed how to turn on beryl-xgl build, respin to turn it back on again (#227844) Index: sources =================================================================== RCS file: /cvs/extras/rpms/beryl-core/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 5 Feb 2007 15:09:49 -0000 1.7 +++ sources 16 Feb 2007 05:11:41 -0000 1.8 @@ -1,2 +1,2 @@ 387d068091bc5c6fa28f6d754e1296d1 beryl-mesa-0.1.99.2.tar.bz2 -e7f65f7caf72ed7ec55f46468099f694 beryl-core-0.1.9999.1.tar.bz2 +f62fd180a1d61dbfe4eba2ae966e9c82 beryl-core-0.1.9999.2.tar.bz2 From fedora-extras-commits at redhat.com Fri Feb 16 05:31:16 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Fri, 16 Feb 2007 00:31:16 -0500 Subject: rpms/perl-Test-ClassAPI/devel .cvsignore, 1.2, 1.3 perl-Test-ClassAPI.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200702160531.l1G5VG89009646@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Test-ClassAPI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9561 Modified Files: .cvsignore perl-Test-ClassAPI.spec sources Log Message: * Fri Feb 16 2007 Ralf Cors??pius - 1.03-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-ClassAPI/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 14 Sep 2005 09:37:45 -0000 1.2 +++ .cvsignore 16 Feb 2007 05:30:44 -0000 1.3 @@ -1 +1 @@ -Test-ClassAPI-1.02.tar.gz +Test-ClassAPI-1.03.tar.gz Index: perl-Test-ClassAPI.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-ClassAPI/devel/perl-Test-ClassAPI.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Test-ClassAPI.spec 5 Sep 2006 09:01:25 -0000 1.4 +++ perl-Test-ClassAPI.spec 16 Feb 2007 05:30:44 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-Test-ClassAPI -Version: 1.02 -Release: 4%{?dist} +Version: 1.03 +Release: 1%{?dist} Summary: Provides basic first-pass API testing for large class trees License: GPL or Artistic Group: Development/Libraries @@ -11,8 +11,14 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch -BuildRequires: perl(Config::Tiny) >= 2.00 -BuildRequires: perl(Class::Inspector) >= 1.06 +BuildRequires: perl(Config::Tiny) >= 2.00 +BuildRequires: perl(Class::Inspector) >= 1.12 +BuildRequires: perl(File::Spec) >= 0.83 + +# Explictly required by lib/Test/ClassAPI.pm +BuildRequires: perl(Params::Util) +# For improved tests +BuildRequires: perl(Test::Pod) %description Provides basic first-pass API testing for large class trees. @@ -40,7 +46,7 @@ rm -rf $RPM_BUILD_ROOT %check -make test +make test AUTOMATED_TESTING=1 %files %defattr(-,root,root,-) @@ -49,6 +55,9 @@ %{_mandir}/man3/* %changelog +* Fri Feb 16 2007 Ralf Cors??pius - 1.03-1 +- Upstream update. + * Tue Sep 05 2006 Ralf Cors??pius - 1.02-4 - Mass rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-ClassAPI/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 14 Sep 2005 09:37:45 -0000 1.2 +++ sources 16 Feb 2007 05:30:44 -0000 1.3 @@ -1 +1 @@ -f242a7d8ca652d7207a50461e328dafc Test-ClassAPI-1.02.tar.gz +5a0c678e86287b4b6f5250a2a632763b Test-ClassAPI-1.03.tar.gz From fedora-extras-commits at redhat.com Fri Feb 16 05:41:06 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Fri, 16 Feb 2007 00:41:06 -0500 Subject: rpms/perl-Test-ClassAPI/FC-6 .cvsignore, 1.2, 1.3 perl-Test-ClassAPI.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200702160541.l1G5f6wX009740@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Test-ClassAPI/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9717 Modified Files: .cvsignore perl-Test-ClassAPI.spec sources Log Message: * Fri Feb 16 2007 Ralf Cors??pius - 1.03-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-ClassAPI/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 14 Sep 2005 09:37:45 -0000 1.2 +++ .cvsignore 16 Feb 2007 05:40:33 -0000 1.3 @@ -1 +1 @@ -Test-ClassAPI-1.02.tar.gz +Test-ClassAPI-1.03.tar.gz Index: perl-Test-ClassAPI.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-ClassAPI/FC-6/perl-Test-ClassAPI.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Test-ClassAPI.spec 5 Sep 2006 09:01:25 -0000 1.4 +++ perl-Test-ClassAPI.spec 16 Feb 2007 05:40:33 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-Test-ClassAPI -Version: 1.02 -Release: 4%{?dist} +Version: 1.03 +Release: 1%{?dist} Summary: Provides basic first-pass API testing for large class trees License: GPL or Artistic Group: Development/Libraries @@ -11,8 +11,14 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch -BuildRequires: perl(Config::Tiny) >= 2.00 -BuildRequires: perl(Class::Inspector) >= 1.06 +BuildRequires: perl(Config::Tiny) >= 2.00 +BuildRequires: perl(Class::Inspector) >= 1.12 +BuildRequires: perl(File::Spec) >= 0.83 + +# Explictly required by lib/Test/ClassAPI.pm +BuildRequires: perl(Params::Util) +# For improved tests +BuildRequires: perl(Test::Pod) %description Provides basic first-pass API testing for large class trees. @@ -40,7 +46,7 @@ rm -rf $RPM_BUILD_ROOT %check -make test +make test AUTOMATED_TESTING=1 %files %defattr(-,root,root,-) @@ -49,6 +55,9 @@ %{_mandir}/man3/* %changelog +* Fri Feb 16 2007 Ralf Cors??pius - 1.03-1 +- Upstream update. + * Tue Sep 05 2006 Ralf Cors??pius - 1.02-4 - Mass rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-ClassAPI/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 14 Sep 2005 09:37:45 -0000 1.2 +++ sources 16 Feb 2007 05:40:33 -0000 1.3 @@ -1 +1 @@ -f242a7d8ca652d7207a50461e328dafc Test-ClassAPI-1.02.tar.gz +5a0c678e86287b4b6f5250a2a632763b Test-ClassAPI-1.03.tar.gz From fedora-extras-commits at redhat.com Fri Feb 16 05:42:22 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Fri, 16 Feb 2007 00:42:22 -0500 Subject: rpms/perl-Test-ClassAPI/FC-5 .cvsignore, 1.2, 1.3 perl-Test-ClassAPI.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200702160542.l1G5gMrE009807@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Test-ClassAPI/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9786 Modified Files: .cvsignore perl-Test-ClassAPI.spec sources Log Message: * Fri Feb 16 2007 Ralf Cors??pius - 1.03-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-ClassAPI/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 14 Sep 2005 09:37:45 -0000 1.2 +++ .cvsignore 16 Feb 2007 05:41:50 -0000 1.3 @@ -1 +1 @@ -Test-ClassAPI-1.02.tar.gz +Test-ClassAPI-1.03.tar.gz Index: perl-Test-ClassAPI.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-ClassAPI/FC-5/perl-Test-ClassAPI.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Test-ClassAPI.spec 28 Feb 2006 23:30:09 -0000 1.3 +++ perl-Test-ClassAPI.spec 16 Feb 2007 05:41:50 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Test-ClassAPI -Version: 1.02 -Release: 3%{?dist} +Version: 1.03 +Release: 1%{?dist} Summary: Provides basic first-pass API testing for large class trees License: GPL or Artistic Group: Development/Libraries @@ -11,8 +11,14 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch -BuildRequires: perl(Config::Tiny) >= 2.00 -BuildRequires: perl(Class::Inspector) >= 1.06 +BuildRequires: perl(Config::Tiny) >= 2.00 +BuildRequires: perl(Class::Inspector) >= 1.12 +BuildRequires: perl(File::Spec) >= 0.83 + +# Explictly required by lib/Test/ClassAPI.pm +BuildRequires: perl(Params::Util) +# For improved tests +BuildRequires: perl(Test::Pod) %description Provides basic first-pass API testing for large class trees. @@ -40,7 +46,7 @@ rm -rf $RPM_BUILD_ROOT %check -make test +make test AUTOMATED_TESTING=1 %files %defattr(-,root,root,-) @@ -49,6 +55,12 @@ %{_mandir}/man3/* %changelog +* Fri Feb 16 2007 Ralf Cors??pius - 1.03-1 +- Upstream update. + +* Tue Sep 05 2006 Ralf Cors??pius - 1.02-4 +- Mass rebuild. + * Wed Mar 01 2006 Ralf Cors??pius - 1.02-3 - Rebuild for perl-5.8.8. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-ClassAPI/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 14 Sep 2005 09:37:45 -0000 1.2 +++ sources 16 Feb 2007 05:41:50 -0000 1.3 @@ -1 +1 @@ -f242a7d8ca652d7207a50461e328dafc Test-ClassAPI-1.02.tar.gz +5a0c678e86287b4b6f5250a2a632763b Test-ClassAPI-1.03.tar.gz From fedora-extras-commits at redhat.com Fri Feb 16 06:41:11 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Fri, 16 Feb 2007 01:41:11 -0500 Subject: rpms/perl-Locale-Maketext-Lexicon/devel .cvsignore, 1.6, 1.7 perl-Locale-Maketext-Lexicon.spec, 1.9, 1.10 sources, 1.6, 1.7 Message-ID: <200702160641.l1G6fB63013816@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13793 Modified Files: .cvsignore perl-Locale-Maketext-Lexicon.spec sources Log Message: * Fri Feb 16 2007 Ralf Cors??pius - 0.62-1 - Upgrade to 0.62. - Reflect licence change from Artistic/GPL to MIT. - BR: /usr/bin/msgunfmt. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 22 Apr 2006 04:23:12 -0000 1.6 +++ .cvsignore 16 Feb 2007 06:40:39 -0000 1.7 @@ -1 +1 @@ -Locale-Maketext-Lexicon-0.60.tar.gz +Locale-Maketext-Lexicon-0.62.tar.gz Index: perl-Locale-Maketext-Lexicon.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel/perl-Locale-Maketext-Lexicon.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Locale-Maketext-Lexicon.spec 5 Sep 2006 10:05:29 -0000 1.9 +++ perl-Locale-Maketext-Lexicon.spec 16 Feb 2007 06:40:39 -0000 1.10 @@ -1,14 +1,22 @@ Name: perl-Locale-Maketext-Lexicon -Version: 0.60 -Release: 2%{?dist} +Version: 0.62 +Release: 1%{?dist} Summary: Extract translatable strings from source -License: GPL or Artistic +%if "%{version}" > "0.60" +License: MIT +%else +License: GPL or Artistic +%endif Group: Development/Libraries URL: http://search.cpan.org/dist/Locale-Maketext-Lexicon/ Source0: http://search.cpan.org/CPAN/authors/id/A/AU/AUTRIJUS/Locale-Maketext-Lexicon-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +# Required by the tests +%if "%{version}" > "0.60" +BuildRequires: /usr/bin/msgunfmt +%endif BuildArch: noarch %description @@ -55,6 +63,11 @@ %{_mandir}/man3/* %changelog +* Fri Feb 16 2007 Ralf Cors??pius - 0.62-1 +- Upgrade to 0.62. +- Reflect licence change from Artistic/GPL to MIT. +- BR: /usr/bin/msgunfmt. + * Tue Sep 05 2006 Ralf Cors??pius - 0.60-2 - Mass rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 22 Apr 2006 04:23:12 -0000 1.6 +++ sources 16 Feb 2007 06:40:39 -0000 1.7 @@ -1 +1 @@ -242998c3f513999d2e57c396647f0bd2 Locale-Maketext-Lexicon-0.60.tar.gz +989642c1a83ddc7f1337d77422ee40cf Locale-Maketext-Lexicon-0.62.tar.gz From fedora-extras-commits at redhat.com Fri Feb 16 07:21:08 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Fri, 16 Feb 2007 02:21:08 -0500 Subject: rpms/perl-Locale-Maketext-Lexicon/FC-6 .cvsignore, 1.6, 1.7 perl-Locale-Maketext-Lexicon.spec, 1.9, 1.10 sources, 1.6, 1.7 Message-ID: <200702160721.l1G7L81H017536@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17509 Modified Files: .cvsignore perl-Locale-Maketext-Lexicon.spec sources Log Message: * Fri Feb 16 2007 Ralf Cors??pius - 0.62-1 - Upgrade to 0.62. - Reflect licence change from Artistic/GPL to MIT. - BR: /usr/bin/msgunfmt. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/FC-6/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 22 Apr 2006 04:23:12 -0000 1.6 +++ .cvsignore 16 Feb 2007 07:20:36 -0000 1.7 @@ -1 +1 @@ -Locale-Maketext-Lexicon-0.60.tar.gz +Locale-Maketext-Lexicon-0.62.tar.gz Index: perl-Locale-Maketext-Lexicon.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/FC-6/perl-Locale-Maketext-Lexicon.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Locale-Maketext-Lexicon.spec 5 Sep 2006 10:05:29 -0000 1.9 +++ perl-Locale-Maketext-Lexicon.spec 16 Feb 2007 07:20:36 -0000 1.10 @@ -1,14 +1,22 @@ Name: perl-Locale-Maketext-Lexicon -Version: 0.60 -Release: 2%{?dist} +Version: 0.62 +Release: 1%{?dist} Summary: Extract translatable strings from source -License: GPL or Artistic +%if "%{version}" > "0.60" +License: MIT +%else +License: GPL or Artistic +%endif Group: Development/Libraries URL: http://search.cpan.org/dist/Locale-Maketext-Lexicon/ Source0: http://search.cpan.org/CPAN/authors/id/A/AU/AUTRIJUS/Locale-Maketext-Lexicon-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +# Required by the tests +%if "%{version}" > "0.60" +BuildRequires: /usr/bin/msgunfmt +%endif BuildArch: noarch %description @@ -55,6 +63,11 @@ %{_mandir}/man3/* %changelog +* Fri Feb 16 2007 Ralf Cors??pius - 0.62-1 +- Upgrade to 0.62. +- Reflect licence change from Artistic/GPL to MIT. +- BR: /usr/bin/msgunfmt. + * Tue Sep 05 2006 Ralf Cors??pius - 0.60-2 - Mass rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/FC-6/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 22 Apr 2006 04:23:12 -0000 1.6 +++ sources 16 Feb 2007 07:20:36 -0000 1.7 @@ -1 +1 @@ -242998c3f513999d2e57c396647f0bd2 Locale-Maketext-Lexicon-0.60.tar.gz +989642c1a83ddc7f1337d77422ee40cf Locale-Maketext-Lexicon-0.62.tar.gz From fedora-extras-commits at redhat.com Fri Feb 16 07:22:25 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Fri, 16 Feb 2007 02:22:25 -0500 Subject: rpms/perl-Locale-Maketext-Lexicon/FC-5 .cvsignore, 1.5, 1.6 perl-Locale-Maketext-Lexicon.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <200702160722.l1G7MPKb017643@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17611 Modified Files: .cvsignore perl-Locale-Maketext-Lexicon.spec sources Log Message: * Fri Feb 16 2007 Ralf Cors??pius - 0.62-1 - Upgrade to 0.62. - Reflect licence change from Artistic/GPL to MIT. - BR: /usr/bin/msgunfmt. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 19 Mar 2006 02:52:17 -0000 1.5 +++ .cvsignore 16 Feb 2007 07:21:52 -0000 1.6 @@ -1 +1 @@ -Locale-Maketext-Lexicon-0.54.tar.gz +Locale-Maketext-Lexicon-0.62.tar.gz Index: perl-Locale-Maketext-Lexicon.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/FC-5/perl-Locale-Maketext-Lexicon.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Locale-Maketext-Lexicon.spec 19 Mar 2006 02:52:17 -0000 1.7 +++ perl-Locale-Maketext-Lexicon.spec 16 Feb 2007 07:21:52 -0000 1.8 @@ -1,14 +1,22 @@ Name: perl-Locale-Maketext-Lexicon -Version: 0.54 +Version: 0.62 Release: 1%{?dist} Summary: Extract translatable strings from source -License: GPL or Artistic +%if "%{version}" > "0.60" +License: MIT +%else +License: GPL or Artistic +%endif Group: Development/Libraries URL: http://search.cpan.org/dist/Locale-Maketext-Lexicon/ Source0: http://search.cpan.org/CPAN/authors/id/A/AU/AUTRIJUS/Locale-Maketext-Lexicon-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +# Required by the tests +%if "%{version}" > "0.60" +BuildRequires: /usr/bin/msgunfmt +%endif BuildArch: noarch %description @@ -55,6 +63,17 @@ %{_mandir}/man3/* %changelog +* Fri Feb 16 2007 Ralf Cors??pius - 0.62-1 +- Upgrade to 0.62. +- Reflect licence change from Artistic/GPL to MIT. +- BR: /usr/bin/msgunfmt. + +* Tue Sep 05 2006 Ralf Cors??pius - 0.60-2 +- Mass rebuild. + +* Sat Apr 22 2006 Ralf Cors??pius - 0.60-1 +- Upstream update. + * Sun Mar 19 2006 Ralf Cors??pius - 0.54-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 19 Mar 2006 02:52:17 -0000 1.5 +++ sources 16 Feb 2007 07:21:52 -0000 1.6 @@ -1 +1 @@ -2adcb8651081bcb07629305f8b5e8f71 Locale-Maketext-Lexicon-0.54.tar.gz +989642c1a83ddc7f1337d77422ee40cf Locale-Maketext-Lexicon-0.62.tar.gz From fedora-extras-commits at redhat.com Fri Feb 16 08:07:36 2007 From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu)) Date: Fri, 16 Feb 2007 03:07:36 -0500 Subject: rpms/sysprof-kmod/devel sysprof-kmod.spec,1.33,1.34 Message-ID: <200702160807.l1G87aXr021429@cvs-int.fedora.redhat.com> Author: giallu Update of /cvs/extras/rpms/sysprof-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21405 Modified Files: sysprof-kmod.spec Log Message: Rebuild for kernel 2.6.20-1.2930.fc7 Index: sysprof-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/sysprof-kmod/devel/sysprof-kmod.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sysprof-kmod.spec 14 Feb 2007 22:36:25 -0000 1.33 +++ sysprof-kmod.spec 16 Feb 2007 08:07:04 -0000 1.34 @@ -4,7 +4,7 @@ # end stuff to be ... # hardcode for now: -%{!?kversion: %define kversion 2.6.20-1.2925.fc7} +%{!?kversion: %define kversion 2.6.20-1.2930.fc7} # hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g. # --define "kversion 2.6.16-1.2096_FC5" From fedora-extras-commits at redhat.com Fri Feb 16 09:10:40 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 16 Feb 2007 04:10:40 -0500 Subject: rpms/scummvm/devel scummvm-0.9.1-new-flac.patch, NONE, 1.1 scummvm-0.9.1-no-execstack.patch, NONE, 1.1 scummvm.spec, 1.3, 1.4 Message-ID: <200702160910.l1G9AecD026691@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/scummvm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26663 Modified Files: scummvm.spec Added Files: scummvm-0.9.1-new-flac.patch scummvm-0.9.1-no-execstack.patch Log Message: * Thu Feb 15 2007 Hans de Goede 0.9.1-3 - Take patches from svn for new flac support and rebuild for new flac - Fix (remove) execstack usage scummvm-0.9.1-new-flac.patch: --- NEW FILE scummvm-0.9.1-new-flac.patch --- --- scummvm/trunk/sound/flac.cpp 2006/04/29 22:33:31 22231 +++ scummvm/trunk/sound/flac.cpp 2006/10/28 13:21:43 24554 @@ -31,7 +31,42 @@ #include "sound/audiocd.h" #define FLAC__NO_DLL // that MS-magic gave me headaches - just link the library you like +#include + + +// check if we have FLAC >= 1.1.3; LEGACY_FLAC code can be removed once FLAC-1.1.3 propagates everywhere +#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8 +#define LEGACY_FLAC +#else +#undef LEGACY_FLAC +#endif + + +#ifdef LEGACY_FLAC + +// Before FLAC 1.1.3, we needed to use the stream decoder API. #include +typedef uint FLAC_size_t; + +#else + +// With FLAC 1.1.3, the stream decoder API was merged into the regular +// stream API. In order to stay compatible with older FLAC versions, we +// simply add some typedefs and #ifdefs to map between the old and new API. +// We use the typedefs (instead of only #defines) in order to somewhat +// improve the readability of the code. + +#include +typedef size_t FLAC_size_t; +// Add aliases for the old names +typedef FLAC__StreamDecoderState FLAC__SeekableStreamDecoderState; +typedef FLAC__StreamDecoderReadStatus FLAC__SeekableStreamDecoderReadStatus; +typedef FLAC__StreamDecoderSeekStatus FLAC__SeekableStreamDecoderSeekStatus; +typedef FLAC__StreamDecoderTellStatus FLAC__SeekableStreamDecoderTellStatus; +typedef FLAC__StreamDecoderLengthStatus FLAC__SeekableStreamDecoderLengthStatus; +typedef FLAC__StreamDecoder FLAC__SeekableStreamDecoder; + +#endif using Common::File; @@ -81,7 +116,7 @@ inline void setLastSample(FLAC__uint64 absoluteSample); protected: - inline ::FLAC__SeekableStreamDecoderReadStatus callbackRead(FLAC__byte buffer[], uint *bytes); + inline ::FLAC__SeekableStreamDecoderReadStatus callbackRead(FLAC__byte buffer[], FLAC_size_t *bytes); inline ::FLAC__SeekableStreamDecoderSeekStatus callbackSeek(FLAC__uint64 absoluteByteOffset); inline ::FLAC__SeekableStreamDecoderTellStatus callbackTell(FLAC__uint64 *absoluteByteOffset); inline ::FLAC__SeekableStreamDecoderLengthStatus callbackLength(FLAC__uint64 *streamLength); @@ -93,7 +128,7 @@ ::FLAC__SeekableStreamDecoder *_decoder; private: - static ::FLAC__SeekableStreamDecoderReadStatus callWrapRead(const ::FLAC__SeekableStreamDecoder *decoder, FLAC__byte buffer[], uint *bytes, void *clientData); + static ::FLAC__SeekableStreamDecoderReadStatus callWrapRead(const ::FLAC__SeekableStreamDecoder *decoder, FLAC__byte buffer[], FLAC_size_t *bytes, void *clientData); static ::FLAC__SeekableStreamDecoderSeekStatus callWrapSeek(const ::FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 absoluteByteOffset, void *clientData); static ::FLAC__SeekableStreamDecoderTellStatus callWrapTell(const ::FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 *absoluteByteOffset, void *clientData); static ::FLAC__SeekableStreamDecoderLengthStatus callWrapLength(const ::FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 *streamLength, void *clientData); @@ -101,6 +136,7 @@ static ::FLAC__StreamDecoderWriteStatus callWrapWrite(const ::FLAC__SeekableStreamDecoder *decoder, const ::FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *clientData); static void callWrapMetadata(const ::FLAC__SeekableStreamDecoder *decoder, const ::FLAC__StreamMetadata *metadata, void *clientData); static void callWrapError(const ::FLAC__SeekableStreamDecoder *decoder, ::FLAC__StreamDecoderErrorStatus status, void *clientData); + // Private and undefined so you can't use them: FlacInputStream(const FlacInputStream &); void operator=(const FlacInputStream &); @@ -157,7 +193,12 @@ }; FlacInputStream::FlacInputStream(File *sourceFile, const uint32 fileStart) - : _decoder(::FLAC__seekable_stream_decoder_new()), _firstSample(0), _lastSample(0), +#ifdef LEGACY_FLAC + : _decoder(::FLAC__seekable_stream_decoder_new()), +#else + : _decoder(::FLAC__stream_decoder_new()), +#endif + _firstSample(0), _lastSample(0), _outBuffer(NULL), _requestedSamples(0), _lastSampleWritten(true), _methodConvertBuffers(&FlacInputStream::convertBuffersGeneric) { @@ -178,7 +219,12 @@ } FlacInputStream::FlacInputStream(File *sourceFile, const uint32 fileStart, const uint32 fileStop) - : _decoder(::FLAC__seekable_stream_decoder_new()), _firstSample(0), _lastSample(0), +#ifdef LEGACY_FLAC + : _decoder(::FLAC__seekable_stream_decoder_new()), +#else + : _decoder(::FLAC__stream_decoder_new()), +#endif + _firstSample(0), _lastSample(0), _outBuffer(NULL), _requestedSamples(0), _lastSampleWritten(true), _methodConvertBuffers(&FlacInputStream::convertBuffersGeneric) { @@ -201,8 +247,13 @@ FlacInputStream::~FlacInputStream() { if (_decoder != NULL) { +#ifdef LEGACY_FLAC (void) ::FLAC__seekable_stream_decoder_finish(_decoder); ::FLAC__seekable_stream_decoder_delete(_decoder); +#else + (void) ::FLAC__stream_decoder_finish(_decoder); + ::FLAC__stream_decoder_delete(_decoder); +#endif } if (_preBuffer.bufData != NULL) delete[] _preBuffer.bufData; @@ -212,12 +263,20 @@ inline FLAC__SeekableStreamDecoderState FlacInputStream::getState() const { assert(isValid()); +#ifdef LEGACY_FLAC return ::FLAC__seekable_stream_decoder_get_state(_decoder); +#else + return ::FLAC__stream_decoder_get_state(_decoder); +#endif } inline FLAC__StreamDecoderState FlacInputStream::getStreamDecoderState() const { assert(isValid()); +#ifdef LEGACY_FLAC return ::FLAC__seekable_stream_decoder_get_stream_decoder_state(_decoder); +#else + return ::FLAC__stream_decoder_get_state(_decoder); +#endif } bool FlacInputStream::init() { @@ -229,6 +288,7 @@ _lastSampleWritten = false; _methodConvertBuffers = &FlacInputStream::convertBuffersGeneric; +#ifdef LEGACY_FLAC ::FLAC__seekable_stream_decoder_set_read_callback(_decoder, &FlacInputStream::callWrapRead); ::FLAC__seekable_stream_decoder_set_seek_callback(_decoder, &FlacInputStream::callWrapSeek); ::FLAC__seekable_stream_decoder_set_tell_callback(_decoder, &FlacInputStream::callWrapTell); @@ -247,6 +307,27 @@ } } } +#else + if (::FLAC__stream_decoder_init_stream( + _decoder, + &FlacInputStream::callWrapRead, + &FlacInputStream::callWrapSeek, + &FlacInputStream::callWrapTell, + &FlacInputStream::callWrapLength, + &FlacInputStream::callWrapEOF, + &FlacInputStream::callWrapWrite, + &FlacInputStream::callWrapMetadata, + &FlacInputStream::callWrapError, + (void*)this + ) == FLAC__STREAM_DECODER_INIT_STATUS_OK) { + if (processUntilEndOfMetadata() && _streaminfo.channels > 0) { + if (_firstSample == 0 || 0 != ::FLAC__stream_decoder_seek_absolute(_decoder, _firstSample)) { + // FLAC__StreamDecoderState state = getStreamDecoderState(); + return true; // no error occured + } + } + } +#endif warning("FlacInputStream: could not create an Audiostream from File %s", _fileInfo.fileHandle->name()); return false; @@ -255,28 +336,48 @@ bool FlacInputStream::finish() { assert(isValid()); deleteBuffer(); +#ifdef LEGACY_FLAC return 0 != ::FLAC__seekable_stream_decoder_finish(_decoder); +#else + return 0 != ::FLAC__stream_decoder_finish(_decoder); +#endif } bool FlacInputStream::flush() { assert(isValid()); flushBuffer(); +#ifdef LEGACY_FLAC return 0 != ::FLAC__seekable_stream_decoder_flush(_decoder); +#else + return 0 != ::FLAC__stream_decoder_flush(_decoder); +#endif } inline bool FlacInputStream::processSingleBlock() { assert(isValid()); +#ifdef LEGACY_FLAC return 0 != ::FLAC__seekable_stream_decoder_process_single(_decoder); +#else + return 0 != ::FLAC__stream_decoder_process_single(_decoder); +#endif } inline bool FlacInputStream::processUntilEndOfMetadata() { assert(isValid()); +#ifdef LEGACY_FLAC return 0 != ::FLAC__seekable_stream_decoder_process_until_end_of_metadata(_decoder); +#else + return 0 != ::FLAC__stream_decoder_process_until_end_of_metadata(_decoder); +#endif } bool FlacInputStream::seekAbsolute(FLAC__uint64 sample) { assert(isValid()); +#ifdef LEGACY_FLAC const bool result = (0 != ::FLAC__seekable_stream_decoder_seek_absolute(_decoder, sample)); +#else + const bool result = (0 != ::FLAC__stream_decoder_seek_absolute(_decoder, sample)); +#endif if (result) { flushBuffer(); _lastSampleWritten = (_lastSample != 0 && sample >= _lastSample); // only set if we are SURE @@ -349,11 +450,15 @@ return decoderOk ? samples : -1; } -inline ::FLAC__SeekableStreamDecoderReadStatus FlacInputStream::callbackRead(FLAC__byte buffer[], uint *bytes) { +inline ::FLAC__SeekableStreamDecoderReadStatus FlacInputStream::callbackRead(FLAC__byte buffer[], FLAC_size_t *bytes) { assert(_fileInfo.fileHandle != NULL); if (*bytes == 0) +#ifdef LEGACY_FLAC return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_ERROR; /* abort to avoid a deadlock */ +#else + return FLAC__STREAM_DECODER_READ_STATUS_ABORT; /* abort to avoid a deadlock */ +#endif const uint32 length = MIN(_fileInfo.fileEndPos - _fileInfo.filePos, static_cast(*bytes)); @@ -361,11 +466,19 @@ const uint32 bytesRead = _fileInfo.fileHandle->read(buffer, length); if (bytesRead == 0 && _fileInfo.fileHandle->ioFailed()) +#ifdef LEGACY_FLAC return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_ERROR; +#else + return FLAC__STREAM_DECODER_READ_STATUS_ABORT; +#endif _fileInfo.filePos += bytesRead; *bytes = static_cast(bytesRead); +#ifdef LEGACY_FLAC return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_OK; +#else + return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE; +#endif } inline void FlacInputStream::setLastSample(FLAC__uint64 absoluteSample) { @@ -644,23 +757,38 @@ if (result) _fileInfo.filePos = static_cast(newPos); +#ifdef LEGACY_FLAC return result ? FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_OK : FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_ERROR; - +#else + return result ? FLAC__STREAM_DECODER_SEEK_STATUS_OK : FLAC__STREAM_DECODER_SEEK_STATUS_ERROR; +#endif } inline ::FLAC__SeekableStreamDecoderTellStatus FlacInputStream::callbackTell(FLAC__uint64 *absoluteByteOffset) { /*if () return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_ERROR;*/ *absoluteByteOffset = static_cast(_fileInfo.filePos-_fileInfo.fileStartPos); +#ifdef LEGACY_FLAC return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK; +#else + return FLAC__STREAM_DECODER_TELL_STATUS_OK; +#endif } inline ::FLAC__SeekableStreamDecoderLengthStatus FlacInputStream::callbackLength(FLAC__uint64 *streamLength) { if (_fileInfo.fileStartPos > _fileInfo.fileEndPos) +#ifdef LEGACY_FLAC return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_ERROR; +#else + return FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR; +#endif *streamLength = static_cast(_fileInfo.fileEndPos - _fileInfo.fileStartPos); +#ifdef LEGACY_FLAC return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK; +#else + return FLAC__STREAM_DECODER_LENGTH_STATUS_OK; +#endif } inline bool FlacInputStream::callbackEOF() { @@ -682,7 +810,7 @@ } /* Static Callback Wrappers */ -::FLAC__SeekableStreamDecoderReadStatus FlacInputStream::callWrapRead(const ::FLAC__SeekableStreamDecoder *decoder, FLAC__byte buffer[], uint *bytes, void *clientData) { +::FLAC__SeekableStreamDecoderReadStatus FlacInputStream::callWrapRead(const ::FLAC__SeekableStreamDecoder *decoder, FLAC__byte buffer[], FLAC_size_t *bytes, void *clientData) { assert(0 != clientData); FlacInputStream *instance = reinterpret_cast(clientData); assert(0 != instance); @@ -756,8 +884,7 @@ void play(Audio::Mixer *mixer, Audio::SoundHandle *handle, int startFrame, int duration); }; -FlacTrackInfo::FlacTrackInfo(File *file) : _file(NULL), _firstStream(NULL) -{ +FlacTrackInfo::FlacTrackInfo(File *file) : _file(NULL), _firstStream(NULL) { FlacInputStream *tempStream = new FlacInputStream(file); /* first time the file will be tested, but not used */ if (tempStream->init()) { @@ -800,14 +927,12 @@ delete flac; } -FlacTrackInfo::~FlacTrackInfo() -{ +FlacTrackInfo::~FlacTrackInfo() { delete _firstStream; delete _file; } -DigitalTrackInfo* getFlacTrack(int track) -{ +DigitalTrackInfo* getFlacTrack(int track) { assert(track >=1); char track_name[32]; File *file = new File(); @@ -837,8 +962,7 @@ return NULL; } -AudioStream *makeFlacStream(File *file, uint32 length) -{ +AudioStream *makeFlacStream(File *file, uint32 length) { assert(file != NULL); uint32 start = file->pos(); --- scummvm/trunk/configure 2006/10/21 20:41:49 24421 +++ scummvm/trunk/configure 2006/10/28 13:21:43 24554 @@ -1044,15 +1044,15 @@ if test "$_flac" = auto ; then _flac=no cat > $TMPC << EOF -#include -int main(void) { FLAC__seekable_stream_decoder_init( 0 ); return 0; } +#include +int main(void) { return FLAC__STREAM_SYNC_LEN >> 30; /* guaranteed to be 0 */ } EOF - cc_check $LDFLAGS $CXXFLAGS $FLAC_CFLAGS $FLAC_LIBS \ - -lFLAC -lm && _flac=yes + cc_check $LDFLAGS $CXXFLAGS $FLAC_CFLAGS $FLAC_LIBS $OGG_CFLAGS $OGG_LIBS \ + -lFLAC -logg -lm && _flac=yes fi if test "$_flac" = yes ; then _def_flac='#define USE_FLAC' - LIBS="$LIBS $FLAC_LIBS -lFLAC" + LIBS="$LIBS $FLAC_LIBS $OGG_LIBS -lFLAC -logg" INCLUDES="$INCLUDES $FLAC_CFLAGS" else _def_flac='#undef USE_FLAC' scummvm-0.9.1-no-execstack.patch: --- NEW FILE scummvm-0.9.1-no-execstack.patch --- --- scummvm-0.9.1/graphics/scaler/hq2x_i386.asm~ 2007-02-16 09:31:16.000000000 +0100 +++ scummvm-0.9.1/graphics/scaler/hq2x_i386.asm 2007-02-16 09:31:16.000000000 +0100 @@ -1840,3 +1840,8 @@ dd .. at cross8, .. at flag0, .. at flag0, .. at flag0, dd .. at flag0, .. at flag0, .. at flag0, .. at flag0 + +%ifidn __OUTPUT_FORMAT__,elf +section .note.GNU-stack noalloc noexec nowrite progbits +%endif + --- scummvm-0.9.1/graphics/scaler/hq3x_i386.asm~ 2007-02-16 09:31:16.000000000 +0100 +++ scummvm-0.9.1/graphics/scaler/hq3x_i386.asm 2007-02-16 09:31:16.000000000 +0100 @@ -2432,3 +2432,8 @@ dd .. at cross8, .. at flag0, .. at flag0, .. at flag0, dd .. at flag0, .. at flag0, .. at flag0, .. at flag0 + +%ifidn __OUTPUT_FORMAT__,elf +section .note.GNU-stack noalloc noexec nowrite progbits +%endif + Index: scummvm.spec =================================================================== RCS file: /cvs/extras/rpms/scummvm/devel/scummvm.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- scummvm.spec 13 Nov 2006 05:49:09 -0000 1.3 +++ scummvm.spec 16 Feb 2007 09:10:08 -0000 1.4 @@ -1,6 +1,6 @@ Name: scummvm Version: 0.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Interpreter for several adventure games Group: Applications/Emulators License: GPL @@ -10,9 +10,14 @@ Source1: scummvm-icons.tar.gz Patch0: scummvm-0.9.0-gcc41.patch Patch1: scummvm-0.9.0-nostrip.patch +Patch2: scummvm-0.9.1-new-flac.patch +Patch3: scummvm-0.9.1-no-execstack.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: SDL-devel libvorbis-devel flac-devel zlib-devel nasm +BuildRequires: SDL-devel libvorbis-devel flac-devel zlib-devel BuildRequires: desktop-file-utils +%ifarch %{ix86} +BuildRequires: nasm +%endif Requires: hicolor-icon-theme %description @@ -30,6 +35,8 @@ %setup -q -a 1 %patch0 -p1 -b .gcc41 %patch1 -p1 -b .nostrip +%patch2 -p2 -b .flac +%patch3 -p1 -b .execstack sed -i 's/%{name}.xpm/%{name}.png/' dists/%{name}.desktop sed -i 's/Application;Game;AdventureGame;/Game;Emulator;/' \ dists/%{name}.desktop @@ -105,6 +112,10 @@ %changelog +* Thu Feb 15 2007 Hans de Goede 0.9.1-3 +- Take patches from svn for new flac support and rebuild for new flac +- Fix (remove) execstack usage + * Sat Nov 11 2006 Hans de Goede 0.9.1-2 - Fix desktop-file so that scummvm doesn't end up in the "Other" menu under gnome (bug 215097) From fedora-extras-commits at redhat.com Fri Feb 16 13:08:37 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 16 Feb 2007 08:08:37 -0500 Subject: rpms/ogre/devel .cvsignore, 1.4, 1.5 ogre-1.2.2-soname.patch, 1.2, 1.3 ogre.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200702161308.l1GD8bM6010437@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/ogre/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10408 Modified Files: .cvsignore ogre-1.2.2-soname.patch ogre.spec sources Log Message: * Fri Feb 16 2007 Hans de Goede 1.2.5-1 - New upstream release 1.2.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ogre/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 27 Oct 2006 15:58:04 -0000 1.4 +++ .cvsignore 16 Feb 2007 13:08:05 -0000 1.5 @@ -1 +1 @@ -ogre-linux_osx-v1-2-3.tar.bz2 +ogre-linux_osx-v1-2-5.tar.bz2 ogre-1.2.2-soname.patch: Index: ogre-1.2.2-soname.patch =================================================================== RCS file: /cvs/extras/rpms/ogre/devel/ogre-1.2.2-soname.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ogre-1.2.2-soname.patch 27 Oct 2006 15:58:04 -0000 1.2 +++ ogre-1.2.2-soname.patch 16 Feb 2007 13:08:05 -0000 1.3 @@ -1,5 +1,5 @@ ---- ogrenew/OgreMain/src/Makefile.am.soname 2006-07-31 12:53:33.000000000 +0200 -+++ ogrenew/OgreMain/src/Makefile.am 2006-07-31 12:53:33.000000000 +0200 +--- ogrenew/OgreMain/src/Makefile.am.soname 2007-02-16 10:23:40.000000000 +0100 ++++ ogrenew/OgreMain/src/Makefile.am 2007-02-16 10:23:40.000000000 +0100 @@ -174,6 +174,6 @@ platformdir = $(libdir) @@ -8,9 +8,9 @@ +libOgreMain_la_LDFLAGS = $(SHARED_FLAGS) -release @PACKAGE_VERSION@ #-Wl,--version-script=$(top_srcdir)/OgreMain/src/ogremain.map ---- ogrenew/OgreMain/src/Makefile.in.soname 2006-07-31 12:54:18.000000000 +0200 -+++ ogrenew/OgreMain/src/Makefile.in 2006-07-31 12:56:32.000000000 +0200 -@@ -452,7 +452,7 @@ +--- ogrenew/OgreMain/src/Makefile.in.soname 2007-02-16 10:23:40.000000000 +0100 ++++ ogrenew/OgreMain/src/Makefile.in 2007-02-16 10:23:40.000000000 +0100 +@@ -453,7 +453,7 @@ OgreCompiler2Pass.cpp $(am__append_1) platformdir = $(libdir) libOgreMain_la_LIBADD = $(STLPORT_LIBS) $(FT2_LIBS) $(ZZIPLIB_LIBS) $(OGRE_THREAD_LIBS) @@ -19,8 +19,27 @@ all: all-am .SUFFIXES: ---- ogrenew/configure.soname 2006-07-31 12:54:01.000000000 +0200 -+++ ogrenew/configure 2006-07-31 12:54:58.000000000 +0200 +--- ogrenew/Samples/Common/CEGUIRenderer/src/Makefile.in.soname 2007-01-21 10:59:55.000000000 +0100 ++++ ogrenew/Samples/Common/CEGUIRenderer/src/Makefile.in 2007-02-16 10:41:42.000000000 +0100 +@@ -247,6 +247,8 @@ + OgreCEGUITexture.cpp \ + OgreCEGUIResourceProvider.cpp + ++libCEGUIOgreRenderer_la_LDFLAGS = -release @PACKAGE_VERSION@ ++ + all: all-am + + .SUFFIXES: +--- ogrenew/Samples/Common/CEGUIRenderer/src/Makefile.am.soname 2005-06-06 13:05:19.000000000 +0200 ++++ ogrenew/Samples/Common/CEGUIRenderer/src/Makefile.am 2007-02-16 10:41:42.000000000 +0100 +@@ -6,3 +6,5 @@ + libCEGUIOgreRenderer_la_SOURCES = OgreCEGUIRenderer.cpp \ + OgreCEGUITexture.cpp \ + OgreCEGUIResourceProvider.cpp ++ ++libCEGUIOgreRenderer_la_LDFLAGS = -release @PACKAGE_VERSION@ +--- ogrenew/configure.soname 2007-01-21 11:00:29.000000000 +0100 ++++ ogrenew/configure 2007-02-16 10:42:38.000000000 +0100 @@ -462,7 +462,7 @@ # include #endif" @@ -30,11 +49,11 @@ ac_subst_files='' # Initialize some variables set by options. -@@ -23065,13 +23065,6 @@ +@@ -23067,13 +23067,6 @@ CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" LIBS="$LIBS $SDL_LIBS" --OGREMAIN_CURRENT=12 +-OGREMAIN_CURRENT=13 -OGREMAIN_REVISION=0 -OGREMAIN_AGE=0 -OGREMAIN_VERSION_INFO=$OGREMAIN_CURRENT:$OGREMAIN_REVISION:$OGREMAIN_AGE @@ -44,7 +63,7 @@ ! ac_config_files="$ac_config_files Makefile OgreMain/Makefile OgreMain/src/Makefile OgreMain/include/Makefile PlatformManagers/Makefile PlatformManagers/SDL/Makefile PlatformManagers/SDL/src/Makefile PlatformManagers/SDL/include/Makefile PlatformManagers/gtk/Makefile PlatformManagers/gtk/src/Makefile PlatformManagers/gtk/include/Makefile PlatformManagers/GLX/Makefile PlatformManagers/GLX/src/Makefile PlatformManagers/GLX/include/Makefile PlatformManagers/Win32/Makefile PlatformManagers/Win32/src/Makefile PlatformManagers/Win32/include/Makefile PlugIns/Makefile PlugIns/BSPSceneManager/Makef! ile PlugIns/BSPSceneManager/src/Makefile PlugIns/BSPSceneManag! er/inclu de/Makefile PlugIns/CgProgramManager/Makefile PlugIns/CgProgramManager/src/Makefile PlugIns/CgProgramManager/include/Makefile PlugIns/OctreeSceneManager/Makefile PlugIns/OctreeSceneManager/src/Makefile PlugIns/OctreeSceneManager/include/Makefile PlugIns/ParticleFX/Makefile PlugIns/ParticleFX/src/Makefile PlugIns/ParticleFX/include/Makefile RenderSystems/Makefile RenderSystems/GL/Makefile RenderSystems/GL/src/Makefile RenderSystems/GL/include/Makefile RenderSystems/GL/src/atifs/Makefile RenderSystems/GL/src/atifs/include/Makefile RenderSystems/GL/src/atifs/src/Makefile RenderSystems/GL/src/GLSL/Makefile RenderSystems/GL/src/GLSL/include/Makefile RenderSystems/GL/src/GLSL/src/Makefile RenderSystems/GL/src/nvparse/Makefile RenderSystems/Direct3D9/Makefile RenderSystems/Direct3D9/src/Makefile RenderSystems/Direct3D9/include/Makefile Samples/Makefile Samples/Common/Makefile Samples/Common/include/Makefile Samples/Common/bin/Makefile Samples/BezierPatch/Makefile Samples/BezierPatc! h/src/Makefile Samples/BezierPatch/include/Makefile Samples/CameraTrack/Makefile Samples/CameraTrack/src/Makefile Samples/CelShading/Makefile Samples/CelShading/src/Makefile Samples/Compositor/Makefile Samples/Compositor/src/Makefile Samples/Compositor/include/Makefile Samples/CubeMapping/Makefile Samples/CubeMapping/src/Makefile Samples/CubeMapping/include/Makefile Samples/DeferredShading/Makefile Samples/DeferredShading/src/Makefile Samples/DeferredShading/include/Makefile Samples/Dot3Bump/Makefile Samples/Dot3Bump/src/Makefile Samples/EnvMapping/Makefile Samples/EnvMapping/src/Makefile Samples/EnvMapping/include/Makefile Samples/FacialAnimation/Makefile Samples/FacialAnimation/src/Makefile Samples/Fresnel/Makefile Samples/Fresnel/src/Makefile Samples/Grass/Makefile Samples/Grass/src/Makefile Samples/Transpacency/Makefile Samples/Transpacency/src/Makefile Samples/Transpacency/include/Makefile Samples/Lighting/Makefile Samples/Lighting/src/Makefile Samples/Lighting/include! /Makefile Samples/OceanDemo/Makefile Samples/OceanDemo/src/Mak! efile Sa mples/OceanDemo/include/Makefile Samples/ParticleFX/Makefile Samples/ParticleFX/src/Makefile Samples/ParticleFX/include/Makefile Samples/RenderToTexture/Makefile Samples/RenderToTexture/src/Makefile Samples/TextureFX/Makefile Samples/TextureFX/src/Makefile Samples/TextureFX/include/Makefile Samples/Shadows/Makefile Samples/Shadows/src/Makefile Samples/SkyBox/Makefile Samples/SkyBox/src/Makefile Samples/SkyBox/include/Makefile Samples/SkyDome/Makefile Samples/SkyDome/src/Makefile Samples/SkyDome/include/Makefile Samples/SkyPlane/Makefile Samples/SkyPlane/src/Makefile Samples/SkyPlane/include/Makefile Samples/Smoke/Makefile Samples/Smoke/src/Makefile Samples/Smoke/include/Makefile Samples/BSP/Makefile Samples/BSP/src/Makefile Samples/SkeletalAnimation/Makefile Samples/SkeletalAnimation/src/Makefile Samples/SkeletalAnimation/include/Makefile Samples/Terrain/Makefile Samples/Terrain/src/Makefile Samples/Terrain/include/Makefile Samples/Water/Makefile Samples/Water/src/Makefile S! amples/Water/include/Makefile Samples/DynTex/Makefile Samples/DynTex/src/Makefile Samples/DynTex/include/Makefile Samples/VolumeTex/Makefile Samples/VolumeTex/src/Makefile Samples/VolumeTex/include/Makefile Tests/Makefile Tests/src/Makefile Tools/Makefile Tools/MaterialUpgrader/Makefile Tools/MaterialUpgrader/src/Makefile Tools/MaterialUpgrader/include/Makefile Tools/MeshUpgrader/Makefile Tools/MeshUpgrader/src/Makefile Tools/XMLConverter/Makefile Tools/XMLConverter/src/Makefile Tools/XMLConverter/include/Makefile Tools/LightwaveConverter/Makefile Tools/LightwaveConverter/src/Makefile Tools/LightwaveConverter/include/Makefile OGRE.pc" -@@ -24058,7 +24048,6 @@ +@@ -24061,7 +24054,6 @@ s, at CEGUI_LIBS@,$CEGUI_LIBS,;t t s, at HAVE_CEGUI_TRUE@,$HAVE_CEGUI_TRUE,;t t s, at HAVE_CEGUI_FALSE@,$HAVE_CEGUI_FALSE,;t t @@ -52,15 +71,15 @@ s, at LIBOBJS@,$LIBOBJS,;t t s, at LTLIBOBJS@,$LTLIBOBJS,;t t CEOF ---- ogrenew/configure.in.soname 2006-07-23 00:12:06.000000000 +0200 -+++ ogrenew/configure.in 2006-07-31 12:53:33.000000000 +0200 +--- ogrenew/configure.in.soname 2007-01-20 15:21:21.000000000 +0100 ++++ ogrenew/configure.in 2007-02-16 10:43:14.000000000 +0100 @@ -78,15 +78,6 @@ CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" LIBS="$LIBS $SDL_LIBS" -dnl versioning info for libtool -dnl Note this is the ABI version which is not the same as our actual library version --OGREMAIN_CURRENT=12 +-OGREMAIN_CURRENT=13 -OGREMAIN_REVISION=0 -OGREMAIN_AGE=0 -OGREMAIN_VERSION_INFO=$OGREMAIN_CURRENT:$OGREMAIN_REVISION:$OGREMAIN_AGE @@ -70,22 +89,3 @@ dnl Create the makefiles AC_CONFIG_FILES([Makefile \ OgreMain/Makefile \ ---- ogrenew/Samples/Common/CEGUIRenderer/src/Makefile.in~ 2006-08-01 12:31:32.000000000 +0200 -+++ ogrenew/Samples/Common/CEGUIRenderer/src/Makefile.in 2006-08-01 12:31:32.000000000 +0200 -@@ -246,6 +246,8 @@ - OgreCEGUITexture.cpp \ - OgreCEGUIResourceProvider.cpp - -+libCEGUIOgreRenderer_la_LDFLAGS = -release @PACKAGE_VERSION@ -+ - all: all-am - - .SUFFIXES: ---- ogrenew/Samples/Common/CEGUIRenderer/src/Makefile.am~ 2006-08-01 12:31:33.000000000 +0200 -+++ ogrenew/Samples/Common/CEGUIRenderer/src/Makefile.am 2006-08-01 12:31:33.000000000 +0200 -@@ -6,3 +6,5 @@ - libCEGUIOgreRenderer_la_SOURCES = OgreCEGUIRenderer.cpp \ - OgreCEGUITexture.cpp \ - OgreCEGUIResourceProvider.cpp -+ -+libCEGUIOgreRenderer_la_LDFLAGS = -release @PACKAGE_VERSION@ Index: ogre.spec =================================================================== RCS file: /cvs/extras/rpms/ogre/devel/ogre.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ogre.spec 22 Jan 2007 16:02:25 -0000 1.6 +++ ogre.spec 16 Feb 2007 13:08:05 -0000 1.7 @@ -1,6 +1,6 @@ Name: ogre -Version: 1.2.3 -Release: 2%{?dist} +Version: 1.2.5 +Release: 1%{?dist} Summary: Object-Oriented Graphics Rendering Engine License: LGPL Group: System Environment/Libraries @@ -37,6 +37,7 @@ %package devel-doc Summary: Ogre development documentation Group: Documentation +Requires: %{name} = %{version}-%{release} %description devel-doc This package contains the Ogre API documentation and the Ogre development @@ -44,14 +45,15 @@ %package samples -Summary: Ogre samples executables and media. -Group: Documentation +Summary: Ogre samples executables and media +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} %description samples This package contains the compiled (not the source) sample applications coming with Ogre. It also contains some media (meshes, textures,...) needed by these -samples. The samples are installed in %{_libdir}/Samples and must be executed -from this directory! +samples. The samples are installed in %{_libdir}/Samples and can be executed +with the wrapper script called "Ogre-Samples". %prep @@ -73,6 +75,13 @@ # Fix path to Media files for the Samples sed -i 's|../../Media|%{_datadir}/OGRE/Samples/Media|g' \ Samples/Common/bin/resources.cfg +# building ogre with ogre installed leads to ogre linking the ogre apps +# against the installed ogre version instead of the just build version, so +# check for this and barf. +if [ -f /usr/include/OGRE/Ogre.h ]; then + echo "Error building OGRE while OGRE is installed doesn't work, remove OGRE" + exit 1 +fi %build @@ -166,6 +175,9 @@ %changelog +* Fri Feb 16 2007 Hans de Goede 1.2.5-1 +- New upstream release 1.2.5 + * Fri Jan 19 2007 Hans de Goede 1.2.3-2 - Rebuild for new cairomm - Added a samples sub-package (suggested by Xavier Decoret) Index: sources =================================================================== RCS file: /cvs/extras/rpms/ogre/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 27 Oct 2006 15:58:04 -0000 1.4 +++ sources 16 Feb 2007 13:08:05 -0000 1.5 @@ -1 +1 @@ -b2a8e3df61e2245c46457367a6b73ca0 ogre-linux_osx-v1-2-3.tar.bz2 +b4c9c0e6dda14009c8e7a29de876d9a1 ogre-linux_osx-v1-2-5.tar.bz2 From fedora-extras-commits at redhat.com Fri Feb 16 13:26:16 2007 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Fri, 16 Feb 2007 08:26:16 -0500 Subject: rpms/dvdisaster/FC-5 .cvsignore, 1.5, 1.6 dvdisaster.spec, 1.16, 1.17 sources, 1.8, 1.9 Message-ID: <200702161326.l1GDQGtj010648@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/dvdisaster/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10606 Modified Files: .cvsignore dvdisaster.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dvdisaster/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 15 Dec 2006 14:29:07 -0000 1.5 +++ .cvsignore 16 Feb 2007 13:25:43 -0000 1.6 @@ -1 +1 @@ -dvdisaster-0.70.3.tar.bz2 +dvdisaster-0.70.4.tar.bz2 Index: dvdisaster.spec =================================================================== RCS file: /cvs/extras/rpms/dvdisaster/FC-5/dvdisaster.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- dvdisaster.spec 15 Dec 2006 14:29:07 -0000 1.16 +++ dvdisaster.spec 16 Feb 2007 13:25:43 -0000 1.17 @@ -1,6 +1,6 @@ Name: dvdisaster Summary: Additional error protection for CD/DVD media -Version: 0.70.3 +Version: 0.70.4 Release: 1%{?dist} Group: Applications/Archiving License: GPL @@ -116,6 +116,9 @@ %changelog +* Fri Feb 16 2007 Dmitry Butskoy - 0.70.4-1 +- update to 0.70.4 + * Fri Dec 15 2006 Dmitry Butskoy - 0.70.3-1 - update to 0.70.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dvdisaster/FC-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 15 Dec 2006 14:29:07 -0000 1.8 +++ sources 16 Feb 2007 13:25:43 -0000 1.9 @@ -1 +1 @@ -04e658c36d3a7cbffe0c164ebe1c7dcf dvdisaster-0.70.3.tar.bz2 +5794b01d62ca6fa45d1f1e4ec381b567 dvdisaster-0.70.4.tar.bz2 From fedora-extras-commits at redhat.com Fri Feb 16 13:27:31 2007 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Fri, 16 Feb 2007 08:27:31 -0500 Subject: rpms/dvdisaster/FC-6 dvdisaster.spec,1.17,1.18 sources,1.8,1.9 Message-ID: <200702161327.l1GDRVvB010730@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/dvdisaster/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10707 Modified Files: dvdisaster.spec sources Log Message: Index: dvdisaster.spec =================================================================== RCS file: /cvs/extras/rpms/dvdisaster/FC-6/dvdisaster.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- dvdisaster.spec 15 Dec 2006 14:31:18 -0000 1.17 +++ dvdisaster.spec 16 Feb 2007 13:26:59 -0000 1.18 @@ -1,6 +1,6 @@ Name: dvdisaster Summary: Additional error protection for CD/DVD media -Version: 0.70.3 +Version: 0.70.4 Release: 1%{?dist} Group: Applications/Archiving License: GPL @@ -116,6 +116,9 @@ %changelog +* Fri Feb 16 2007 Dmitry Butskoy - 0.70.4-1 +- update to 0.70.4 + * Fri Dec 15 2006 Dmitry Butskoy - 0.70.3-1 - update to 0.70.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dvdisaster/FC-6/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 15 Dec 2006 14:31:18 -0000 1.8 +++ sources 16 Feb 2007 13:26:59 -0000 1.9 @@ -1 +1 @@ -04e658c36d3a7cbffe0c164ebe1c7dcf dvdisaster-0.70.3.tar.bz2 +5794b01d62ca6fa45d1f1e4ec381b567 dvdisaster-0.70.4.tar.bz2 From fedora-extras-commits at redhat.com Fri Feb 16 13:28:32 2007 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Fri, 16 Feb 2007 08:28:32 -0500 Subject: rpms/dvdisaster/devel dvdisaster.spec,1.17,1.18 sources,1.8,1.9 Message-ID: <200702161328.l1GDSW95010788@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/dvdisaster/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10765 Modified Files: dvdisaster.spec sources Log Message: Index: dvdisaster.spec =================================================================== RCS file: /cvs/extras/rpms/dvdisaster/devel/dvdisaster.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- dvdisaster.spec 15 Dec 2006 14:32:17 -0000 1.17 +++ dvdisaster.spec 16 Feb 2007 13:28:00 -0000 1.18 @@ -1,6 +1,6 @@ Name: dvdisaster Summary: Additional error protection for CD/DVD media -Version: 0.70.3 +Version: 0.70.4 Release: 1%{?dist} Group: Applications/Archiving License: GPL @@ -116,6 +116,9 @@ %changelog +* Fri Feb 16 2007 Dmitry Butskoy - 0.70.4-1 +- update to 0.70.4 + * Fri Dec 15 2006 Dmitry Butskoy - 0.70.3-1 - update to 0.70.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dvdisaster/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 15 Dec 2006 14:32:17 -0000 1.8 +++ sources 16 Feb 2007 13:28:00 -0000 1.9 @@ -1 +1 @@ -04e658c36d3a7cbffe0c164ebe1c7dcf dvdisaster-0.70.3.tar.bz2 +5794b01d62ca6fa45d1f1e4ec381b567 dvdisaster-0.70.4.tar.bz2 From fedora-extras-commits at redhat.com Fri Feb 16 13:35:22 2007 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 16 Feb 2007 08:35:22 -0500 Subject: rpms/lyx/FC-6 lyx-1.4.4-xdg_open.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 lyx-qt.desktop, 1.2, 1.3 lyx-xforms.desktop, 1.2, 1.3 lyx.desktop, 1.4, 1.5 lyx.spec, 1.48, 1.49 sources, 1.14, 1.15 lyx-1.4.3-helpers.patch, 1.2, NONE Message-ID: <200702161335.l1GDZMin011006@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10969 Modified Files: .cvsignore lyx-qt.desktop lyx-xforms.desktop lyx.desktop lyx.spec sources Added Files: lyx-1.4.4-xdg_open.patch Removed Files: lyx-1.4.3-helpers.patch Log Message: lyx-1.4.4 lyx-1.4.4-xdg_open.patch: --- NEW FILE lyx-1.4.4-xdg_open.patch --- --- lyx-1.4.4/lib/configure.py.helpers 2007-02-13 17:20:29.000000000 -0600 +++ lyx-1.4.4/lib/configure.py 2007-02-14 09:53:28.000000000 -0600 @@ -251,7 +251,7 @@ checkViewer('a FEN viewer and editor', ['xboard -lpf $$i -mode EditPosition'], rc_entry = [r'\Format fen fen FEN "" "%%" "%%"']) # - path, iv = checkViewer('a raster image viewer', ['xv', 'kview', 'gimp']) + path, iv = checkViewer('a raster image viewer', ['xdg-open', 'xv', 'kview', 'gimp']) path, ie = checkViewer('a raster image editor', ['gimp']) addToRC(r'''\Format bmp bmp BMP "" "%s" "%s" \Format gif gif GIF "" "%s" "%s" @@ -283,23 +283,23 @@ # #checkProg('a Postscript interpreter', ['gs'], # rc_entry = [ r'\ps_command "%%"' ]) - checkViewer('a Postscript previewer', ['gv', 'ghostview -swap', 'kghostview'], + checkViewer('a Postscript previewer', ['xdg-open', 'gv', 'ghostview -swap', 'kghostview'], rc_entry = [r'''\Format eps eps EPS "" "%%" "" "vector" \Format ps ps Postscript t "%%" "" "vector"''']) # - checkViewer('a PDF previewer', ['acrobat', 'acroread', 'gv', 'ghostview', \ + checkViewer('a PDF previewer', ['xdg-open', 'acrobat', 'acroread', 'gv', 'ghostview', \ 'xpdf', 'kpdf', 'kghostview'], rc_entry = [r'''\Format pdf pdf "PDF (ps2pdf)" P "%%" "" "vector" \Format pdf2 pdf "PDF (pdflatex)" F "%%" "" "vector" \Format pdf3 pdf "PDF (dvipdfm)" m "%%" "" "vector"''']) # - checkViewer('a DVI previewer', ['xdvi', 'kdvi'], + checkViewer('a DVI previewer', ['xdg-open', 'xdvi', 'kdvi'], rc_entry = [r'\Format dvi dvi DVI D "%%" "" "vector"']) if dtl_tools: # Windows only: DraftDVI addToRC(r'\Format dvi2 dvi DraftDVI "" "" "vector"') # - checkViewer('a HTML previewer', ['mozilla file://$$p$$i', 'netscape'], + checkViewer('a HTML previewer', ['xdg-open', 'htmlview file://$$p$$i', 'mozilla file://$$p$$i', 'netscape'], rc_entry = [r'\Format html html HTML H "%%" ""']) # # entried that do not need checkProg Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-6/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 21 Sep 2006 15:26:46 -0000 1.15 +++ .cvsignore 16 Feb 2007 13:34:49 -0000 1.16 @@ -1,3 +1,4 @@ clog beamer.layout lyx-1.4.3.tar.bz2 +lyx-1.4.4.tar.bz2 Index: lyx-qt.desktop =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-6/lyx-qt.desktop,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- lyx-qt.desktop 1 Oct 2006 23:14:31 -0000 1.2 +++ lyx-qt.desktop 16 Feb 2007 13:34:49 -0000 1.3 @@ -7,5 +7,5 @@ MimeType=application/x-lyx;text/x-lyx; Type=Application Encoding=UTF-8 -Categories=Qt;Application;Office;WordProcessor; +Categories=Qt;Office;WordProcessor; Index: lyx-xforms.desktop =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-6/lyx-xforms.desktop,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- lyx-xforms.desktop 1 Oct 2006 23:14:31 -0000 1.2 +++ lyx-xforms.desktop 16 Feb 2007 13:34:49 -0000 1.3 @@ -7,5 +7,5 @@ MimeType=application/x-lyx;text/x-lyx; Type=Application Encoding=UTF-8 -Categories=Application;Office;WordProcessor; +Categories=Office;WordProcessor; Index: lyx.desktop =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-6/lyx.desktop,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- lyx.desktop 1 Oct 2006 23:14:31 -0000 1.4 +++ lyx.desktop 16 Feb 2007 13:34:49 -0000 1.5 @@ -7,5 +7,5 @@ MimeType=application/x-lyx;text/x-lyx; Type=Application Encoding=UTF-8 -Categories=Application;Office;WordProcessor; +Categories=Office;WordProcessor; Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-6/lyx.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- lyx.spec 1 Oct 2006 23:55:58 -0000 1.48 +++ lyx.spec 16 Feb 2007 13:34:49 -0000 1.49 @@ -1,8 +1,8 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx -Version: 1.4.3 -Release: 3%{?dist} +Version: 1.4.4 +Release: 2%{?dist} License: GPL Group: Applications/Publishing @@ -10,7 +10,7 @@ Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: lyx-1.4.3-helpers.patch +Patch1: lyx-1.4.4-xdg_open.patch Source1: lyxrc.dist # app-wrapper for various frontends @@ -45,10 +45,10 @@ Requires: tetex-dvips Requires: mathml-fonts Requires: ghostscript -Requires: htmlview -Requires: xdg-utils +# Short-hand for Requires+Requires(post,postun) +Prereq: xdg-utils ## Soft dependencies -%if "%{?fedora}" > "3" +%if 0%{?fedora} > 3 # dvipost adds support for lyx's Document->Change Tracking feature Requires(hint): tetex-dvipost Requires(hint): tetex-preview @@ -89,19 +89,19 @@ Provides: %{name}-frontend = %{version}-%{release} %description xforms %{summary}. +Please note: This frontend is deprecated, and will no longer be included +in lyx-1.5.x. %prep %setup -q -n %{name}-%{version}%{?beta} -# FIXME -%patch1 -p1 -b .helpers +%patch1 -p1 -b .xdg_open %build -# QT unset QTDIR || : ; . /etc/profile.d/qt.sh # drop -fexceptions from optflags, suggested by lyx devs: @@ -145,7 +145,7 @@ # .desktop desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category="X-Fedora" --vendor="" \ + --vendor="" \ %{SOURCE21} %{SOURCE22} # generic/hicolor icon @@ -165,25 +165,25 @@ %post -touch --no-create %{_datadir}/icons/hicolor ||: -gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||: +%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || : texhash > /dev/null 2>&1 ||: cd %{_datadir}/lyx && ./configure.py > /dev/null 2>&1 ||: %postun -touch --no-create %{_datadir}/icons/hicolor ||: -gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||: +%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || : texhash > /dev/null 2>&1 ||: -# Catch installed/uninstalled helpers -%triggerin -- acroread,AdobeReader_enu,evince,gsview,ImageMagick,kdegraphics,latex2html,tetex-xdvi,wv +## Catch installed/uninstalled helpers +## not sure if this is really needed anymore, as it seems to be a per-user thing, +## and besides, we use xdg-open now -- Rex +%triggerin -- latex2html,wv if [ $2 -gt 1 ]; then cd %{_datadir}/lyx && ./configure.py --without-latex-config > /dev/null 2>&1 ||: fi -%triggerun -- acroread,AdobeReader_enu,evince,gsview,ImageMagick,kdegraphics,latex2html,tetex-xdvi,wv +%triggerun -- latex2html,wv if [ $2 -eq 0 ]; then cd %{_datadir}/lyx && ./configure.py --without-latex-config > /dev/null 2>&1 ||: fi @@ -220,12 +220,20 @@ %changelog +* Thu Feb 15 2007 Rex Dieter 1.4.4-2 +- biffed sources, respin + +* Wed Feb 14 2007 Rex Dieter 1.4.4-1 +- lyx-1.4.4 +- .desktop's: -Category=Application +- mark -xforms as deprecated + * Sun Oct 01 2006 Rex Dieter 1.4.3-3 - sync .desktop files with upstream - use xdg-open as default helper, +Requires: xdg-utils * Thu Sep 21 2006 Rex Dieter 1.4.3-1 -- 1.4.3 +- lyx-1.4.3 * Thu Sep 07 2006 Rex Dieter 1.4.2-5 - fc6 respin Index: sources =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-6/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 21 Sep 2006 15:26:46 -0000 1.14 +++ sources 16 Feb 2007 13:34:49 -0000 1.15 @@ -1,2 +1,2 @@ c906271900a0627d3df2a38ad962a285 beamer.layout -34a014a0034481381cbba517d4a00e61 lyx-1.4.3.tar.bz2 +2e778eba4191c5f9fb2cafa7901c322c lyx-1.4.4.tar.bz2 --- lyx-1.4.3-helpers.patch DELETED --- From fedora-extras-commits at redhat.com Fri Feb 16 13:37:03 2007 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 16 Feb 2007 08:37:03 -0500 Subject: rpms/lyx/FC-5 lyx-1.4.4-xdg_open.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 lyx-qt.desktop, 1.2, 1.3 lyx-xforms.desktop, 1.2, 1.3 lyx.desktop, 1.4, 1.5 lyx.spec, 1.44, 1.45 sources, 1.14, 1.15 lyx-1.4.3-helpers.patch, 1.2, NONE Message-ID: <200702161337.l1GDb39P011101@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11069 Modified Files: .cvsignore lyx-qt.desktop lyx-xforms.desktop lyx.desktop lyx.spec sources Added Files: lyx-1.4.4-xdg_open.patch Removed Files: lyx-1.4.3-helpers.patch Log Message: lyx-1.4.4 lyx-1.4.4-xdg_open.patch: --- NEW FILE lyx-1.4.4-xdg_open.patch --- --- lyx-1.4.4/lib/configure.py.helpers 2007-02-13 17:20:29.000000000 -0600 +++ lyx-1.4.4/lib/configure.py 2007-02-14 09:53:28.000000000 -0600 @@ -251,7 +251,7 @@ checkViewer('a FEN viewer and editor', ['xboard -lpf $$i -mode EditPosition'], rc_entry = [r'\Format fen fen FEN "" "%%" "%%"']) # - path, iv = checkViewer('a raster image viewer', ['xv', 'kview', 'gimp']) + path, iv = checkViewer('a raster image viewer', ['xdg-open', 'xv', 'kview', 'gimp']) path, ie = checkViewer('a raster image editor', ['gimp']) addToRC(r'''\Format bmp bmp BMP "" "%s" "%s" \Format gif gif GIF "" "%s" "%s" @@ -283,23 +283,23 @@ # #checkProg('a Postscript interpreter', ['gs'], # rc_entry = [ r'\ps_command "%%"' ]) - checkViewer('a Postscript previewer', ['gv', 'ghostview -swap', 'kghostview'], + checkViewer('a Postscript previewer', ['xdg-open', 'gv', 'ghostview -swap', 'kghostview'], rc_entry = [r'''\Format eps eps EPS "" "%%" "" "vector" \Format ps ps Postscript t "%%" "" "vector"''']) # - checkViewer('a PDF previewer', ['acrobat', 'acroread', 'gv', 'ghostview', \ + checkViewer('a PDF previewer', ['xdg-open', 'acrobat', 'acroread', 'gv', 'ghostview', \ 'xpdf', 'kpdf', 'kghostview'], rc_entry = [r'''\Format pdf pdf "PDF (ps2pdf)" P "%%" "" "vector" \Format pdf2 pdf "PDF (pdflatex)" F "%%" "" "vector" \Format pdf3 pdf "PDF (dvipdfm)" m "%%" "" "vector"''']) # - checkViewer('a DVI previewer', ['xdvi', 'kdvi'], + checkViewer('a DVI previewer', ['xdg-open', 'xdvi', 'kdvi'], rc_entry = [r'\Format dvi dvi DVI D "%%" "" "vector"']) if dtl_tools: # Windows only: DraftDVI addToRC(r'\Format dvi2 dvi DraftDVI "" "" "vector"') # - checkViewer('a HTML previewer', ['mozilla file://$$p$$i', 'netscape'], + checkViewer('a HTML previewer', ['xdg-open', 'htmlview file://$$p$$i', 'mozilla file://$$p$$i', 'netscape'], rc_entry = [r'\Format html html HTML H "%%" ""']) # # entried that do not need checkProg Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-5/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 21 Sep 2006 15:43:12 -0000 1.14 +++ .cvsignore 16 Feb 2007 13:36:31 -0000 1.15 @@ -1,3 +1,4 @@ clog beamer.layout lyx-1.4.3.tar.bz2 +lyx-1.4.4.tar.bz2 Index: lyx-qt.desktop =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-5/lyx-qt.desktop,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- lyx-qt.desktop 1 Oct 2006 23:15:30 -0000 1.2 +++ lyx-qt.desktop 16 Feb 2007 13:36:31 -0000 1.3 @@ -7,5 +7,5 @@ MimeType=application/x-lyx;text/x-lyx; Type=Application Encoding=UTF-8 -Categories=Qt;Application;Office;WordProcessor; +Categories=Qt;Office;WordProcessor; Index: lyx-xforms.desktop =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-5/lyx-xforms.desktop,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- lyx-xforms.desktop 1 Oct 2006 23:15:30 -0000 1.2 +++ lyx-xforms.desktop 16 Feb 2007 13:36:31 -0000 1.3 @@ -7,5 +7,5 @@ MimeType=application/x-lyx;text/x-lyx; Type=Application Encoding=UTF-8 -Categories=Application;Office;WordProcessor; +Categories=Office;WordProcessor; Index: lyx.desktop =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-5/lyx.desktop,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- lyx.desktop 1 Oct 2006 23:15:30 -0000 1.4 +++ lyx.desktop 16 Feb 2007 13:36:31 -0000 1.5 @@ -7,5 +7,5 @@ MimeType=application/x-lyx;text/x-lyx; Type=Application Encoding=UTF-8 -Categories=Application;Office;WordProcessor; +Categories=Office;WordProcessor; Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-5/lyx.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- lyx.spec 1 Oct 2006 23:56:13 -0000 1.44 +++ lyx.spec 16 Feb 2007 13:36:31 -0000 1.45 @@ -1,8 +1,8 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx -Version: 1.4.3 -Release: 3%{?dist} +Version: 1.4.4 +Release: 2%{?dist} License: GPL Group: Applications/Publishing @@ -10,7 +10,7 @@ Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: lyx-1.4.3-helpers.patch +Patch1: lyx-1.4.4-xdg_open.patch Source1: lyxrc.dist # app-wrapper for various frontends @@ -45,10 +45,10 @@ Requires: tetex-dvips Requires: mathml-fonts Requires: ghostscript -Requires: htmlview -Requires: xdg-utils +# Short-hand for Requires+Requires(post,postun) +Prereq: xdg-utils ## Soft dependencies -%if "%{?fedora}" > "3" +%if 0%{?fedora} > 3 # dvipost adds support for lyx's Document->Change Tracking feature Requires(hint): tetex-dvipost Requires(hint): tetex-preview @@ -89,19 +89,19 @@ Provides: %{name}-frontend = %{version}-%{release} %description xforms %{summary}. +Please note: This frontend is deprecated, and will no longer be included +in lyx-1.5.x. %prep %setup -q -n %{name}-%{version}%{?beta} -# FIXME -%patch1 -p1 -b .helpers +%patch1 -p1 -b .xdg_open %build -# QT unset QTDIR || : ; . /etc/profile.d/qt.sh # drop -fexceptions from optflags, suggested by lyx devs: @@ -145,7 +145,7 @@ # .desktop desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category="X-Fedora" --vendor="" \ + --vendor="" \ %{SOURCE21} %{SOURCE22} # generic/hicolor icon @@ -165,25 +165,25 @@ %post -touch --no-create %{_datadir}/icons/hicolor ||: -gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||: +%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || : texhash > /dev/null 2>&1 ||: cd %{_datadir}/lyx && ./configure.py > /dev/null 2>&1 ||: %postun -touch --no-create %{_datadir}/icons/hicolor ||: -gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||: +%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || : texhash > /dev/null 2>&1 ||: -# Catch installed/uninstalled helpers -%triggerin -- acroread,AdobeReader_enu,evince,gsview,ImageMagick,kdegraphics,latex2html,tetex-xdvi,wv +## Catch installed/uninstalled helpers +## not sure if this is really needed anymore, as it seems to be a per-user thing, +## and besides, we use xdg-open now -- Rex +%triggerin -- latex2html,wv if [ $2 -gt 1 ]; then cd %{_datadir}/lyx && ./configure.py --without-latex-config > /dev/null 2>&1 ||: fi -%triggerun -- acroread,AdobeReader_enu,evince,gsview,ImageMagick,kdegraphics,latex2html,tetex-xdvi,wv +%triggerun -- latex2html,wv if [ $2 -eq 0 ]; then cd %{_datadir}/lyx && ./configure.py --without-latex-config > /dev/null 2>&1 ||: fi @@ -220,12 +220,20 @@ %changelog +* Thu Feb 15 2007 Rex Dieter 1.4.4-2 +- biffed sources, respin + +* Wed Feb 14 2007 Rex Dieter 1.4.4-1 +- lyx-1.4.4 +- .desktop's: -Category=Application +- mark -xforms as deprecated + * Sun Oct 01 2006 Rex Dieter 1.4.3-3 - sync .desktop files with upstream - use xdg-open as default helper, +Requires: xdg-utils * Thu Sep 21 2006 Rex Dieter 1.4.3-1 -- 1.4.3 +- lyx-1.4.3 * Thu Sep 07 2006 Rex Dieter 1.4.2-5 - fc6 respin Index: sources =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-5/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 21 Sep 2006 15:43:12 -0000 1.14 +++ sources 16 Feb 2007 13:36:31 -0000 1.15 @@ -1,2 +1,2 @@ c906271900a0627d3df2a38ad962a285 beamer.layout -34a014a0034481381cbba517d4a00e61 lyx-1.4.3.tar.bz2 +2e778eba4191c5f9fb2cafa7901c322c lyx-1.4.4.tar.bz2 --- lyx-1.4.3-helpers.patch DELETED --- From fedora-extras-commits at redhat.com Fri Feb 16 13:54:43 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 16 Feb 2007 08:54:43 -0500 Subject: rpms/chess/devel chess.spec,1.4,1.5 Message-ID: <200702161354.l1GDshXk011475@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/chess/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11438 Modified Files: chess.spec Log Message: * Fri Feb 16 2006 Hans de Goede 1.0-5 - Rebuild for new ogre Index: chess.spec =================================================================== RCS file: /cvs/extras/rpms/chess/devel/chess.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- chess.spec 27 Oct 2006 16:00:06 -0000 1.4 +++ chess.spec 16 Feb 2007 13:54:10 -0000 1.5 @@ -1,6 +1,6 @@ Name: chess Version: 1.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: 3D chess game Group: Amusements/Games License: GPL @@ -77,6 +77,9 @@ %changelog +* Fri Feb 16 2006 Hans de Goede 1.0-5 +- Rebuild for new ogre + * Fri Oct 27 2006 Hans de Goede 1.0-4 - Rebuild for new ogre From fedora-extras-commits at redhat.com Fri Feb 16 13:55:00 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 16 Feb 2007 08:55:00 -0500 Subject: rpms/chess/devel chess.spec,1.5,1.6 Message-ID: <200702161355.l1GDt0je011480@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/chess/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11458 Modified Files: chess.spec Log Message: * Fri Feb 16 2007 Hans de Goede 1.0-5 - Rebuild for new ogre Index: chess.spec =================================================================== RCS file: /cvs/extras/rpms/chess/devel/chess.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- chess.spec 16 Feb 2007 13:54:10 -0000 1.5 +++ chess.spec 16 Feb 2007 13:54:28 -0000 1.6 @@ -77,7 +77,7 @@ %changelog -* Fri Feb 16 2006 Hans de Goede 1.0-5 +* Fri Feb 16 2007 Hans de Goede 1.0-5 - Rebuild for new ogre * Fri Oct 27 2006 Hans de Goede 1.0-4 From fedora-extras-commits at redhat.com Fri Feb 16 14:01:01 2007 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Fri, 16 Feb 2007 09:01:01 -0500 Subject: rpms/yumex/devel .cvsignore, 1.27, 1.28 sources, 1.40, 1.41 yumex.spec, 1.46, 1.47 Message-ID: <200702161401.l1GE1163011596@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11572 Modified Files: .cvsignore sources yumex.spec Log Message: Release 1.9.3-1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 29 Jan 2007 14:04:56 -0000 1.27 +++ .cvsignore 16 Feb 2007 14:00:28 -0000 1.28 @@ -1 +1 @@ -yumex-1.9.2.tar.gz +yumex-1.9.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/sources,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- sources 30 Jan 2007 08:09:07 -0000 1.40 +++ sources 16 Feb 2007 14:00:28 -0000 1.41 @@ -1 +1 @@ -c49fe8ea4e62974281516cdc522bce58 yumex-1.9.2.tar.gz +55a7cfd6cafcd0390df4184b3a230091 yumex-1.9.3.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- yumex.spec 30 Jan 2007 08:09:07 -0000 1.46 +++ yumex.spec 16 Feb 2007 14:00:28 -0000 1.47 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: yumex -Version: 1.9.2 -Release: 1.1%{?dist} +Version: 1.9.3 +Release: 1.0%{?dist} Summary: Yum Extender graphical package management tool Group: Applications/System @@ -68,6 +68,8 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Fri Feb 16 2007 Tim Lauridsen - 1.9.3-1.0 +- Development Release 1.9.3-1.0 * Tue Jan 30 2007 Tim Lauridsen - 1.9.2-1.1 - Development Release 1.9.2-1.1 * Mon Jan 29 2007 Tim Lauridsen - 1.9.2-1.0 From fedora-extras-commits at redhat.com Fri Feb 16 14:06:49 2007 From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak)) Date: Fri, 16 Feb 2007 09:06:49 -0500 Subject: fedora-security/audit fc5,1.451,1.452 fc6,1.205,1.206 Message-ID: <200702161406.l1GE6n7U015157@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15133 Modified Files: fc5 fc6 Log Message: firefox Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.451 retrieving revision 1.452 diff -u -r1.451 -r1.452 --- fc5 14 Feb 2007 20:43:39 -0000 1.451 +++ fc5 16 Feb 2007 14:06:47 -0000 1.452 @@ -3,6 +3,7 @@ ** are items that need attention +CVE-2007-0981 VULNERABLE (firefox, ...) CVE-2007-0823 ignore (xterm) feature, not a bug CVE-2007-0822 ignore (util-linux) NULL dereference CVE-2007-0770 ignore (ImageMagick) only if incomplete CVE-2006-5456 Index: fc6 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc6,v retrieving revision 1.205 retrieving revision 1.206 diff -u -r1.205 -r1.206 --- fc6 14 Feb 2007 20:48:05 -0000 1.205 +++ fc6 16 Feb 2007 14:06:47 -0000 1.206 @@ -3,6 +3,7 @@ ** are items that need attention +CVE-2007-0981 VULNERABLE (firefox, ...) CVE-2007-0823 ignore (xterm) feature, not a bug CVE-2007-0822 ignore (util-linux) NULL dereference CVE-2007-0770 ignore (ImageMagick) only if incomplete CVE-2006-5456 From fedora-extras-commits at redhat.com Fri Feb 16 14:20:35 2007 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 16 Feb 2007 09:20:35 -0500 Subject: rpms/mod_fcgid/devel mod_fcgid-2.1-README.Fedora, NONE, 1.1 mod_fcgid-2.1-README.SELinux, NONE, 1.1 mod_fcgid.2.1-docurls.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 configuration.htm, 1.2, 1.3 doc.htm, 1.2, 1.3 fcgid.conf, 1.1, 1.2 mod_fcgid.spec, 1.3, 1.4 sources, 1.3, 1.4 README.Fedora, 1.2, NONE README.SELinux, 1.2, NONE mod_fcgid.1.09-docurls.patch, 1.1, NONE Message-ID: <200702161420.l1GEKZFs015282@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/mod_fcgid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15250 Modified Files: .cvsignore configuration.htm doc.htm fcgid.conf mod_fcgid.spec sources Added Files: mod_fcgid-2.1-README.Fedora mod_fcgid-2.1-README.SELinux mod_fcgid.2.1-docurls.patch Removed Files: README.Fedora README.SELinux mod_fcgid.1.09-docurls.patch Log Message: Update to 2.1 --- NEW FILE mod_fcgid-2.1-README.Fedora --- Using mod_fcgid in Fedora ========================= This mod_fcgid package includes a configuration file /etc/httpd/conf.d/fcgid.conf that ensures that the module is loaded and added as the handler for .fcg, .fcgi, and .fpl applications (provided mod_fastcgi in not already loaded, in which case you will need to decide which module should handle which types of application). So far the module package has only been tested in conjunction with the "moin" wiki application. Further feedback regarding other applications is welcome. Setting up moin with mod_fcgid ============================== Setting up moin with mod_fcgid is very similar to setting it up as a regular CGI application. * Create a directory for your wiki instance: DESTDIR=/var/www/mywiki mkdir -p $DESTDIR/cgi-bin * Copy in the wiki template data and the application itself: cp -a /usr/share/moin/{data,underlay} $DESTDIR cp -a /usr/share/moin/server/moin.fcg $DESTDIR/cgi-bin cp -a /usr/share/moin/config/wikiconfig.py $DESTDIR/cgi-bin * Fix the directory ownership chown -R apache:apache $DESTDIR/{data,underlay} * Edit $DESTDIR/cgi-bin/wikiconfig.py to suit your needs * Create a httpd configuration file for the wiki, e.g. /etc/httpd/conf.d/mywiki.conf # Wiki application data common to all wiki instances Alias /wiki/ "/usr/share/moin/htdocs/" Options Indexes FollowSymLinks AllowOverride None Order allow,deny Allow from all # Wiki instance with mod_fcgid ScriptAlias /mywiki "/var/www/mywiki/cgi-bin/moin.fcg" Options Indexes FollowSymLinks ExecCGI AllowOverride None Order allow,deny Allow from all * If you are using SELinux with Fedora Core 5 or later, install the mod_fcgid-selinux package and see the README.SELinux file in that package for details of the file contexts to use * Restart the web server to load the new configuration: service httpd restart That should do it! --- NEW FILE mod_fcgid-2.1-README.SELinux --- Using mod_fcgid with SELinux in Fedora Core 5 onwards ===================================================== Versions of this package built for Fedora Core 5 or later include an SELinux policy module to support FastCGI applications. This has only been tested so far with moin, so feedback from other applications is welcome. The intention is for this module to be included in the SELinux reference policy eventually. The module source (fastcgi.{fc,te}) is included for reference as documentation in the package. The module introduces a new set of SELinux types for FastCGI applications, comparable with the types described in "man httpd_selinux" for regular CGI scripts (or "system scripts" as they are known in SELinux): * httpd_fastcgi_content_t (equivalent to httpd_sys_content_t) - Set files with httpd_fastcgi_content_t for content that is available from all FastCGI scripts and the daemon. * httpd_fastcgi_script_exec_t (equivalent to httpd_sys_script_exec_t) - Set FastCGI scripts with httpd_fastcgi_script_exec_t to allow them to run with access to all fastcgi types. * httpd_fastcgi_script_ro_t (equivalent to httpd_sys_script_ro_t) - Set files with httpd_fastcgi_script_ro_t if you want httpd_fastcgi_script_exec_t scripts to read the data, and disallow other non-fastcgi scripts from access. * httpd_fastcgi_script_rw_t (equivalent to httpd_sys_script_rw_t) - Set files with httpd_fastcgi_script_rw_t if you want httpd_fastcgi_script_exec_t scripts to read/write the data, and disallow other non-fastcgi scripts from access. * httpd_fastcgi_script_ra_t (equivalent to httpd_sys_script_ra_t) - Set files with httpd_fastcgi_script_ra_t if you want httpd_fastcgi_script_exec_t scripts to read/append to the file, and disallow other non-fastcgi scripts from access. So for the moin wiki layout described in README.Fedora of the main mod_fcgid package, the contexts would be set as follows: cd /var/www/mywiki chcon -t httpd_fastcgi_content_t . chcon -R -t httpd_fastcgi_script_exec_t cgi-bin chcon -R -t httpd_fastcgi_script_rw_t data underlay It is necessary to turn on the httpd_enable_cgi boolean to run either regular or FastCGI scripts: setsebool -P httpd_enable_cgi 1 If the httpd_unified boolean is set, "sys" and "fastcgi" scripts can access each other's data. This means that you only need to set the actual FastCGI scripts themselves to httpd_fastcgi_script_exec_t and can leave the file contexts for everything else set to the "sys" types if you prefer. This is useful if you have a mixture of CGI and FastCGI applications accessing the same data. If you have any questions or issues regarding FastCGI and SELinux, please don't hesitate to bring them up on fedora-selinux-list. mod_fcgid.2.1-docurls.patch: --- NEW FILE mod_fcgid.2.1-docurls.patch --- --- mod_fcgid.2.1/directives.htm 2007-02-16 03:40:23.000000000 +0000 +++ mod_fcgid.2.1/directives.htm 2007-02-16 10:45:44.000000000 +0000 @@ -14,10 +14,10 @@ Home
- Chinese Info
- Download (source)
- Documentations
- Feedback
+ Chinese Info
+ Download (source)
+ Documentations
+ Feedback
- - - - -The mod_fcgid Home Page + + + + The mod_fcgid Home Page - - -

This is a for regular fastcgi. 

LoadModule fcgid_module -modules/mod_fcgid.so

-<Location /fcgid>
-    SetHandler fcgid-script
-    Options ExecCGI
-    allow from all
-</Location>

-  -

-

This is for suEXEC. Please get more information about suEXEC here. 

LoadModule fcgid_module -modules/mod_fcgid.so

-<Location /fcgid>
-    SetHandler fcgid-script
-    Options ExecCGI
-    allow from all
-</Location>

-<VirtualHost 192.168.1.89>
-    ServerAdmin webmaster at host.foo.com
-    DocumentRoot /usr/local/apache2/htdocs/
-    ServerName host.foo.com
-    SuexecUserGroup pqf pqf
-</VirtualHost>

-?? -

-

This is for fastcgi-mode PHP (UNIX)

LoadModule fcgid_module modules/mod_fcgid.so

-<Directory /usr/local/apache2/htdocs/php>
-    SetHandler fcgid-script
-    FCGIWrapper /usr/local/bin/php .php
-    Options ExecCGI
-    allow from all
-</Directory>

This works too:

LoadModule fcgid_module -modules/mod_fcgid.so 

-AddHandler fcgid-script .php
-<Directory /usr/local/apache2/htdocs/php>
-    FCGIWrapper /usr/local/bin/php .php
-    Options ExecCGI
-    allow from all
-</Directory>

# Please make sure:
-# php is configured with --enable-fastcgi option
-# check error_log(with debug level), if -any thing goes wrong -

-

This is for suPHP  ( UNIX ) -

LoadModule fcgid_module modules/mod_fcgid.so
-
-<VirtualHost *:80>
-    ServerName test2.example.com
-    DocumentRoot /usr/local/apache2/htdocs/test2.example.com/
-    SuexecUserGroup pqf pqf
-</VirtualHost>
-
-<Directory /usr/local/apache2/htdocs/test2.example.com/>
-    AddHandler fcgid-script .php
-    Options ExecCGI
-    allow from all
-    FCGIWrapper /usr/local/apache2/htdocs/test2.example.com/php .php
-</Directory>

-

- -# Please make sure:
-# php is configured with --enable-fastcgi option
-# copy php execution to /usr/local/apache2/htdocs/test2.example.com/ directory
-# make sure all files in /usr/local/apache2/htdocs/test2.example.com/ with right -owner and group
-# check error_log(with debug level) and suexec_log, if -any thing goes wrong +

This is a for regular fastcgi. 

+

LoadModule fcgid_module modules/mod_fcgid.so

+

<Location /fcgid>
+    SetHandler fcgid-script
+    Options ExecCGI
+    allow from all
+</Location>

+

  +

+
+

This is for suEXEC. Please get more +information about suEXEC here. 

+

LoadModule fcgid_module modules/mod_fcgid.so

+

<Location /fcgid>
+    SetHandler fcgid-script
+    Options ExecCGI
+    allow from all
+</Location>

+

<VirtualHost 192.168.1.89>
+    ServerAdmin webmaster at host.foo.com
+    DocumentRoot /usr/local/apache2/htdocs/
+    ServerName host.foo.com
+    SuexecUserGroup pqf pqf
+</VirtualHost>

+

?? +

+
+

This is for fastcgi-mode PHP (UNIX)

+

LoadModule fcgid_module modules/mod_fcgid.so

+

<Directory /usr/local/apache2/htdocs/php>
+    SetHandler fcgid-script
+    FCGIWrapper /usr/local/bin/php .php +

+

   # You need mod_fcgid +version >= 2.1 to support arguments in FCGIWrapper, if you want
+   # FCGIWrapper "/usr/local/bin/php -c /etc/" .php

+    Options ExecCGI
+

    allow from all
+</Directory>

+

This works too:

+

LoadModule fcgid_module modules/mod_fcgid.so 

+

AddHandler fcgid-script .php
+<Directory /usr/local/apache2/htdocs/php>
+    FCGIWrapper /usr/local/bin/php .php

+

    # You need mod_fcgid version >= 2.1 to +support arguments in FCGIWrapper, if you want
+   # FCGIWrapper "/usr/local/bin/php -c /etc/" .php

+

    Options ExecCGI
+    allow from all
+</Directory>

+

# Please make sure:
+# php is configured with --enable-fastcgi option
+# check error_log(with debug level), if any thing goes wrong

+

+
+

This is for fastcgi-mode Ruby on Rails ( Thank Andre Nathan giving +me this demo configuration )
+
+LoadModule fcgid_module modules/mod_fcgid.so
+SocketPath /tmp/fcgidsock
+SharememPath /tmp/fcgidshm
+DefaultInitEnv RAILS_ENV production

- +<Directory /home/sneakymustard/tumble/public>
+    Options ExecCGI FollowSymLinks
+    AllowOverride AuthConfig Indexes Limit
+    Order allow,deny
+    Allow from all
+
+    AddHandler fcgid-script .fcgi

+

    # You need +mod_fcgid version >= 2.1 to support arguments "xxx/dispatch.fcgi" in +FCGIWrapper
+    FCGIWrapper "/usr/bin/ruby +/home/sneakymustard/tumble/public/dispatch.fcgi" .fcgi
+
+    RewriteEngine On
+    RewriteRule ^$ index.html [QSA]
+    RewriteRule ^([^.]+)$ $1.html [QSA]
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteRule ^(.*)$ dispatch.fcgi [QSA,L]
+</Directory>
+
+

+ +

+
+

This is for suPHP  ( UNIX )

+

LoadModule fcgid_module modules/mod_fcgid.so
+
+<VirtualHost *:80>
+    ServerName test2.example.com
+    DocumentRoot +/usr/local/apache2/htdocs/test2.example.com/
+    SuexecUserGroup pqf pqf
+</VirtualHost>
+
+<Directory /usr/local/apache2/htdocs/test2.example.com/>
+    AddHandler fcgid-script .php
+    Options ExecCGI
+    allow from all
+    FCGIWrapper +/usr/local/apache2/htdocs/test2.example.com/php .php

+

+

    # You need mod_fcgid version >= 2.1 to +support arguments in FCGIWrapper, if you want
+   # FCGIWrapper "/usr/local/bin/php -c /etc/" .php

+

</Directory>

+

# Please make sure:
+# php is configured with --enable-fastcgi option
+# copy php execution to /usr/local/apache2/htdocs/test2.example.com/ +directory
+# make sure all files in /usr/local/apache2/htdocs/test2.example.com/ +with right owner and group
+# check error_log(with debug level) and suexec_log, if any thing goes +wrong
+


-This is for fastcgi-mode PHP ( Windows )

LoadModule fcgid_module modules/mod_fcgid.so

-<Directory "C:/Apache2/htdocs/php/">
-    SetHandler fcgid-script
-    Options execCGI
-    AllowOverride None
-    Order allow,deny
-    Allow from all
-    FCGIWrapper "c:/php/php.exe" .php
-</Directory>

This works too:

LoadModule fcgid_module modules/mod_fcgid.so 

-AddHandler fcgid-script .php
-<Directory "C:/Apache2/htdocs/php/">
-    FCGIWrapper "c:/php/php.exe" .php
-    Options ExecCGI
-    allow from all
+This is for fastcgi-mode PHP ( Windows ) +

+

LoadModule fcgid_module modules/mod_fcgid.so
+DefaultInitEnv PHPRC "c:/php/"
+DefaultInitEnv PATH +"c:/php;C:/WINDOWS/system32;C:/WINDOWS;C:/WINDOWS/System32/Wbem;"
+DefaultInitEnv SystemRoot "C:/Windows"
+DefaultInitEnv SystemDrive "C:"
+DefaultInitEnv TEMP "C:/WINDOWS/TEMP"
+DefaultInitEnv TMP "C:/WINDOWS/TEMP"
+DefaultInitEnv windir "C:/WINDOWS"
+<Directory "C:/Apache2/htdocs/php/">
+    SetHandler fcgid-script
+    Options execCGI
+    AllowOverride None
+    Order allow,deny
+    Allow from all
+    FCGIWrapper "c:/php/php.exe" .php

+

    # You need mod_fcgid version >= 2.1 to +support arguments in FCGIWrapper, if you want
+   # FCGIWrapper "/usr/local/bin/php -c /etc/" .php
+</Directory>

+

This works too: +

+

LoadModule fcgid_module modules/mod_fcgid.so
+DefaultInitEnv PHPRC "c:/php/"
+DefaultInitEnv PATH +"c:/php;C:/WINDOWS/system32;C:/WINDOWS;C:/WINDOWS/System32/Wbem;"
+DefaultInitEnv SystemRoot "C:/Windows"
+DefaultInitEnv SystemDrive "C:"
+DefaultInitEnv TEMP "C:/WINDOWS/TEMP"
+DefaultInitEnv TMP "C:/WINDOWS/TEMP"
+DefaultInitEnv windir "C:/WINDOWS"
+AddHandler fcgid-script .php
+<Directory "C:/Apache2/htdocs/php/">
+    FCGIWrapper "c:/php/php.exe" .php

+

    # You need mod_fcgid version >= 2.1 to +support arguments in FCGIWrapper, if you want
+   # FCGIWrapper "/usr/local/bin/php -c /etc/" .php
+

+

     +Options ExecCGI
+    allow from all
</Directory>
- +

-

This is for Authenticator

+

This is for Authenticator

LoadModule fcgid_module modules/mod_fcgid.so -

<Location /fcgid>
- SetHandler fcgid-script
- Options ExecCGI
- allow from all
- AuthType Basic
- AuthName ProtectedRealm
- FastCgiAuthenticator /some/path/authenticator
- require valid-user
-</Location>

-

Another configuration: FastCgiAuthenticatorAuthoritative +

<Location /fcgid>
+SetHandler fcgid-script
+Options ExecCGI
+allow from all
+AuthType Basic
+AuthName ProtectedRealm
+FastCgiAuthenticator /some/path/authenticator
+require valid-user
+</Location>
+

+

Another configuration: FastCgiAuthenticatorAuthoritative (default On)

-

Setting the FastCgiAuthenticatorAuthoritative directive -explicitly to Off allows authentication to be passed on to lower level -modules

- +

Setting the FastCgiAuthenticatorAuthoritative +directive explicitly to Off allows authentication to be +passed on to lower level modules

-

This is for Authorizer

- +

This is for Authorizer

LoadModule fcgid_module modules/mod_fcgid.so -

<Location /fcgid>
- SetHandler fcgid-script
- Options ExecCGI
- allow from all
- AuthType Basic
- AuthName ProtectedRealm
- FastCgiAuthorizer /some/place/Authorizer
-</Location>

- -

Another configuration: FastCgiAuthorizerAuthoritative +

+

<Location /fcgid>
+SetHandler fcgid-script
+Options ExecCGI
+allow from all
+AuthType Basic
+AuthName ProtectedRealm
+FastCgiAuthorizer /some/place/Authorizer
+</Location>

+

Another configuration: FastCgiAuthorizerAuthoritative (default On)

- -

Setting the FastCgiAuthorizerAuthoritative directive explicitly -to Off allows authorization to be passed on to lower level modules

- +

Setting the FastCgiAuthorizerAuthoritative directive +explicitly to Off allows authorization to be passed on to +lower level modules

-

This is for AccessChecker

+

This is for AccessChecker

LoadModule fcgid_module modules/mod_fcgid.so -

<Location /fcgid>
- SetHandler fcgid-script
- Options ExecCGI
- allow from all
- FastCgiAccessChecker /some/place/access-checker
-</Location>

-

Another configuration: FastCgiAccessCheckerAuthoritative +

<Location /fcgid>
+SetHandler fcgid-script
+Options ExecCGI
+allow from all
+FastCgiAccessChecker /some/place/access-checker
+</Location>
+

+

Another configuration: FastCgiAccessCheckerAuthoritative (default On)

-

Setting the FastCgiAccessCheckerAuthoritative directive -explicitly to Off allows access checking to be passed on to lower level -modules

+

Setting the FastCgiAccessCheckerAuthoritative +directive explicitly to Off allows access checking to be +passed on to lower level modules

??

??

-

??

??

??

@@ -171,7 +253,5 @@

??

??

??

- - Index: doc.htm =================================================================== RCS file: /cvs/extras/rpms/mod_fcgid/devel/doc.htm,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- doc.htm 31 Oct 2006 18:37:08 -0000 1.2 +++ doc.htm 16 Feb 2007 14:20:03 -0000 1.3 @@ -1,113 +1,210 @@ - - + - - -The mod_fcgid Home Page - - - + The mod_fcgid Home Page + - - - - - - - - + + + - - - +

+ + +
- -  - - - - - -
- -Home
-Chinese Info
-Download (source)
-Documentations
- - -Feedback - - -
- -
    -
  • - -

    Here are some examples of configuration

    -
    • -
- -

Configuration for Regular fastcgi -(non-PHP, non-Ruby, non-Python) 

Configuration -for suEXEC fastcgi

Configuration for PHP -(UNIX)

Configuration for suPHP (UNIX)

Configuration -for PHP (Windows)

Configuration -for Authenticator

Configuration -for Authorizer

Configuration -for AccessChecker

  -

-
    -

  • There are +

  + + + + + + +
Home
+ Chinese Info
+ Download (source)
+ Documentations
+ Feedback
+ Support This Project
+ 		+
    +
  • +

    Here are some examples of configuration

    +
    • +
+

Configuration +for Regular fastcgi +(non-PHP, non-Ruby, non-Python) 

+

Configuration +for suEXEC fastcgi

+

Configuration for PHP +(UNIX)
+

+

Configuration for Ruby on +Rails
+

+

Configuration for suPHP +(UNIX)

+

Configuration +for PHP (Windows)

+

Configuration +for Authenticator

+

Configuration +for Authorizer

+

Configuration +for AccessChecker

+

 

+
+
    +
  • +

    There are some other configurations you can set

    -
    • -
-

IdleTimeout n (300 -seconds)

An idle fastcgi application will be terminated after IdleTimeout -seconds.

IdleScanInterval n (120 seconds)

The scan interval for idle -fastcgi applications.

BusyTimeout n (300 seconds)

a fastcgi -application will be terminated if handing a single request longer than busy -timeout.

BusyScanInterval n (120 seconds)

The scan interval for busy -timeout fastcgi applications.

ErrorScanInterval n (3 seconds)

The -scan interval for exit pending fastcgi applications. fastcgi applications will -be terminated within this scanning.

ZombieScanInterval n (3 seconds)

The -scan interval for zombie process. 

ProcessLifeTime n (3600 seconds)

A -fastcgi application will be terminated if lifetime expired, even no error is -detected.

SocketPath path (logs/fcgidsock)

The directory to put the -UNIX domain socket. (UNIX only)

SpawnScoreUpLimit n (10)

The -spawn-speed control score up water limit. Score increases while a process is spawned or terminated, and decreases -as time progresses; while the score is higher than SpawnScoreUpLimit, the spawning will be -held for a while. The higher this number is, the higher speed of the spawning -can be.

SpawnScore n (1)

The weight of spawning.  This weight -will be plused to the spawn-control score on every spawn. The higher this number -is, the lower speed of spawning can be.

TerminationScore n (2)

The -weight of termination. This weight will be plused to the score while fastcgi -process terminates. The higher this number is, the lower speed of spawning can -be.

MaxProcessCount n (1000)

The max count of total fastcgi process -count.

DefaultMaxClassProcessCount n (100)

The maximum number of -fastcgi application instances allowed to run for any one fastcgi application. 

DefaultMinClassProcessCount n -(3)

The minimum number of -fastcgi application instances for any one fastcgi application. 

DefaultInitEnv  -env_name env_value

The default environment variables before a fastcgi + + +

IdleTimeout n (300 +seconds)

+

An idle fastcgi application will be terminated after +IdleTimeout +seconds.

+

IdleScanInterval n (120 seconds)

+

The scan interval for idle +fastcgi applications.

+

BusyTimeout n (300 seconds)

+

a fastcgi +application will be terminated if handing a single request longer than +busy +timeout.

+

BusyScanInterval n (120 seconds)

+

The scan interval for busy +timeout fastcgi applications.

+

ErrorScanInterval n (3 seconds)

+

The +scan interval for exit pending fastcgi applications. fastcgi +applications will +be terminated within this scanning.

+

ZombieScanInterval n (3 seconds)

+

The +scan interval for zombie process. 

+

ProcessLifeTime n (3600 seconds)

+

A +fastcgi application will be terminated if lifetime expired, even no +error is +detected.

+

SocketPath path (logs/fcgidsock)

+

The directory to put the +UNIX domain socket. (UNIX only)
+

+

SharememPath path +(logs/fcgid_shm)
+

+

The share memory file path. (UNIX only) (version >= 2.1 +only)
+

+

SpawnScoreUpLimit n (10)

+

The +spawn-speed control score up water limit. Score increases while a +process is spawned or terminated, and decreases +as time progresses; while the score is higher than SpawnScoreUpLimit, +the spawning will be +held for a while. The higher this number is, the higher speed of the +spawning +can be.

+

SpawnScore n (1)

+

The weight of spawning.  This weight +will be plused to the spawn-control score on every spawn. The higher +this number +is, the lower speed of spawning can be.

+

TerminationScore n (2)

+

The +weight of termination. This weight will be plused to the score while +fastcgi +process terminates. The higher this number is, the lower speed of +spawning can +be.

+

MaxProcessCount n (1000)

+

The max count of total fastcgi process +count.

+

DefaultMaxClassProcessCount n (100)

+

The maximum number of +fastcgi application instances allowed to run for any one fastcgi +application. 

+

DefaultMinClassProcessCount n +(3)

+

The minimum number of +fastcgi application instances for any one fastcgi application. 

+

DefaultInitEnv  +env_name env_value

+

The default environment variables before a fastcgi application is spawned. You can set this configuration more -than once.

IPCConnectTimeout n (3 seconds)

The connect timeout to a -fastcgi application. 

IPCCommTimeout n (20 seconds)

The communication -timeout to a fastcgi application. Please increase this value if your CGI have a -slow initialization or slow respond.

OutputBufferSize n (64k bytes)

CGI -output cache buffer size.

PHP_Fix_Pathinfo_Enable n(n=0/1, default 0)

If +than once.
+

+ + + + + + +
Note: If you get:
+
Can't create TCP/IP +socket (10106) error while running PHP script(on Win32 only), you will have to set +these(Please modify the values if +necessary):
+ DefaultInitEnv PHPRC "c:/php/"
+DefaultInitEnv PATH +"c:/php;C:/WINDOWS/system32;C:/WINDOWS;C:/WINDOWS/System32/Wbem;"
+DefaultInitEnv SystemRoot "C:/Windows"
+DefaultInitEnv SystemDrive "C:"
+DefaultInitEnv TEMP "C:/WINDOWS/TEMP"
+DefaultInitEnv TMP "C:/WINDOWS/TEMP"
+DefaultInitEnv windir "C:/WINDOWS"
+
+(Thank Steffen of apachelounge.com for this note)
+
+
+


+

+

IPCConnectTimeout n (3 seconds)

+

The connect timeout to a +fastcgi application. 

+

IPCCommTimeout n (20 seconds)

+

The communication +timeout to a fastcgi application. Please increase this value if your +CGI have a +slow initialization or slow respond.

+

OutputBufferSize n (64k bytes)

+

CGI +output cache buffer size.

+

PHP_Fix_Pathinfo_Enable n(n=0/1, default 0)

+

If you are using PHP and set cgi.fix_pathinfo=1 in php.ini, set -PHP_Fix_Pathinfo_Enable 1.

MaxRequestsPerProcess n (-1)

(Added in -version 1.11, patch from Robert L Mathews)

Adds a MaxRequestsPerProcess parameter that allows mod_fcgid to -exit after handling a certain number of requests, similar to the existing ProcessLifeTime option. 

This solves a problem with PHP in FastCGI mode. By default, PHP stops -accepting new FastCGI connections after handling 500 requests; unfortunately, there is a potential race condition during the PHP cleanup code in which -PHP can be shutting down but still have the socket open, so mod_fcgid under heavy load can send request number 501 to PHP and have it "accepted", but then -PHP appears to simply exit, causing errors.

If you are using PHP, you should -set it to 500. -1 mean fastcgi process will not exit no matter how many requests +PHP_Fix_Pathinfo_Enable 1.

+

MaxRequestsPerProcess n (-1)

+

(Added in +version 1.11, patch from Robert L Mathews)

+

Adds a MaxRequestsPerProcess parameter that allows mod_fcgid +to +exit after handling a certain number of requests, similar to the +existing ProcessLifeTime option. 

+

This solves a problem with PHP in FastCGI mode. By default, +PHP stops +accepting new FastCGI connections after handling 500 requests; +unfortunately, there is a potential race condition during the PHP +cleanup code in which +PHP can be shutting down but still have the socket open, so mod_fcgid +under heavy load can send request number 501 to PHP and have it +"accepted", but then +PHP appears to simply exit, causing errors.

+

If you are using PHP, you should +set it to 500. -1 mean fastcgi process will not exit no matter how many +requests it has handled.
- -
- - + + Index: fcgid.conf =================================================================== RCS file: /cvs/extras/rpms/mod_fcgid/devel/fcgid.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fcgid.conf 6 Sep 2006 13:08:59 -0000 1.1 +++ fcgid.conf 16 Feb 2007 14:20:03 -0000 1.2 @@ -11,5 +11,6 @@ AddHandler fcgid-script fcg fcgi fpl -# Sane place to put sockets +# Sane place to put sockets and shared memory file SocketPath run/mod_fcgid +SharememPath run/fcgid_shm Index: mod_fcgid.spec =================================================================== RCS file: /cvs/extras/rpms/mod_fcgid/devel/mod_fcgid.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mod_fcgid.spec 31 Oct 2006 18:37:08 -0000 1.3 +++ mod_fcgid.spec 16 Feb 2007 14:20:03 -0000 1.4 @@ -10,7 +10,7 @@ %endif Name: mod_fcgid -Version: 2.0 +Version: 2.1 Release: 1%{?dist} Summary: Apache2 module for high-performance server-side scripting Group: System Environment/Daemons @@ -20,11 +20,11 @@ Source1: fcgid.conf Source2: fastcgi.te Source3: fastcgi.fc -Source4: README.Fedora +Source4: mod_fcgid-2.1-README.Fedora Source5: http://fastcgi.coremail.cn/doc.htm Source6: http://fastcgi.coremail.cn/configuration.htm -Source7: README.SELinux -Patch0: mod_fcgid.1.09-docurls.patch +Source7: mod_fcgid-2.1-README.SELinux +Patch0: mod_fcgid.2.1-docurls.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: httpd-devel >= 2.0 Requires: httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && %{__cat} %{_includedir}/httpd/.mmn || echo missing) @@ -38,9 +38,9 @@ %if %{selinux_module} %define selinux_policyver %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp) %package selinux -Summary: SELinux policy module supporting FastCGI applications with mod_fcgid -Group: System Environment/Base -BuildRequires: %{selinux_buildreqs} +Summary: SELinux policy module supporting FastCGI applications with mod_fcgid +Group: System Environment/Base +BuildRequires: %{selinux_buildreqs} # selinux-policy is required for directory ownership of %{_datadir}/selinux/* # Modules built against one version of a policy may not work with older policy # versions, as noted on fedora-selinux-list: @@ -48,9 +48,9 @@ # Hence the versioned dependency. The versioning will hopefully be replaced by # an ABI version requirement or something similar in the future %if "%{selinux_policyver}" != "" -Requires: selinux-policy >= %{selinux_policyver} +Requires: selinux-policy >= %{selinux_policyver} %endif -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} Requires(post): /usr/sbin/semodule, /sbin/restorecon Requires(postun): /usr/sbin/semodule, /sbin/restorecon @@ -60,8 +60,13 @@ %prep %setup -q -n mod_fcgid.%{version} -%{__cp} -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE6} %{SOURCE7} . +%{__cp} -p %{SOURCE1} fcgid.conf +%{__cp} -p %{SOURCE2} fastcgi.te +%{__cp} -p %{SOURCE3} fastcgi.fc +%{__cp} -p %{SOURCE4} README.Fedora %{__cp} -p %{SOURCE5} directives.htm +%{__cp} -p %{SOURCE6} configuration.htm +%{__cp} -p %{SOURCE7} README.SELinux %patch0 -p1 %{__sed} -i -e 's/\r$//' directives.htm configuration.htm @@ -71,9 +76,9 @@ %if %{selinux_module} for selinuxvariant in %{selinux_variants} do - %{__make} NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile - %{__mv} fastcgi.pp fastcgi.pp.${selinuxvariant} - %{__make} NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean + %{__make} NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile + %{__mv} fastcgi.pp fastcgi.pp.${selinuxvariant} + %{__make} NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean done %endif @@ -81,20 +86,20 @@ %{__rm} -rf %{buildroot} topdir=$(/usr/bin/dirname $(/usr/sbin/apxs -q exp_installbuilddir)) %{__make} \ - top_dir=${topdir} \ - DESTDIR=%{buildroot} \ - MKINSTALLDIRS="%{__mkdir_p}" \ - install -%{__install} -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/fcgid.conf + top_dir=${topdir} \ + DESTDIR=%{buildroot} \ + MKINSTALLDIRS="%{__mkdir_p}" \ + install +%{__install} -D -m 644 fcgid.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/fcgid.conf %{__install} -d -m 755 %{buildroot}%{_localstatedir}/run/mod_fcgid # Install SELinux policy modules %if %{selinux_module} for selinuxvariant in %{selinux_variants} do - %{__install} -d %{buildroot}%{_datadir}/selinux/${selinuxvariant} - %{__install} -p -m 644 fastcgi.pp.${selinuxvariant} \ - %{buildroot}%{_datadir}/selinux/${selinuxvariant}/fastcgi.pp + %{__install} -d %{buildroot}%{_datadir}/selinux/${selinuxvariant} + %{__install} -p -m 644 fastcgi.pp.${selinuxvariant} \ + %{buildroot}%{_datadir}/selinux/${selinuxvariant}/fastcgi.pp done # Hardlink identical policy module packages together /usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux @@ -129,7 +134,7 @@ %endif %files -%defattr(-,root,root,0755) +%defattr(-,root,root,-) %doc ChangeLog AUTHOR COPYING configuration.htm directives.htm %doc README.Fedora %{_libdir}/httpd/modules/mod_fcgid.so @@ -138,12 +143,19 @@ %if %{selinux_module} %files selinux -%defattr(-,root,root,0755) +%defattr(-,root,root,-) %doc fastcgi.fc fastcgi.te README.SELinux %{_datadir}/selinux/*/fastcgi.pp %endif %changelog +* Fri Feb 16 2007 Paul Howarth 2.1-1 +- Update to 2.1 +- Update documentation and patches +- Rename some source files to reduce chances of conflicting names +- Include SharememPath directive in conf file to avoid unfortunate upstream + default location + * Mon Oct 30 2006 Paul Howarth 2.0-1 - Update to 2.0 - Source is now hosted at sourceforge.net Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_fcgid/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 Oct 2006 18:37:08 -0000 1.3 +++ sources 16 Feb 2007 14:20:03 -0000 1.4 @@ -1 +1 @@ -3aa51f1e293e6d881028295a23021dae mod_fcgid.2.0.tar.gz +68a6479e398a20577334f16a8b06c418 mod_fcgid.2.1.tar.gz --- README.Fedora DELETED --- --- README.SELinux DELETED --- --- mod_fcgid.1.09-docurls.patch DELETED --- From fedora-extras-commits at redhat.com Fri Feb 16 14:48:07 2007 From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu)) Date: Fri, 16 Feb 2007 09:48:07 -0500 Subject: rpms/sysprof-kmod/devel sysprof-kmod.spec,1.34,1.35 Message-ID: <200702161448.l1GEm7aw015634@cvs-int.fedora.redhat.com> Author: giallu Update of /cvs/extras/rpms/sysprof-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15615 Modified Files: sysprof-kmod.spec Log Message: Rebuild for kernel 2.6.20-1.2932.fc7 Index: sysprof-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/sysprof-kmod/devel/sysprof-kmod.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- sysprof-kmod.spec 16 Feb 2007 08:07:04 -0000 1.34 +++ sysprof-kmod.spec 16 Feb 2007 14:47:34 -0000 1.35 @@ -4,7 +4,7 @@ # end stuff to be ... # hardcode for now: -%{!?kversion: %define kversion 2.6.20-1.2930.fc7} +%{!?kversion: %define kversion 2.6.20-1.2932.fc7} # hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g. # --define "kversion 2.6.16-1.2096_FC5" From fedora-extras-commits at redhat.com Fri Feb 16 15:00:19 2007 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 16 Feb 2007 10:00:19 -0500 Subject: rpms/mod_fcgid/FC-6 mod_fcgid-2.1-README.Fedora, NONE, 1.1 mod_fcgid-2.1-README.SELinux, NONE, 1.1 mod_fcgid.2.1-docurls.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 configuration.htm, 1.2, 1.3 doc.htm, 1.2, 1.3 fcgid.conf, 1.1, 1.2 mod_fcgid.spec, 1.3, 1.4 sources, 1.3, 1.4 README.Fedora, 1.2, NONE README.SELinux, 1.2, NONE mod_fcgid.1.09-docurls.patch, 1.1, NONE Message-ID: <200702161500.l1GF0Jb9015835@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/mod_fcgid/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15790 Modified Files: .cvsignore configuration.htm doc.htm fcgid.conf mod_fcgid.spec sources Added Files: mod_fcgid-2.1-README.Fedora mod_fcgid-2.1-README.SELinux mod_fcgid.2.1-docurls.patch Removed Files: README.Fedora README.SELinux mod_fcgid.1.09-docurls.patch Log Message: Update to 2.1 --- NEW FILE mod_fcgid-2.1-README.Fedora --- Using mod_fcgid in Fedora ========================= This mod_fcgid package includes a configuration file /etc/httpd/conf.d/fcgid.conf that ensures that the module is loaded and added as the handler for .fcg, .fcgi, and .fpl applications (provided mod_fastcgi in not already loaded, in which case you will need to decide which module should handle which types of application). So far the module package has only been tested in conjunction with the "moin" wiki application. Further feedback regarding other applications is welcome. Setting up moin with mod_fcgid ============================== Setting up moin with mod_fcgid is very similar to setting it up as a regular CGI application. * Create a directory for your wiki instance: DESTDIR=/var/www/mywiki mkdir -p $DESTDIR/cgi-bin * Copy in the wiki template data and the application itself: cp -a /usr/share/moin/{data,underlay} $DESTDIR cp -a /usr/share/moin/server/moin.fcg $DESTDIR/cgi-bin cp -a /usr/share/moin/config/wikiconfig.py $DESTDIR/cgi-bin * Fix the directory ownership chown -R apache:apache $DESTDIR/{data,underlay} * Edit $DESTDIR/cgi-bin/wikiconfig.py to suit your needs * Create a httpd configuration file for the wiki, e.g. /etc/httpd/conf.d/mywiki.conf # Wiki application data common to all wiki instances Alias /wiki/ "/usr/share/moin/htdocs/" Options Indexes FollowSymLinks AllowOverride None Order allow,deny Allow from all # Wiki instance with mod_fcgid ScriptAlias /mywiki "/var/www/mywiki/cgi-bin/moin.fcg" Options Indexes FollowSymLinks ExecCGI AllowOverride None Order allow,deny Allow from all * If you are using SELinux with Fedora Core 5 or later, install the mod_fcgid-selinux package and see the README.SELinux file in that package for details of the file contexts to use * Restart the web server to load the new configuration: service httpd restart That should do it! --- NEW FILE mod_fcgid-2.1-README.SELinux --- Using mod_fcgid with SELinux in Fedora Core 5 onwards ===================================================== Versions of this package built for Fedora Core 5 or later include an SELinux policy module to support FastCGI applications. This has only been tested so far with moin, so feedback from other applications is welcome. The intention is for this module to be included in the SELinux reference policy eventually. The module source (fastcgi.{fc,te}) is included for reference as documentation in the package. The module introduces a new set of SELinux types for FastCGI applications, comparable with the types described in "man httpd_selinux" for regular CGI scripts (or "system scripts" as they are known in SELinux): * httpd_fastcgi_content_t (equivalent to httpd_sys_content_t) - Set files with httpd_fastcgi_content_t for content that is available from all FastCGI scripts and the daemon. * httpd_fastcgi_script_exec_t (equivalent to httpd_sys_script_exec_t) - Set FastCGI scripts with httpd_fastcgi_script_exec_t to allow them to run with access to all fastcgi types. * httpd_fastcgi_script_ro_t (equivalent to httpd_sys_script_ro_t) - Set files with httpd_fastcgi_script_ro_t if you want httpd_fastcgi_script_exec_t scripts to read the data, and disallow other non-fastcgi scripts from access. * httpd_fastcgi_script_rw_t (equivalent to httpd_sys_script_rw_t) - Set files with httpd_fastcgi_script_rw_t if you want httpd_fastcgi_script_exec_t scripts to read/write the data, and disallow other non-fastcgi scripts from access. * httpd_fastcgi_script_ra_t (equivalent to httpd_sys_script_ra_t) - Set files with httpd_fastcgi_script_ra_t if you want httpd_fastcgi_script_exec_t scripts to read/append to the file, and disallow other non-fastcgi scripts from access. So for the moin wiki layout described in README.Fedora of the main mod_fcgid package, the contexts would be set as follows: cd /var/www/mywiki chcon -t httpd_fastcgi_content_t . chcon -R -t httpd_fastcgi_script_exec_t cgi-bin chcon -R -t httpd_fastcgi_script_rw_t data underlay It is necessary to turn on the httpd_enable_cgi boolean to run either regular or FastCGI scripts: setsebool -P httpd_enable_cgi 1 If the httpd_unified boolean is set, "sys" and "fastcgi" scripts can access each other's data. This means that you only need to set the actual FastCGI scripts themselves to httpd_fastcgi_script_exec_t and can leave the file contexts for everything else set to the "sys" types if you prefer. This is useful if you have a mixture of CGI and FastCGI applications accessing the same data. If you have any questions or issues regarding FastCGI and SELinux, please don't hesitate to bring them up on fedora-selinux-list. mod_fcgid.2.1-docurls.patch: --- NEW FILE mod_fcgid.2.1-docurls.patch --- --- mod_fcgid.2.1/directives.htm 2007-02-16 03:40:23.000000000 +0000 +++ mod_fcgid.2.1/directives.htm 2007-02-16 10:45:44.000000000 +0000 @@ -14,10 +14,10 @@ Home
- Chinese Info
- Download (source)
- Documentations
- Feedback
+ Chinese Info
+ Download (source)
+ Documentations
+ Feedback
- - - - -The mod_fcgid Home Page + + + + The mod_fcgid Home Page - - -

This is a for regular fastcgi. 

LoadModule fcgid_module -modules/mod_fcgid.so

-<Location /fcgid>
-    SetHandler fcgid-script
-    Options ExecCGI
-    allow from all
-</Location>

-  -

-

This is for suEXEC. Please get more information about suEXEC here. 

LoadModule fcgid_module -modules/mod_fcgid.so

-<Location /fcgid>
-    SetHandler fcgid-script
-    Options ExecCGI
-    allow from all
-</Location>

-<VirtualHost 192.168.1.89>
-    ServerAdmin webmaster at host.foo.com
-    DocumentRoot /usr/local/apache2/htdocs/
-    ServerName host.foo.com
-    SuexecUserGroup pqf pqf
-</VirtualHost>

-?? -

-

This is for fastcgi-mode PHP (UNIX)

LoadModule fcgid_module modules/mod_fcgid.so

-<Directory /usr/local/apache2/htdocs/php>
-    SetHandler fcgid-script
-    FCGIWrapper /usr/local/bin/php .php
-    Options ExecCGI
-    allow from all
-</Directory>

This works too:

LoadModule fcgid_module -modules/mod_fcgid.so 

-AddHandler fcgid-script .php
-<Directory /usr/local/apache2/htdocs/php>
-    FCGIWrapper /usr/local/bin/php .php
-    Options ExecCGI
-    allow from all
-</Directory>

# Please make sure:
-# php is configured with --enable-fastcgi option
-# check error_log(with debug level), if -any thing goes wrong -

-

This is for suPHP  ( UNIX ) -

LoadModule fcgid_module modules/mod_fcgid.so
-
-<VirtualHost *:80>
-    ServerName test2.example.com
-    DocumentRoot /usr/local/apache2/htdocs/test2.example.com/
-    SuexecUserGroup pqf pqf
-</VirtualHost>
-
-<Directory /usr/local/apache2/htdocs/test2.example.com/>
-    AddHandler fcgid-script .php
-    Options ExecCGI
-    allow from all
-    FCGIWrapper /usr/local/apache2/htdocs/test2.example.com/php .php
-</Directory>

-

- -# Please make sure:
-# php is configured with --enable-fastcgi option
-# copy php execution to /usr/local/apache2/htdocs/test2.example.com/ directory
-# make sure all files in /usr/local/apache2/htdocs/test2.example.com/ with right -owner and group
-# check error_log(with debug level) and suexec_log, if -any thing goes wrong +

This is a for regular fastcgi. 

+

LoadModule fcgid_module modules/mod_fcgid.so

+

<Location /fcgid>
+    SetHandler fcgid-script
+    Options ExecCGI
+    allow from all
+</Location>

+

  +

+
+

This is for suEXEC. Please get more +information about suEXEC here. 

+

LoadModule fcgid_module modules/mod_fcgid.so

+

<Location /fcgid>
+    SetHandler fcgid-script
+    Options ExecCGI
+    allow from all
+</Location>

+

<VirtualHost 192.168.1.89>
+    ServerAdmin webmaster at host.foo.com
+    DocumentRoot /usr/local/apache2/htdocs/
+    ServerName host.foo.com
+    SuexecUserGroup pqf pqf
+</VirtualHost>

+

?? +

+
+

This is for fastcgi-mode PHP (UNIX)

+

LoadModule fcgid_module modules/mod_fcgid.so

+

<Directory /usr/local/apache2/htdocs/php>
+    SetHandler fcgid-script
+    FCGIWrapper /usr/local/bin/php .php +

+

   # You need mod_fcgid +version >= 2.1 to support arguments in FCGIWrapper, if you want
+   # FCGIWrapper "/usr/local/bin/php -c /etc/" .php

+    Options ExecCGI
+

    allow from all
+</Directory>

+

This works too:

+

LoadModule fcgid_module modules/mod_fcgid.so 

+

AddHandler fcgid-script .php
+<Directory /usr/local/apache2/htdocs/php>
+    FCGIWrapper /usr/local/bin/php .php

+

    # You need mod_fcgid version >= 2.1 to +support arguments in FCGIWrapper, if you want
+   # FCGIWrapper "/usr/local/bin/php -c /etc/" .php

+

    Options ExecCGI
+    allow from all
+</Directory>

+

# Please make sure:
+# php is configured with --enable-fastcgi option
+# check error_log(with debug level), if any thing goes wrong

+

+
+

This is for fastcgi-mode Ruby on Rails ( Thank Andre Nathan giving +me this demo configuration )
+
+LoadModule fcgid_module modules/mod_fcgid.so
+SocketPath /tmp/fcgidsock
+SharememPath /tmp/fcgidshm
+DefaultInitEnv RAILS_ENV production

- +<Directory /home/sneakymustard/tumble/public>
+    Options ExecCGI FollowSymLinks
+    AllowOverride AuthConfig Indexes Limit
+    Order allow,deny
+    Allow from all
+
+    AddHandler fcgid-script .fcgi

+

    # You need +mod_fcgid version >= 2.1 to support arguments "xxx/dispatch.fcgi" in +FCGIWrapper
+    FCGIWrapper "/usr/bin/ruby +/home/sneakymustard/tumble/public/dispatch.fcgi" .fcgi
+
+    RewriteEngine On
+    RewriteRule ^$ index.html [QSA]
+    RewriteRule ^([^.]+)$ $1.html [QSA]
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteRule ^(.*)$ dispatch.fcgi [QSA,L]
+</Directory>
+
+

+ +

+
+

This is for suPHP  ( UNIX )

+

LoadModule fcgid_module modules/mod_fcgid.so
+
+<VirtualHost *:80>
+    ServerName test2.example.com
+    DocumentRoot +/usr/local/apache2/htdocs/test2.example.com/
+    SuexecUserGroup pqf pqf
+</VirtualHost>
+
+<Directory /usr/local/apache2/htdocs/test2.example.com/>
+    AddHandler fcgid-script .php
+    Options ExecCGI
+    allow from all
+    FCGIWrapper +/usr/local/apache2/htdocs/test2.example.com/php .php

+

+

    # You need mod_fcgid version >= 2.1 to +support arguments in FCGIWrapper, if you want
+   # FCGIWrapper "/usr/local/bin/php -c /etc/" .php

+

</Directory>

+

# Please make sure:
+# php is configured with --enable-fastcgi option
+# copy php execution to /usr/local/apache2/htdocs/test2.example.com/ +directory
+# make sure all files in /usr/local/apache2/htdocs/test2.example.com/ +with right owner and group
+# check error_log(with debug level) and suexec_log, if any thing goes +wrong
+


-This is for fastcgi-mode PHP ( Windows )

LoadModule fcgid_module modules/mod_fcgid.so

-<Directory "C:/Apache2/htdocs/php/">
-    SetHandler fcgid-script
-    Options execCGI
-    AllowOverride None
-    Order allow,deny
-    Allow from all
-    FCGIWrapper "c:/php/php.exe" .php
-</Directory>

This works too:

LoadModule fcgid_module modules/mod_fcgid.so 

-AddHandler fcgid-script .php
-<Directory "C:/Apache2/htdocs/php/">
-    FCGIWrapper "c:/php/php.exe" .php
-    Options ExecCGI
-    allow from all
+This is for fastcgi-mode PHP ( Windows ) +

+

LoadModule fcgid_module modules/mod_fcgid.so
+DefaultInitEnv PHPRC "c:/php/"
+DefaultInitEnv PATH +"c:/php;C:/WINDOWS/system32;C:/WINDOWS;C:/WINDOWS/System32/Wbem;"
+DefaultInitEnv SystemRoot "C:/Windows"
+DefaultInitEnv SystemDrive "C:"
+DefaultInitEnv TEMP "C:/WINDOWS/TEMP"
+DefaultInitEnv TMP "C:/WINDOWS/TEMP"
+DefaultInitEnv windir "C:/WINDOWS"
+<Directory "C:/Apache2/htdocs/php/">
+    SetHandler fcgid-script
+    Options execCGI
+    AllowOverride None
+    Order allow,deny
+    Allow from all
+    FCGIWrapper "c:/php/php.exe" .php

+

    # You need mod_fcgid version >= 2.1 to +support arguments in FCGIWrapper, if you want
+   # FCGIWrapper "/usr/local/bin/php -c /etc/" .php
+</Directory>

+

This works too: +

+

LoadModule fcgid_module modules/mod_fcgid.so
+DefaultInitEnv PHPRC "c:/php/"
+DefaultInitEnv PATH +"c:/php;C:/WINDOWS/system32;C:/WINDOWS;C:/WINDOWS/System32/Wbem;"
+DefaultInitEnv SystemRoot "C:/Windows"
+DefaultInitEnv SystemDrive "C:"
+DefaultInitEnv TEMP "C:/WINDOWS/TEMP"
+DefaultInitEnv TMP "C:/WINDOWS/TEMP"
+DefaultInitEnv windir "C:/WINDOWS"
+AddHandler fcgid-script .php
+<Directory "C:/Apache2/htdocs/php/">
+    FCGIWrapper "c:/php/php.exe" .php

+

    # You need mod_fcgid version >= 2.1 to +support arguments in FCGIWrapper, if you want
+   # FCGIWrapper "/usr/local/bin/php -c /etc/" .php
+

+

     +Options ExecCGI
+    allow from all
</Directory>
- +

-

This is for Authenticator

+

This is for Authenticator

LoadModule fcgid_module modules/mod_fcgid.so -

<Location /fcgid>
- SetHandler fcgid-script
- Options ExecCGI
- allow from all
- AuthType Basic
- AuthName ProtectedRealm
- FastCgiAuthenticator /some/path/authenticator
- require valid-user
-</Location>

-

Another configuration: FastCgiAuthenticatorAuthoritative +

<Location /fcgid>
+SetHandler fcgid-script
+Options ExecCGI
+allow from all
+AuthType Basic
+AuthName ProtectedRealm
+FastCgiAuthenticator /some/path/authenticator
+require valid-user
+</Location>
+

+

Another configuration: FastCgiAuthenticatorAuthoritative (default On)

-

Setting the FastCgiAuthenticatorAuthoritative directive -explicitly to Off allows authentication to be passed on to lower level -modules

- +

Setting the FastCgiAuthenticatorAuthoritative +directive explicitly to Off allows authentication to be +passed on to lower level modules

-

This is for Authorizer

- +

This is for Authorizer

LoadModule fcgid_module modules/mod_fcgid.so -

<Location /fcgid>
- SetHandler fcgid-script
- Options ExecCGI
- allow from all
- AuthType Basic
- AuthName ProtectedRealm
- FastCgiAuthorizer /some/place/Authorizer
-</Location>

- -

Another configuration: FastCgiAuthorizerAuthoritative +

+

<Location /fcgid>
+SetHandler fcgid-script
+Options ExecCGI
+allow from all
+AuthType Basic
+AuthName ProtectedRealm
+FastCgiAuthorizer /some/place/Authorizer
+</Location>

+

Another configuration: FastCgiAuthorizerAuthoritative (default On)

- -

Setting the FastCgiAuthorizerAuthoritative directive explicitly -to Off allows authorization to be passed on to lower level modules

- +

Setting the FastCgiAuthorizerAuthoritative directive +explicitly to Off allows authorization to be passed on to +lower level modules

-

This is for AccessChecker

+

This is for AccessChecker

LoadModule fcgid_module modules/mod_fcgid.so -

<Location /fcgid>
- SetHandler fcgid-script
- Options ExecCGI
- allow from all
- FastCgiAccessChecker /some/place/access-checker
-</Location>

-

Another configuration: FastCgiAccessCheckerAuthoritative +

<Location /fcgid>
+SetHandler fcgid-script
+Options ExecCGI
+allow from all
+FastCgiAccessChecker /some/place/access-checker
+</Location>
+

+

Another configuration: FastCgiAccessCheckerAuthoritative (default On)

-

Setting the FastCgiAccessCheckerAuthoritative directive -explicitly to Off allows access checking to be passed on to lower level -modules

+

Setting the FastCgiAccessCheckerAuthoritative +directive explicitly to Off allows access checking to be +passed on to lower level modules

??

??

-

??

??

??

@@ -171,7 +253,5 @@

??

??

??

- - Index: doc.htm =================================================================== RCS file: /cvs/extras/rpms/mod_fcgid/FC-6/doc.htm,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- doc.htm 9 Nov 2006 10:18:38 -0000 1.2 +++ doc.htm 16 Feb 2007 14:59:47 -0000 1.3 @@ -1,113 +1,210 @@ - - + - - -The mod_fcgid Home Page - - - + The mod_fcgid Home Page + - - - - - - - - + + + - - - +

+ + +
- -  - - - - - -
- -Home
-Chinese Info
-Download (source)
-Documentations
- - -Feedback - - -
- -
    -
  • - -

    Here are some examples of configuration

    -
    • -
- -

Configuration for Regular fastcgi -(non-PHP, non-Ruby, non-Python) 

Configuration -for suEXEC fastcgi

Configuration for PHP -(UNIX)

Configuration for suPHP (UNIX)

Configuration -for PHP (Windows)

Configuration -for Authenticator

Configuration -for Authorizer

Configuration -for AccessChecker

  -

-
    -

  • There are +

  + + + + + + +
Home
+ Chinese Info
+ Download (source)
+ Documentations
+ Feedback
+ Support This Project
+ 		+
    +
  • +

    Here are some examples of configuration

    +
    • +
+

Configuration +for Regular fastcgi +(non-PHP, non-Ruby, non-Python) 

+

Configuration +for suEXEC fastcgi

+

Configuration for PHP +(UNIX)
+

+

Configuration for Ruby on +Rails
+

+

Configuration for suPHP +(UNIX)

+

Configuration +for PHP (Windows)

+

Configuration +for Authenticator

+

Configuration +for Authorizer

+

Configuration +for AccessChecker

+

 

+
+
    +
  • +

    There are some other configurations you can set

    -
    • -
-

IdleTimeout n (300 -seconds)

An idle fastcgi application will be terminated after IdleTimeout -seconds.

IdleScanInterval n (120 seconds)

The scan interval for idle -fastcgi applications.

BusyTimeout n (300 seconds)

a fastcgi -application will be terminated if handing a single request longer than busy -timeout.

BusyScanInterval n (120 seconds)

The scan interval for busy -timeout fastcgi applications.

ErrorScanInterval n (3 seconds)

The -scan interval for exit pending fastcgi applications. fastcgi applications will -be terminated within this scanning.

ZombieScanInterval n (3 seconds)

The -scan interval for zombie process. 

ProcessLifeTime n (3600 seconds)

A -fastcgi application will be terminated if lifetime expired, even no error is -detected.

SocketPath path (logs/fcgidsock)

The directory to put the -UNIX domain socket. (UNIX only)

SpawnScoreUpLimit n (10)

The -spawn-speed control score up water limit. Score increases while a process is spawned or terminated, and decreases -as time progresses; while the score is higher than SpawnScoreUpLimit, the spawning will be -held for a while. The higher this number is, the higher speed of the spawning -can be.

SpawnScore n (1)

The weight of spawning.  This weight -will be plused to the spawn-control score on every spawn. The higher this number -is, the lower speed of spawning can be.

TerminationScore n (2)

The -weight of termination. This weight will be plused to the score while fastcgi -process terminates. The higher this number is, the lower speed of spawning can -be.

MaxProcessCount n (1000)

The max count of total fastcgi process -count.

DefaultMaxClassProcessCount n (100)

The maximum number of -fastcgi application instances allowed to run for any one fastcgi application. 

DefaultMinClassProcessCount n -(3)

The minimum number of -fastcgi application instances for any one fastcgi application. 

DefaultInitEnv  -env_name env_value

The default environment variables before a fastcgi + + +

IdleTimeout n (300 +seconds)

+

An idle fastcgi application will be terminated after +IdleTimeout +seconds.

+

IdleScanInterval n (120 seconds)

+

The scan interval for idle +fastcgi applications.

+

BusyTimeout n (300 seconds)

+

a fastcgi +application will be terminated if handing a single request longer than +busy +timeout.

+

BusyScanInterval n (120 seconds)

+

The scan interval for busy +timeout fastcgi applications.

+

ErrorScanInterval n (3 seconds)

+

The +scan interval for exit pending fastcgi applications. fastcgi +applications will +be terminated within this scanning.

+

ZombieScanInterval n (3 seconds)

+

The +scan interval for zombie process. 

+

ProcessLifeTime n (3600 seconds)

+

A +fastcgi application will be terminated if lifetime expired, even no +error is +detected.

+

SocketPath path (logs/fcgidsock)

+

The directory to put the +UNIX domain socket. (UNIX only)
+

+

SharememPath path +(logs/fcgid_shm)
+

+

The share memory file path. (UNIX only) (version >= 2.1 +only)
+

+

SpawnScoreUpLimit n (10)

+

The +spawn-speed control score up water limit. Score increases while a +process is spawned or terminated, and decreases +as time progresses; while the score is higher than SpawnScoreUpLimit, +the spawning will be +held for a while. The higher this number is, the higher speed of the +spawning +can be.

+

SpawnScore n (1)

+

The weight of spawning.  This weight +will be plused to the spawn-control score on every spawn. The higher +this number +is, the lower speed of spawning can be.

+

TerminationScore n (2)

+

The +weight of termination. This weight will be plused to the score while +fastcgi +process terminates. The higher this number is, the lower speed of +spawning can +be.

+

MaxProcessCount n (1000)

+

The max count of total fastcgi process +count.

+

DefaultMaxClassProcessCount n (100)

+

The maximum number of +fastcgi application instances allowed to run for any one fastcgi +application. 

+

DefaultMinClassProcessCount n +(3)

+

The minimum number of +fastcgi application instances for any one fastcgi application. 

+

DefaultInitEnv  +env_name env_value

+

The default environment variables before a fastcgi application is spawned. You can set this configuration more -than once.

IPCConnectTimeout n (3 seconds)

The connect timeout to a -fastcgi application. 

IPCCommTimeout n (20 seconds)

The communication -timeout to a fastcgi application. Please increase this value if your CGI have a -slow initialization or slow respond.

OutputBufferSize n (64k bytes)

CGI -output cache buffer size.

PHP_Fix_Pathinfo_Enable n(n=0/1, default 0)

If +than once.
+

+ + + + + + +
Note: If you get:
+
Can't create TCP/IP +socket (10106) error while running PHP script(on Win32 only), you will have to set +these(Please modify the values if +necessary):
+ DefaultInitEnv PHPRC "c:/php/"
+DefaultInitEnv PATH +"c:/php;C:/WINDOWS/system32;C:/WINDOWS;C:/WINDOWS/System32/Wbem;"
+DefaultInitEnv SystemRoot "C:/Windows"
+DefaultInitEnv SystemDrive "C:"
+DefaultInitEnv TEMP "C:/WINDOWS/TEMP"
+DefaultInitEnv TMP "C:/WINDOWS/TEMP"
+DefaultInitEnv windir "C:/WINDOWS"
+
+(Thank Steffen of apachelounge.com for this note)
+
+
+


+

+

IPCConnectTimeout n (3 seconds)

+

The connect timeout to a +fastcgi application. 

+

IPCCommTimeout n (20 seconds)

+

The communication +timeout to a fastcgi application. Please increase this value if your +CGI have a +slow initialization or slow respond.

+

OutputBufferSize n (64k bytes)

+

CGI +output cache buffer size.

+

PHP_Fix_Pathinfo_Enable n(n=0/1, default 0)

+

If you are using PHP and set cgi.fix_pathinfo=1 in php.ini, set -PHP_Fix_Pathinfo_Enable 1.

MaxRequestsPerProcess n (-1)

(Added in -version 1.11, patch from Robert L Mathews)

Adds a MaxRequestsPerProcess parameter that allows mod_fcgid to -exit after handling a certain number of requests, similar to the existing ProcessLifeTime option. 

This solves a problem with PHP in FastCGI mode. By default, PHP stops -accepting new FastCGI connections after handling 500 requests; unfortunately, there is a potential race condition during the PHP cleanup code in which -PHP can be shutting down but still have the socket open, so mod_fcgid under heavy load can send request number 501 to PHP and have it "accepted", but then -PHP appears to simply exit, causing errors.

If you are using PHP, you should -set it to 500. -1 mean fastcgi process will not exit no matter how many requests +PHP_Fix_Pathinfo_Enable 1.

+

MaxRequestsPerProcess n (-1)

+

(Added in +version 1.11, patch from Robert L Mathews)

+

Adds a MaxRequestsPerProcess parameter that allows mod_fcgid +to +exit after handling a certain number of requests, similar to the +existing ProcessLifeTime option. 

+

This solves a problem with PHP in FastCGI mode. By default, +PHP stops +accepting new FastCGI connections after handling 500 requests; +unfortunately, there is a potential race condition during the PHP +cleanup code in which +PHP can be shutting down but still have the socket open, so mod_fcgid +under heavy load can send request number 501 to PHP and have it +"accepted", but then +PHP appears to simply exit, causing errors.

+

If you are using PHP, you should +set it to 500. -1 mean fastcgi process will not exit no matter how many +requests it has handled.
- -
- - + + Index: fcgid.conf =================================================================== RCS file: /cvs/extras/rpms/mod_fcgid/FC-6/fcgid.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fcgid.conf 6 Sep 2006 13:08:59 -0000 1.1 +++ fcgid.conf 16 Feb 2007 14:59:47 -0000 1.2 @@ -11,5 +11,6 @@ AddHandler fcgid-script fcg fcgi fpl -# Sane place to put sockets +# Sane place to put sockets and shared memory file SocketPath run/mod_fcgid +SharememPath run/fcgid_shm Index: mod_fcgid.spec =================================================================== RCS file: /cvs/extras/rpms/mod_fcgid/FC-6/mod_fcgid.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mod_fcgid.spec 9 Nov 2006 10:18:38 -0000 1.3 +++ mod_fcgid.spec 16 Feb 2007 14:59:47 -0000 1.4 @@ -10,7 +10,7 @@ %endif Name: mod_fcgid -Version: 2.0 +Version: 2.1 Release: 1%{?dist} Summary: Apache2 module for high-performance server-side scripting Group: System Environment/Daemons @@ -20,11 +20,11 @@ Source1: fcgid.conf Source2: fastcgi.te Source3: fastcgi.fc -Source4: README.Fedora +Source4: mod_fcgid-2.1-README.Fedora Source5: http://fastcgi.coremail.cn/doc.htm Source6: http://fastcgi.coremail.cn/configuration.htm -Source7: README.SELinux -Patch0: mod_fcgid.1.09-docurls.patch +Source7: mod_fcgid-2.1-README.SELinux +Patch0: mod_fcgid.2.1-docurls.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: httpd-devel >= 2.0 Requires: httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && %{__cat} %{_includedir}/httpd/.mmn || echo missing) @@ -38,9 +38,9 @@ %if %{selinux_module} %define selinux_policyver %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp) %package selinux -Summary: SELinux policy module supporting FastCGI applications with mod_fcgid -Group: System Environment/Base -BuildRequires: %{selinux_buildreqs} +Summary: SELinux policy module supporting FastCGI applications with mod_fcgid +Group: System Environment/Base +BuildRequires: %{selinux_buildreqs} # selinux-policy is required for directory ownership of %{_datadir}/selinux/* # Modules built against one version of a policy may not work with older policy # versions, as noted on fedora-selinux-list: @@ -48,9 +48,9 @@ # Hence the versioned dependency. The versioning will hopefully be replaced by # an ABI version requirement or something similar in the future %if "%{selinux_policyver}" != "" -Requires: selinux-policy >= %{selinux_policyver} +Requires: selinux-policy >= %{selinux_policyver} %endif -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} Requires(post): /usr/sbin/semodule, /sbin/restorecon Requires(postun): /usr/sbin/semodule, /sbin/restorecon @@ -60,8 +60,13 @@ %prep %setup -q -n mod_fcgid.%{version} -%{__cp} -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE6} %{SOURCE7} . +%{__cp} -p %{SOURCE1} fcgid.conf +%{__cp} -p %{SOURCE2} fastcgi.te +%{__cp} -p %{SOURCE3} fastcgi.fc +%{__cp} -p %{SOURCE4} README.Fedora %{__cp} -p %{SOURCE5} directives.htm +%{__cp} -p %{SOURCE6} configuration.htm +%{__cp} -p %{SOURCE7} README.SELinux %patch0 -p1 %{__sed} -i -e 's/\r$//' directives.htm configuration.htm @@ -71,9 +76,9 @@ %if %{selinux_module} for selinuxvariant in %{selinux_variants} do - %{__make} NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile - %{__mv} fastcgi.pp fastcgi.pp.${selinuxvariant} - %{__make} NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean + %{__make} NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile + %{__mv} fastcgi.pp fastcgi.pp.${selinuxvariant} + %{__make} NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean done %endif @@ -81,20 +86,20 @@ %{__rm} -rf %{buildroot} topdir=$(/usr/bin/dirname $(/usr/sbin/apxs -q exp_installbuilddir)) %{__make} \ - top_dir=${topdir} \ - DESTDIR=%{buildroot} \ - MKINSTALLDIRS="%{__mkdir_p}" \ - install -%{__install} -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/fcgid.conf + top_dir=${topdir} \ + DESTDIR=%{buildroot} \ + MKINSTALLDIRS="%{__mkdir_p}" \ + install +%{__install} -D -m 644 fcgid.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/fcgid.conf %{__install} -d -m 755 %{buildroot}%{_localstatedir}/run/mod_fcgid # Install SELinux policy modules %if %{selinux_module} for selinuxvariant in %{selinux_variants} do - %{__install} -d %{buildroot}%{_datadir}/selinux/${selinuxvariant} - %{__install} -p -m 644 fastcgi.pp.${selinuxvariant} \ - %{buildroot}%{_datadir}/selinux/${selinuxvariant}/fastcgi.pp + %{__install} -d %{buildroot}%{_datadir}/selinux/${selinuxvariant} + %{__install} -p -m 644 fastcgi.pp.${selinuxvariant} \ + %{buildroot}%{_datadir}/selinux/${selinuxvariant}/fastcgi.pp done # Hardlink identical policy module packages together /usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux @@ -129,7 +134,7 @@ %endif %files -%defattr(-,root,root,0755) +%defattr(-,root,root,-) %doc ChangeLog AUTHOR COPYING configuration.htm directives.htm %doc README.Fedora %{_libdir}/httpd/modules/mod_fcgid.so @@ -138,12 +143,19 @@ %if %{selinux_module} %files selinux -%defattr(-,root,root,0755) +%defattr(-,root,root,-) %doc fastcgi.fc fastcgi.te README.SELinux %{_datadir}/selinux/*/fastcgi.pp %endif %changelog +* Fri Feb 16 2007 Paul Howarth 2.1-1 +- Update to 2.1 +- Update documentation and patches +- Rename some source files to reduce chances of conflicting names +- Include SharememPath directive in conf file to avoid unfortunate upstream + default location + * Mon Oct 30 2006 Paul Howarth 2.0-1 - Update to 2.0 - Source is now hosted at sourceforge.net Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_fcgid/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Nov 2006 10:18:38 -0000 1.3 +++ sources 16 Feb 2007 14:59:47 -0000 1.4 @@ -1 +1 @@ -3aa51f1e293e6d881028295a23021dae mod_fcgid.2.0.tar.gz +68a6479e398a20577334f16a8b06c418 mod_fcgid.2.1.tar.gz --- README.Fedora DELETED --- --- README.SELinux DELETED --- --- mod_fcgid.1.09-docurls.patch DELETED --- From fedora-extras-commits at redhat.com Fri Feb 16 15:02:10 2007 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 16 Feb 2007 10:02:10 -0500 Subject: rpms/mod_fcgid/FC-5 mod_fcgid-2.1-README.Fedora, NONE, 1.1 mod_fcgid-2.1-README.SELinux, NONE, 1.1 mod_fcgid.2.1-docurls.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 configuration.htm, 1.2, 1.3 doc.htm, 1.2, 1.3 fcgid.conf, 1.1, 1.2 mod_fcgid.spec, 1.3, 1.4 sources, 1.3, 1.4 README.Fedora, 1.2, NONE README.SELinux, 1.2, NONE mod_fcgid.1.09-docurls.patch, 1.1, NONE Message-ID: <200702161502.l1GF2ATF019363@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/mod_fcgid/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19329 Modified Files: .cvsignore configuration.htm doc.htm fcgid.conf mod_fcgid.spec sources Added Files: mod_fcgid-2.1-README.Fedora mod_fcgid-2.1-README.SELinux mod_fcgid.2.1-docurls.patch Removed Files: README.Fedora README.SELinux mod_fcgid.1.09-docurls.patch Log Message: Update to 2.1 --- NEW FILE mod_fcgid-2.1-README.Fedora --- Using mod_fcgid in Fedora ========================= This mod_fcgid package includes a configuration file /etc/httpd/conf.d/fcgid.conf that ensures that the module is loaded and added as the handler for .fcg, .fcgi, and .fpl applications (provided mod_fastcgi in not already loaded, in which case you will need to decide which module should handle which types of application). So far the module package has only been tested in conjunction with the "moin" wiki application. Further feedback regarding other applications is welcome. Setting up moin with mod_fcgid ============================== Setting up moin with mod_fcgid is very similar to setting it up as a regular CGI application. * Create a directory for your wiki instance: DESTDIR=/var/www/mywiki mkdir -p $DESTDIR/cgi-bin * Copy in the wiki template data and the application itself: cp -a /usr/share/moin/{data,underlay} $DESTDIR cp -a /usr/share/moin/server/moin.fcg $DESTDIR/cgi-bin cp -a /usr/share/moin/config/wikiconfig.py $DESTDIR/cgi-bin * Fix the directory ownership chown -R apache:apache $DESTDIR/{data,underlay} * Edit $DESTDIR/cgi-bin/wikiconfig.py to suit your needs * Create a httpd configuration file for the wiki, e.g. /etc/httpd/conf.d/mywiki.conf # Wiki application data common to all wiki instances Alias /wiki/ "/usr/share/moin/htdocs/" Options Indexes FollowSymLinks AllowOverride None Order allow,deny Allow from all # Wiki instance with mod_fcgid ScriptAlias /mywiki "/var/www/mywiki/cgi-bin/moin.fcg" Options Indexes FollowSymLinks ExecCGI AllowOverride None Order allow,deny Allow from all * If you are using SELinux with Fedora Core 5 or later, install the mod_fcgid-selinux package and see the README.SELinux file in that package for details of the file contexts to use * Restart the web server to load the new configuration: service httpd restart That should do it! --- NEW FILE mod_fcgid-2.1-README.SELinux --- Using mod_fcgid with SELinux in Fedora Core 5 onwards ===================================================== Versions of this package built for Fedora Core 5 or later include an SELinux policy module to support FastCGI applications. This has only been tested so far with moin, so feedback from other applications is welcome. The intention is for this module to be included in the SELinux reference policy eventually. The module source (fastcgi.{fc,te}) is included for reference as documentation in the package. The module introduces a new set of SELinux types for FastCGI applications, comparable with the types described in "man httpd_selinux" for regular CGI scripts (or "system scripts" as they are known in SELinux): * httpd_fastcgi_content_t (equivalent to httpd_sys_content_t) - Set files with httpd_fastcgi_content_t for content that is available from all FastCGI scripts and the daemon. * httpd_fastcgi_script_exec_t (equivalent to httpd_sys_script_exec_t) - Set FastCGI scripts with httpd_fastcgi_script_exec_t to allow them to run with access to all fastcgi types. * httpd_fastcgi_script_ro_t (equivalent to httpd_sys_script_ro_t) - Set files with httpd_fastcgi_script_ro_t if you want httpd_fastcgi_script_exec_t scripts to read the data, and disallow other non-fastcgi scripts from access. * httpd_fastcgi_script_rw_t (equivalent to httpd_sys_script_rw_t) - Set files with httpd_fastcgi_script_rw_t if you want httpd_fastcgi_script_exec_t scripts to read/write the data, and disallow other non-fastcgi scripts from access. * httpd_fastcgi_script_ra_t (equivalent to httpd_sys_script_ra_t) - Set files with httpd_fastcgi_script_ra_t if you want httpd_fastcgi_script_exec_t scripts to read/append to the file, and disallow other non-fastcgi scripts from access. So for the moin wiki layout described in README.Fedora of the main mod_fcgid package, the contexts would be set as follows: cd /var/www/mywiki chcon -t httpd_fastcgi_content_t . chcon -R -t httpd_fastcgi_script_exec_t cgi-bin chcon -R -t httpd_fastcgi_script_rw_t data underlay It is necessary to turn on the httpd_enable_cgi boolean to run either regular or FastCGI scripts: setsebool -P httpd_enable_cgi 1 If the httpd_unified boolean is set, "sys" and "fastcgi" scripts can access each other's data. This means that you only need to set the actual FastCGI scripts themselves to httpd_fastcgi_script_exec_t and can leave the file contexts for everything else set to the "sys" types if you prefer. This is useful if you have a mixture of CGI and FastCGI applications accessing the same data. If you have any questions or issues regarding FastCGI and SELinux, please don't hesitate to bring them up on fedora-selinux-list. mod_fcgid.2.1-docurls.patch: --- NEW FILE mod_fcgid.2.1-docurls.patch --- --- mod_fcgid.2.1/directives.htm 2007-02-16 03:40:23.000000000 +0000 +++ mod_fcgid.2.1/directives.htm 2007-02-16 10:45:44.000000000 +0000 @@ -14,10 +14,10 @@ Home
- Chinese Info
- Download (source)
- Documentations
- Feedback
+ Chinese Info
+ Download (source)
+ Documentations
+ Feedback
- - - - -The mod_fcgid Home Page + + + + The mod_fcgid Home Page - - -

This is a for regular fastcgi. 

LoadModule fcgid_module -modules/mod_fcgid.so

-<Location /fcgid>
-    SetHandler fcgid-script
-    Options ExecCGI
-    allow from all
-</Location>

-  -

-

This is for suEXEC. Please get more information about suEXEC here. 

LoadModule fcgid_module -modules/mod_fcgid.so

-<Location /fcgid>
-    SetHandler fcgid-script
-    Options ExecCGI
-    allow from all
-</Location>

-<VirtualHost 192.168.1.89>
-    ServerAdmin webmaster at host.foo.com
-    DocumentRoot /usr/local/apache2/htdocs/
-    ServerName host.foo.com
-    SuexecUserGroup pqf pqf
-</VirtualHost>

-?? -

-

This is for fastcgi-mode PHP (UNIX)

LoadModule fcgid_module modules/mod_fcgid.so

-<Directory /usr/local/apache2/htdocs/php>
-    SetHandler fcgid-script
-    FCGIWrapper /usr/local/bin/php .php
-    Options ExecCGI
-    allow from all
-</Directory>

This works too:

LoadModule fcgid_module -modules/mod_fcgid.so 

-AddHandler fcgid-script .php
-<Directory /usr/local/apache2/htdocs/php>
-    FCGIWrapper /usr/local/bin/php .php
-    Options ExecCGI
-    allow from all
-</Directory>

# Please make sure:
-# php is configured with --enable-fastcgi option
-# check error_log(with debug level), if -any thing goes wrong -

-

This is for suPHP  ( UNIX ) -

LoadModule fcgid_module modules/mod_fcgid.so
-
-<VirtualHost *:80>
-    ServerName test2.example.com
-    DocumentRoot /usr/local/apache2/htdocs/test2.example.com/
-    SuexecUserGroup pqf pqf
-</VirtualHost>
-
-<Directory /usr/local/apache2/htdocs/test2.example.com/>
-    AddHandler fcgid-script .php
-    Options ExecCGI
-    allow from all
-    FCGIWrapper /usr/local/apache2/htdocs/test2.example.com/php .php
-</Directory>

-

- -# Please make sure:
-# php is configured with --enable-fastcgi option
-# copy php execution to /usr/local/apache2/htdocs/test2.example.com/ directory
-# make sure all files in /usr/local/apache2/htdocs/test2.example.com/ with right -owner and group
-# check error_log(with debug level) and suexec_log, if -any thing goes wrong +

This is a for regular fastcgi. 

+

LoadModule fcgid_module modules/mod_fcgid.so

+

<Location /fcgid>
+    SetHandler fcgid-script
+    Options ExecCGI
+    allow from all
+</Location>

+

  +

+
+

This is for suEXEC. Please get more +information about suEXEC here. 

+

LoadModule fcgid_module modules/mod_fcgid.so

+

<Location /fcgid>
+    SetHandler fcgid-script
+    Options ExecCGI
+    allow from all
+</Location>

+

<VirtualHost 192.168.1.89>
+    ServerAdmin webmaster at host.foo.com
+    DocumentRoot /usr/local/apache2/htdocs/
+    ServerName host.foo.com
+    SuexecUserGroup pqf pqf
+</VirtualHost>

+

?? +

+
+

This is for fastcgi-mode PHP (UNIX)

+

LoadModule fcgid_module modules/mod_fcgid.so

+

<Directory /usr/local/apache2/htdocs/php>
+    SetHandler fcgid-script
+    FCGIWrapper /usr/local/bin/php .php +

+

   # You need mod_fcgid +version >= 2.1 to support arguments in FCGIWrapper, if you want
+   # FCGIWrapper "/usr/local/bin/php -c /etc/" .php

+    Options ExecCGI
+

    allow from all
+</Directory>

+

This works too:

+

LoadModule fcgid_module modules/mod_fcgid.so 

+

AddHandler fcgid-script .php
+<Directory /usr/local/apache2/htdocs/php>
+    FCGIWrapper /usr/local/bin/php .php

+

    # You need mod_fcgid version >= 2.1 to +support arguments in FCGIWrapper, if you want
+   # FCGIWrapper "/usr/local/bin/php -c /etc/" .php

+

    Options ExecCGI
+    allow from all
+</Directory>

+

# Please make sure:
+# php is configured with --enable-fastcgi option
+# check error_log(with debug level), if any thing goes wrong

+

+
+

This is for fastcgi-mode Ruby on Rails ( Thank Andre Nathan giving +me this demo configuration )
+
+LoadModule fcgid_module modules/mod_fcgid.so
+SocketPath /tmp/fcgidsock
+SharememPath /tmp/fcgidshm
+DefaultInitEnv RAILS_ENV production

- +<Directory /home/sneakymustard/tumble/public>
+    Options ExecCGI FollowSymLinks
+    AllowOverride AuthConfig Indexes Limit
+    Order allow,deny
+    Allow from all
+
+    AddHandler fcgid-script .fcgi

+

    # You need +mod_fcgid version >= 2.1 to support arguments "xxx/dispatch.fcgi" in +FCGIWrapper
+    FCGIWrapper "/usr/bin/ruby +/home/sneakymustard/tumble/public/dispatch.fcgi" .fcgi
+
+    RewriteEngine On
+    RewriteRule ^$ index.html [QSA]
+    RewriteRule ^([^.]+)$ $1.html [QSA]
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteRule ^(.*)$ dispatch.fcgi [QSA,L]
+</Directory>
+
+

+ +

+
+

This is for suPHP  ( UNIX )

+

LoadModule fcgid_module modules/mod_fcgid.so
+
+<VirtualHost *:80>
+    ServerName test2.example.com
+    DocumentRoot +/usr/local/apache2/htdocs/test2.example.com/
+    SuexecUserGroup pqf pqf
+</VirtualHost>
+
+<Directory /usr/local/apache2/htdocs/test2.example.com/>
+    AddHandler fcgid-script .php
+    Options ExecCGI
+    allow from all
+    FCGIWrapper +/usr/local/apache2/htdocs/test2.example.com/php .php

+

+

    # You need mod_fcgid version >= 2.1 to +support arguments in FCGIWrapper, if you want
+   # FCGIWrapper "/usr/local/bin/php -c /etc/" .php

+

</Directory>

+

# Please make sure:
+# php is configured with --enable-fastcgi option
+# copy php execution to /usr/local/apache2/htdocs/test2.example.com/ +directory
+# make sure all files in /usr/local/apache2/htdocs/test2.example.com/ +with right owner and group
+# check error_log(with debug level) and suexec_log, if any thing goes +wrong
+


-This is for fastcgi-mode PHP ( Windows )

LoadModule fcgid_module modules/mod_fcgid.so

-<Directory "C:/Apache2/htdocs/php/">
-    SetHandler fcgid-script
-    Options execCGI
-    AllowOverride None
-    Order allow,deny
-    Allow from all
-    FCGIWrapper "c:/php/php.exe" .php
-</Directory>

This works too:

LoadModule fcgid_module modules/mod_fcgid.so 

-AddHandler fcgid-script .php
-<Directory "C:/Apache2/htdocs/php/">
-    FCGIWrapper "c:/php/php.exe" .php
-    Options ExecCGI
-    allow from all
+This is for fastcgi-mode PHP ( Windows ) +

+

LoadModule fcgid_module modules/mod_fcgid.so
+DefaultInitEnv PHPRC "c:/php/"
+DefaultInitEnv PATH +"c:/php;C:/WINDOWS/system32;C:/WINDOWS;C:/WINDOWS/System32/Wbem;"
+DefaultInitEnv SystemRoot "C:/Windows"
+DefaultInitEnv SystemDrive "C:"
+DefaultInitEnv TEMP "C:/WINDOWS/TEMP"
+DefaultInitEnv TMP "C:/WINDOWS/TEMP"
+DefaultInitEnv windir "C:/WINDOWS"
+<Directory "C:/Apache2/htdocs/php/">
+    SetHandler fcgid-script
+    Options execCGI
+    AllowOverride None
+    Order allow,deny
+    Allow from all
+    FCGIWrapper "c:/php/php.exe" .php

+

    # You need mod_fcgid version >= 2.1 to +support arguments in FCGIWrapper, if you want
+   # FCGIWrapper "/usr/local/bin/php -c /etc/" .php
+</Directory>

+

This works too: +

+

LoadModule fcgid_module modules/mod_fcgid.so
+DefaultInitEnv PHPRC "c:/php/"
+DefaultInitEnv PATH +"c:/php;C:/WINDOWS/system32;C:/WINDOWS;C:/WINDOWS/System32/Wbem;"
+DefaultInitEnv SystemRoot "C:/Windows"
+DefaultInitEnv SystemDrive "C:"
+DefaultInitEnv TEMP "C:/WINDOWS/TEMP"
+DefaultInitEnv TMP "C:/WINDOWS/TEMP"
+DefaultInitEnv windir "C:/WINDOWS"
+AddHandler fcgid-script .php
+<Directory "C:/Apache2/htdocs/php/">
+    FCGIWrapper "c:/php/php.exe" .php

+

    # You need mod_fcgid version >= 2.1 to +support arguments in FCGIWrapper, if you want
+   # FCGIWrapper "/usr/local/bin/php -c /etc/" .php
+

+

     +Options ExecCGI
+    allow from all
</Directory>
- +

-

This is for Authenticator

+

This is for Authenticator

LoadModule fcgid_module modules/mod_fcgid.so -

<Location /fcgid>
- SetHandler fcgid-script
- Options ExecCGI
- allow from all
- AuthType Basic
- AuthName ProtectedRealm
- FastCgiAuthenticator /some/path/authenticator
- require valid-user
-</Location>

-

Another configuration: FastCgiAuthenticatorAuthoritative +

<Location /fcgid>
+SetHandler fcgid-script
+Options ExecCGI
+allow from all
+AuthType Basic
+AuthName ProtectedRealm
+FastCgiAuthenticator /some/path/authenticator
+require valid-user
+</Location>
+

+

Another configuration: FastCgiAuthenticatorAuthoritative (default On)

-

Setting the FastCgiAuthenticatorAuthoritative directive -explicitly to Off allows authentication to be passed on to lower level -modules

- +

Setting the FastCgiAuthenticatorAuthoritative +directive explicitly to Off allows authentication to be +passed on to lower level modules

-

This is for Authorizer

- +

This is for Authorizer

LoadModule fcgid_module modules/mod_fcgid.so -

<Location /fcgid>
- SetHandler fcgid-script
- Options ExecCGI
- allow from all
- AuthType Basic
- AuthName ProtectedRealm
- FastCgiAuthorizer /some/place/Authorizer
-</Location>

- -

Another configuration: FastCgiAuthorizerAuthoritative +

+

<Location /fcgid>
+SetHandler fcgid-script
+Options ExecCGI
+allow from all
+AuthType Basic
+AuthName ProtectedRealm
+FastCgiAuthorizer /some/place/Authorizer
+</Location>

+

Another configuration: FastCgiAuthorizerAuthoritative (default On)

- -

Setting the FastCgiAuthorizerAuthoritative directive explicitly -to Off allows authorization to be passed on to lower level modules

- +

Setting the FastCgiAuthorizerAuthoritative directive +explicitly to Off allows authorization to be passed on to +lower level modules

-

This is for AccessChecker

+

This is for AccessChecker

LoadModule fcgid_module modules/mod_fcgid.so -

<Location /fcgid>
- SetHandler fcgid-script
- Options ExecCGI
- allow from all
- FastCgiAccessChecker /some/place/access-checker
-</Location>

-

Another configuration: FastCgiAccessCheckerAuthoritative +

<Location /fcgid>
+SetHandler fcgid-script
+Options ExecCGI
+allow from all
+FastCgiAccessChecker /some/place/access-checker
+</Location>
+

+

Another configuration: FastCgiAccessCheckerAuthoritative (default On)

-

Setting the FastCgiAccessCheckerAuthoritative directive -explicitly to Off allows access checking to be passed on to lower level -modules

+

Setting the FastCgiAccessCheckerAuthoritative +directive explicitly to Off allows access checking to be +passed on to lower level modules

??

??

-

??

??

??

@@ -171,7 +253,5 @@

??

??

??

- - Index: doc.htm =================================================================== RCS file: /cvs/extras/rpms/mod_fcgid/FC-5/doc.htm,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- doc.htm 9 Nov 2006 10:21:07 -0000 1.2 +++ doc.htm 16 Feb 2007 15:01:37 -0000 1.3 @@ -1,113 +1,210 @@ - - + - - -The mod_fcgid Home Page - - - + The mod_fcgid Home Page + - - - - - - - - + + + - - - +

+ + +
- -  - - - - - -
- -Home
-Chinese Info
-Download (source)
-Documentations
- - -Feedback - - -
- -
    -
  • - -

    Here are some examples of configuration

    -
    • -
- -

Configuration for Regular fastcgi -(non-PHP, non-Ruby, non-Python) 

Configuration -for suEXEC fastcgi

Configuration for PHP -(UNIX)

Configuration for suPHP (UNIX)

Configuration -for PHP (Windows)

Configuration -for Authenticator

Configuration -for Authorizer

Configuration -for AccessChecker

  -

-
    -

  • There are +

  + + + + + + +
Home
+ Chinese Info
+ Download (source)
+ Documentations
+ Feedback
+ Support This Project
+ 		+
    +
  • +

    Here are some examples of configuration

    +
    • +
+

Configuration +for Regular fastcgi +(non-PHP, non-Ruby, non-Python) 

+

Configuration +for suEXEC fastcgi

+

Configuration for PHP +(UNIX)
+

+

Configuration for Ruby on +Rails
+

+

Configuration for suPHP +(UNIX)

+

Configuration +for PHP (Windows)

+

Configuration +for Authenticator

+

Configuration +for Authorizer

+

Configuration +for AccessChecker

+

 

+
+
    +
  • +

    There are some other configurations you can set

    -
    • -
-

IdleTimeout n (300 -seconds)

An idle fastcgi application will be terminated after IdleTimeout -seconds.

IdleScanInterval n (120 seconds)

The scan interval for idle -fastcgi applications.

BusyTimeout n (300 seconds)

a fastcgi -application will be terminated if handing a single request longer than busy -timeout.

BusyScanInterval n (120 seconds)

The scan interval for busy -timeout fastcgi applications.

ErrorScanInterval n (3 seconds)

The -scan interval for exit pending fastcgi applications. fastcgi applications will -be terminated within this scanning.

ZombieScanInterval n (3 seconds)

The -scan interval for zombie process. 

ProcessLifeTime n (3600 seconds)

A -fastcgi application will be terminated if lifetime expired, even no error is -detected.

SocketPath path (logs/fcgidsock)

The directory to put the -UNIX domain socket. (UNIX only)

SpawnScoreUpLimit n (10)

The -spawn-speed control score up water limit. Score increases while a process is spawned or terminated, and decreases -as time progresses; while the score is higher than SpawnScoreUpLimit, the spawning will be -held for a while. The higher this number is, the higher speed of the spawning -can be.

SpawnScore n (1)

The weight of spawning.  This weight -will be plused to the spawn-control score on every spawn. The higher this number -is, the lower speed of spawning can be.

TerminationScore n (2)

The -weight of termination. This weight will be plused to the score while fastcgi -process terminates. The higher this number is, the lower speed of spawning can -be.

MaxProcessCount n (1000)

The max count of total fastcgi process -count.

DefaultMaxClassProcessCount n (100)

The maximum number of -fastcgi application instances allowed to run for any one fastcgi application. 

DefaultMinClassProcessCount n -(3)

The minimum number of -fastcgi application instances for any one fastcgi application. 

DefaultInitEnv  -env_name env_value

The default environment variables before a fastcgi + + +

IdleTimeout n (300 +seconds)

+

An idle fastcgi application will be terminated after +IdleTimeout +seconds.

+

IdleScanInterval n (120 seconds)

+

The scan interval for idle +fastcgi applications.

+

BusyTimeout n (300 seconds)

+

a fastcgi +application will be terminated if handing a single request longer than +busy +timeout.

+

BusyScanInterval n (120 seconds)

+

The scan interval for busy +timeout fastcgi applications.

+

ErrorScanInterval n (3 seconds)

+

The +scan interval for exit pending fastcgi applications. fastcgi +applications will +be terminated within this scanning.

+

ZombieScanInterval n (3 seconds)

+

The +scan interval for zombie process. 

+

ProcessLifeTime n (3600 seconds)

+

A +fastcgi application will be terminated if lifetime expired, even no +error is +detected.

+

SocketPath path (logs/fcgidsock)

+

The directory to put the +UNIX domain socket. (UNIX only)
+

+

SharememPath path +(logs/fcgid_shm)
+

+

The share memory file path. (UNIX only) (version >= 2.1 +only)
+

+

SpawnScoreUpLimit n (10)

+

The +spawn-speed control score up water limit. Score increases while a +process is spawned or terminated, and decreases +as time progresses; while the score is higher than SpawnScoreUpLimit, +the spawning will be +held for a while. The higher this number is, the higher speed of the +spawning +can be.

+

SpawnScore n (1)

+

The weight of spawning.  This weight +will be plused to the spawn-control score on every spawn. The higher +this number +is, the lower speed of spawning can be.

+

TerminationScore n (2)

+

The +weight of termination. This weight will be plused to the score while +fastcgi +process terminates. The higher this number is, the lower speed of +spawning can +be.

+

MaxProcessCount n (1000)

+

The max count of total fastcgi process +count.

+

DefaultMaxClassProcessCount n (100)

+

The maximum number of +fastcgi application instances allowed to run for any one fastcgi +application. 

+

DefaultMinClassProcessCount n +(3)

+

The minimum number of +fastcgi application instances for any one fastcgi application. 

+

DefaultInitEnv  +env_name env_value

+

The default environment variables before a fastcgi application is spawned. You can set this configuration more -than once.

IPCConnectTimeout n (3 seconds)

The connect timeout to a -fastcgi application. 

IPCCommTimeout n (20 seconds)

The communication -timeout to a fastcgi application. Please increase this value if your CGI have a -slow initialization or slow respond.

OutputBufferSize n (64k bytes)

CGI -output cache buffer size.

PHP_Fix_Pathinfo_Enable n(n=0/1, default 0)

If +than once.
+

+ + + + + + +
Note: If you get:
+
Can't create TCP/IP +socket (10106) error while running PHP script(on Win32 only), you will have to set +these(Please modify the values if +necessary):
+ DefaultInitEnv PHPRC "c:/php/"
+DefaultInitEnv PATH +"c:/php;C:/WINDOWS/system32;C:/WINDOWS;C:/WINDOWS/System32/Wbem;"
+DefaultInitEnv SystemRoot "C:/Windows"
+DefaultInitEnv SystemDrive "C:"
+DefaultInitEnv TEMP "C:/WINDOWS/TEMP"
+DefaultInitEnv TMP "C:/WINDOWS/TEMP"
+DefaultInitEnv windir "C:/WINDOWS"
+
+(Thank Steffen of apachelounge.com for this note)
+
+
+


+

+

IPCConnectTimeout n (3 seconds)

+

The connect timeout to a +fastcgi application. 

+

IPCCommTimeout n (20 seconds)

+

The communication +timeout to a fastcgi application. Please increase this value if your +CGI have a +slow initialization or slow respond.

+

OutputBufferSize n (64k bytes)

+

CGI +output cache buffer size.

+

PHP_Fix_Pathinfo_Enable n(n=0/1, default 0)

+

If you are using PHP and set cgi.fix_pathinfo=1 in php.ini, set -PHP_Fix_Pathinfo_Enable 1.

MaxRequestsPerProcess n (-1)

(Added in -version 1.11, patch from Robert L Mathews)

Adds a MaxRequestsPerProcess parameter that allows mod_fcgid to -exit after handling a certain number of requests, similar to the existing ProcessLifeTime option. 

This solves a problem with PHP in FastCGI mode. By default, PHP stops -accepting new FastCGI connections after handling 500 requests; unfortunately, there is a potential race condition during the PHP cleanup code in which -PHP can be shutting down but still have the socket open, so mod_fcgid under heavy load can send request number 501 to PHP and have it "accepted", but then -PHP appears to simply exit, causing errors.

If you are using PHP, you should -set it to 500. -1 mean fastcgi process will not exit no matter how many requests +PHP_Fix_Pathinfo_Enable 1.

+

MaxRequestsPerProcess n (-1)

+

(Added in +version 1.11, patch from Robert L Mathews)

+

Adds a MaxRequestsPerProcess parameter that allows mod_fcgid +to +exit after handling a certain number of requests, similar to the +existing ProcessLifeTime option. 

+

This solves a problem with PHP in FastCGI mode. By default, +PHP stops +accepting new FastCGI connections after handling 500 requests; +unfortunately, there is a potential race condition during the PHP +cleanup code in which +PHP can be shutting down but still have the socket open, so mod_fcgid +under heavy load can send request number 501 to PHP and have it +"accepted", but then +PHP appears to simply exit, causing errors.

+

If you are using PHP, you should +set it to 500. -1 mean fastcgi process will not exit no matter how many +requests it has handled.
- -
- - + + Index: fcgid.conf =================================================================== RCS file: /cvs/extras/rpms/mod_fcgid/FC-5/fcgid.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fcgid.conf 6 Sep 2006 13:08:59 -0000 1.1 +++ fcgid.conf 16 Feb 2007 15:01:37 -0000 1.2 @@ -11,5 +11,6 @@ AddHandler fcgid-script fcg fcgi fpl -# Sane place to put sockets +# Sane place to put sockets and shared memory file SocketPath run/mod_fcgid +SharememPath run/fcgid_shm Index: mod_fcgid.spec =================================================================== RCS file: /cvs/extras/rpms/mod_fcgid/FC-5/mod_fcgid.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mod_fcgid.spec 9 Nov 2006 10:21:07 -0000 1.3 +++ mod_fcgid.spec 16 Feb 2007 15:01:37 -0000 1.4 @@ -10,7 +10,7 @@ %endif Name: mod_fcgid -Version: 2.0 +Version: 2.1 Release: 1%{?dist} Summary: Apache2 module for high-performance server-side scripting Group: System Environment/Daemons @@ -20,11 +20,11 @@ Source1: fcgid.conf Source2: fastcgi.te Source3: fastcgi.fc -Source4: README.Fedora +Source4: mod_fcgid-2.1-README.Fedora Source5: http://fastcgi.coremail.cn/doc.htm Source6: http://fastcgi.coremail.cn/configuration.htm -Source7: README.SELinux -Patch0: mod_fcgid.1.09-docurls.patch +Source7: mod_fcgid-2.1-README.SELinux +Patch0: mod_fcgid.2.1-docurls.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: httpd-devel >= 2.0 Requires: httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && %{__cat} %{_includedir}/httpd/.mmn || echo missing) @@ -38,9 +38,9 @@ %if %{selinux_module} %define selinux_policyver %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp) %package selinux -Summary: SELinux policy module supporting FastCGI applications with mod_fcgid -Group: System Environment/Base -BuildRequires: %{selinux_buildreqs} +Summary: SELinux policy module supporting FastCGI applications with mod_fcgid +Group: System Environment/Base +BuildRequires: %{selinux_buildreqs} # selinux-policy is required for directory ownership of %{_datadir}/selinux/* # Modules built against one version of a policy may not work with older policy # versions, as noted on fedora-selinux-list: @@ -48,9 +48,9 @@ # Hence the versioned dependency. The versioning will hopefully be replaced by # an ABI version requirement or something similar in the future %if "%{selinux_policyver}" != "" -Requires: selinux-policy >= %{selinux_policyver} +Requires: selinux-policy >= %{selinux_policyver} %endif -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} Requires(post): /usr/sbin/semodule, /sbin/restorecon Requires(postun): /usr/sbin/semodule, /sbin/restorecon @@ -60,8 +60,13 @@ %prep %setup -q -n mod_fcgid.%{version} -%{__cp} -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE6} %{SOURCE7} . +%{__cp} -p %{SOURCE1} fcgid.conf +%{__cp} -p %{SOURCE2} fastcgi.te +%{__cp} -p %{SOURCE3} fastcgi.fc +%{__cp} -p %{SOURCE4} README.Fedora %{__cp} -p %{SOURCE5} directives.htm +%{__cp} -p %{SOURCE6} configuration.htm +%{__cp} -p %{SOURCE7} README.SELinux %patch0 -p1 %{__sed} -i -e 's/\r$//' directives.htm configuration.htm @@ -71,9 +76,9 @@ %if %{selinux_module} for selinuxvariant in %{selinux_variants} do - %{__make} NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile - %{__mv} fastcgi.pp fastcgi.pp.${selinuxvariant} - %{__make} NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean + %{__make} NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile + %{__mv} fastcgi.pp fastcgi.pp.${selinuxvariant} + %{__make} NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean done %endif @@ -81,20 +86,20 @@ %{__rm} -rf %{buildroot} topdir=$(/usr/bin/dirname $(/usr/sbin/apxs -q exp_installbuilddir)) %{__make} \ - top_dir=${topdir} \ - DESTDIR=%{buildroot} \ - MKINSTALLDIRS="%{__mkdir_p}" \ - install -%{__install} -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/fcgid.conf + top_dir=${topdir} \ + DESTDIR=%{buildroot} \ + MKINSTALLDIRS="%{__mkdir_p}" \ + install +%{__install} -D -m 644 fcgid.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/fcgid.conf %{__install} -d -m 755 %{buildroot}%{_localstatedir}/run/mod_fcgid # Install SELinux policy modules %if %{selinux_module} for selinuxvariant in %{selinux_variants} do - %{__install} -d %{buildroot}%{_datadir}/selinux/${selinuxvariant} - %{__install} -p -m 644 fastcgi.pp.${selinuxvariant} \ - %{buildroot}%{_datadir}/selinux/${selinuxvariant}/fastcgi.pp + %{__install} -d %{buildroot}%{_datadir}/selinux/${selinuxvariant} + %{__install} -p -m 644 fastcgi.pp.${selinuxvariant} \ + %{buildroot}%{_datadir}/selinux/${selinuxvariant}/fastcgi.pp done # Hardlink identical policy module packages together /usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux @@ -129,7 +134,7 @@ %endif %files -%defattr(-,root,root,0755) +%defattr(-,root,root,-) %doc ChangeLog AUTHOR COPYING configuration.htm directives.htm %doc README.Fedora %{_libdir}/httpd/modules/mod_fcgid.so @@ -138,12 +143,19 @@ %if %{selinux_module} %files selinux -%defattr(-,root,root,0755) +%defattr(-,root,root,-) %doc fastcgi.fc fastcgi.te README.SELinux %{_datadir}/selinux/*/fastcgi.pp %endif %changelog +* Fri Feb 16 2007 Paul Howarth 2.1-1 +- Update to 2.1 +- Update documentation and patches +- Rename some source files to reduce chances of conflicting names +- Include SharememPath directive in conf file to avoid unfortunate upstream + default location + * Mon Oct 30 2006 Paul Howarth 2.0-1 - Update to 2.0 - Source is now hosted at sourceforge.net Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_fcgid/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Nov 2006 10:21:07 -0000 1.3 +++ sources 16 Feb 2007 15:01:37 -0000 1.4 @@ -1 +1 @@ -3aa51f1e293e6d881028295a23021dae mod_fcgid.2.0.tar.gz +68a6479e398a20577334f16a8b06c418 mod_fcgid.2.1.tar.gz --- README.Fedora DELETED --- --- README.SELinux DELETED --- --- mod_fcgid.1.09-docurls.patch DELETED --- From fedora-extras-commits at redhat.com Fri Feb 16 16:49:57 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 16 Feb 2007 11:49:57 -0500 Subject: rpms/jd/devel .cvsignore, 1.70, 1.71 jd.spec, 1.81, 1.82 sources, 1.70, 1.71 Message-ID: <200702161649.l1GGnvad024101@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24078 Modified Files: .cvsignore jd.spec sources Log Message: * Thu Feb 16 2007 Mamoru Tasaka - 1.8.5-2.cvs070216 - cvs 070216 (23:45 JST) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- .cvsignore 15 Feb 2007 18:19:25 -0000 1.70 +++ .cvsignore 16 Feb 2007 16:49:25 -0000 1.71 @@ -1 +1 @@ -jd-1.8.5-cvs070215.tgz +jd-1.8.5-cvs070216.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- jd.spec 15 Feb 2007 18:19:25 -0000 1.81 +++ jd.spec 16 Feb 2007 16:49:25 -0000 1.82 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 1.8.5 -%define strtag cvs070215 +%define strtag cvs070216 %define repoid 23816 @@ -106,8 +106,8 @@ %{icondir}/%{name}.png %changelog -* Thu Feb 15 2007 Mamoru Tasaka - 1.8.5-2.cvs070215 -- cvs 070215 (24:00 JST) +* Thu Feb 16 2007 Mamoru Tasaka - 1.8.5-2.cvs070216 +- cvs 070216 (23:45 JST) * Fri Feb 2 2007 Mamoru Tasaka - 1.8.5-1 - 1.8.5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- sources 15 Feb 2007 18:19:25 -0000 1.70 +++ sources 16 Feb 2007 16:49:25 -0000 1.71 @@ -1 +1 @@ -b8543ab126b4d78b53b49f6668d75bf7 jd-1.8.5-cvs070215.tgz +ed7f7355088e7a4f744a6ea7e1f4608d jd-1.8.5-cvs070216.tgz From fedora-extras-commits at redhat.com Fri Feb 16 17:08:28 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Fri, 16 Feb 2007 12:08:28 -0500 Subject: rpms/mosml - New directory Message-ID: <200702161708.l1GH8S3w027845@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/mosml In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27840/mosml Log Message: Directory /cvs/extras/rpms/mosml added to the repository From fedora-extras-commits at redhat.com Fri Feb 16 17:08:36 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Fri, 16 Feb 2007 12:08:36 -0500 Subject: rpms/mosml/devel - New directory Message-ID: <200702161708.l1GH8aJq027865@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/mosml/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27840/mosml/devel Log Message: Directory /cvs/extras/rpms/mosml/devel added to the repository From fedora-extras-commits at redhat.com Fri Feb 16 18:59:16 2007 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 16 Feb 2007 13:59:16 -0500 Subject: rpms/environment-modules/devel .cvsignore, 1.6, 1.7 environment-modules.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <200702161859.l1GIxGFc000310@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/environment-modules/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32684 Modified Files: .cvsignore environment-modules.spec sources Log Message: Update to 3.2.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/environment-modules/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 9 Feb 2007 18:26:20 -0000 1.6 +++ .cvsignore 16 Feb 2007 18:58:44 -0000 1.7 @@ -1 +1 @@ -modules-3.2.4.tar.bz2 +modules-3.2.5.tar.bz2 Index: environment-modules.spec =================================================================== RCS file: /cvs/extras/rpms/environment-modules/devel/environment-modules.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- environment-modules.spec 14 Feb 2007 16:35:45 -0000 1.8 +++ environment-modules.spec 16 Feb 2007 18:58:44 -0000 1.9 @@ -1,6 +1,6 @@ Name: environment-modules -Version: 3.2.4 -Release: 2%{?dist} +Version: 3.2.5 +Release: 1%{?dist} Summary: Provides dynamic modification of a user's environment Group: System Environment/Base @@ -67,6 +67,9 @@ %changelog +* Fri Feb 16 2007 - Orion Poplawski - 3.2.5-1 +- Update to 3.2.5 + * Wed Feb 14 2007 - Orion Poplawski - 3.2.4-2 - Rebuild for Tcl downgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/environment-modules/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 9 Feb 2007 18:26:20 -0000 1.6 +++ sources 16 Feb 2007 18:58:44 -0000 1.7 @@ -1 +1 @@ -16e20976195f688380d83bce3c6e6783 modules-3.2.4.tar.bz2 +4eff5018b9c870af44940e81ccb11813 modules-3.2.5.tar.bz2 From fedora-extras-commits at redhat.com Fri Feb 16 19:16:13 2007 From: fedora-extras-commits at redhat.com (John Clark Williams (jcwillia)) Date: Fri, 16 Feb 2007 14:16:13 -0500 Subject: mock ChangeLog, 1.8.2.6, 1.8.2.7 mock.py, 1.53.2.9, 1.53.2.10 mock.spec, 1.16.2.17, 1.16.2.18 Message-ID: <200702161916.l1GJGDwP003995@cvs-int.fedora.redhat.com> Author: jcwillia Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3972 Modified Files: Tag: mock-0-6-branch ChangeLog mock.py mock.spec Log Message: added safety symlink for yum breakage in rawhide Index: ChangeLog =================================================================== RCS file: /cvs/fedora/mock/ChangeLog,v retrieving revision 1.8.2.6 retrieving revision 1.8.2.7 diff -u -r1.8.2.6 -r1.8.2.7 --- ChangeLog 7 Feb 2007 15:40:31 -0000 1.8.2.6 +++ ChangeLog 16 Feb 2007 19:16:11 -0000 1.8.2.7 @@ -1,6 +1,12 @@ +2007-02-16 Clark Williams + + * mock.py + Added safety symlink to handle possible yum breakage in rawhide + 2007-02-07 Clark Williams - * Added error() calls to print command output on failed commands + * mock.py + Added error() calls to print command output on failed commands 2007-02-06 Clark Williams Index: mock.py =================================================================== RCS file: /cvs/fedora/mock/mock.py,v retrieving revision 1.53.2.9 retrieving revision 1.53.2.10 diff -u -r1.53.2.9 -r1.53.2.10 --- mock.py 7 Feb 2007 15:40:31 -0000 1.53.2.9 +++ mock.py 16 Feb 2007 19:16:11 -0000 1.53.2.10 @@ -652,6 +652,11 @@ yumconf_fo = open(yumconf, 'w') yumconf_content = self.config['yum.conf'] yumconf_fo.write(yumconf_content) + # symlink /etc/yum.conf to /etc/yum/yum.conf to deal with + # (possible) yum breakage + yumdir = os.path.join(self.rootdir, 'etc', 'yum') + self._ensure_dir(yumdir) + os.symlink('../yum.conf', os.path.join(yumdir, 'yum.conf')) # files in /etc that need doing filedict = self.config['files'] Index: mock.spec =================================================================== RCS file: /cvs/fedora/mock/mock.spec,v retrieving revision 1.16.2.17 retrieving revision 1.16.2.18 diff -u -r1.16.2.17 -r1.16.2.18 --- mock.spec 7 Feb 2007 15:40:31 -0000 1.16.2.17 +++ mock.spec 16 Feb 2007 19:16:11 -0000 1.16.2.18 @@ -1,6 +1,6 @@ Summary: Builds packages inside chroots Name: mock -Version: 0.6.11 +Version: 0.6.12 Release: 1%{?dist} License: GPL Group: Development/Tools @@ -66,6 +66,9 @@ %{_libdir}/libselinux-mock.so %changelog +* Fri Feb 16 2007 Clark Williams - 0.6.12-1 +- added safety symlink for yum.conf + * Wed Feb 7 2007 Clark Williams - 0.6.11-1 - added error() calls to print command output on failed commands From fedora-extras-commits at redhat.com Fri Feb 16 19:23:48 2007 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Fri, 16 Feb 2007 14:23:48 -0500 Subject: rpms/mono-debugger import.log,1.7,1.8 Message-ID: <200702161923.l1GJNmh8004143@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/mono-debugger In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4080 Modified Files: import.log Log Message: auto-import mono-debugger-0.31-2 on branch devel from mono-debugger-0.31-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/mono-debugger/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 15 Feb 2007 14:03:36 -0000 1.7 +++ import.log 16 Feb 2007 19:23:15 -0000 1.8 @@ -4,3 +4,4 @@ mono-debugger-0_30-6:HEAD:mono-debugger-0.30-6.src.rpm:1157583705 mono-debugger-0_30-6:FC-5:mono-debugger-0.30-6.src.rpm:1157583847 mono-debugger-0_31-1:HEAD:mono-debugger-0.31-1.src.rpm:1171548205 +mono-debugger-0_31-2:HEAD:mono-debugger-0.31-2.src.rpm:1171653780 From fedora-extras-commits at redhat.com Fri Feb 16 19:23:50 2007 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Fri, 16 Feb 2007 14:23:50 -0500 Subject: rpms/mono-debugger/devel mono-debugger.spec, 1.7, 1.8 monodebug-configure.patch, 1.1, 1.2 Message-ID: <200702161923.l1GJNoiW004150@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/mono-debugger/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4080/devel Modified Files: mono-debugger.spec monodebug-configure.patch Log Message: auto-import mono-debugger-0.31-2 on branch devel from mono-debugger-0.31-2.src.rpm Index: mono-debugger.spec =================================================================== RCS file: /cvs/extras/rpms/mono-debugger/devel/mono-debugger.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mono-debugger.spec 15 Feb 2007 14:03:38 -0000 1.7 +++ mono-debugger.spec 16 Feb 2007 19:23:18 -0000 1.8 @@ -1,7 +1,7 @@ Summary: A debugger for Mono Name: mono-debugger Version: 0.31 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://www.go-mono.com/sources/mono-debugger @@ -37,7 +37,7 @@ autoreconf %build -%configure --disable-static +%configure --disable-static --disable-dependency-tracking make %{?_smp_mflags} %install @@ -70,6 +70,10 @@ %{_libdir}/libmono*.so %changelog +* Fri Feb 16 2007 Paul F. Johnson 0.31-2 +- fix for faulty config (Ville Skytta) +- added addition configure flag + * Thu Feb 15 2007 Paul F. Johnson 0.31-1 - removed BR termcap - bump to 0.31 monodebug-configure.patch: Index: monodebug-configure.patch =================================================================== RCS file: /cvs/extras/rpms/mono-debugger/devel/monodebug-configure.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- monodebug-configure.patch 2 Sep 2006 09:30:31 -0000 1.1 +++ monodebug-configure.patch 16 Feb 2007 19:23:18 -0000 1.2 @@ -1,5 +1,16 @@ --- mono-debugger-0.30/configure.in 2006-07-18 17:59:13.000000000 +0100 +++ mono-debugger-0.30/configure.in 2006-08-27 10:33:30.000000000 +0100 +@@ -104,7 +104,7 @@ + # not 64 bit clean in cross-compile + AC_CHECK_SIZEOF(void *, 4) + +-CFLAGS='-g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wshadow -Wpointer-arith -Wno-cast-qual -Wcast-align -Wwrite-strings' ++CFLAGS="-g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wshadow -Wpointer-arith -Wno-cast-qual -Wcast-align -Wwrite-strings $CFLAGS" + + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + if test "x$PKG_CONFIG" = "xno"; then +--- mono-debugger-0.30/configure.in 2006-07-18 17:59:13.000000000 +0100 ++++ mono-debugger-0.30/configure.in 2006-08-27 10:33:30.000000000 +0100 @@ -153,7 +153,7 @@ AC_SUBST(WRAPPER_CFLAGS) AC_SUBST(WRAPPER_LIBS) @@ -9,6 +20,17 @@ AC_PATH_PROG(GACUTIL, gacutil, no) if test "x$GACUTIL" = "xno" ; then AC_MSG_ERROR([No gacutil tool found]) +--- mono-debugger-0.30/configure.in 2006-07-18 17:59:13.000000000 +0100 ++++ mono-debugger-0.30/configure.in 2006-08-27 10:33:30.000000000 +0100 +@@ -217,7 +217,7 @@ + CHECK_READLINE + + AC_MSG_CHECKING([Whether your Mono is working]) +-old_CFLAGS=$cflags ++old_CFLAGS=$CFLAGS + CFLAGS=$WRAPPER_CFLAGS + AC_TRY_COMPILE([#include + ], [ --- mono-debugger-0.30/mono-debugger.pc.in 2006-07-18 17:59:13.000000000 +0100 +++ mono-debugger-0.30/mono-debugger.pc.in 2006-08-27 10:35:11.000000000 +0100 From fedora-extras-commits at redhat.com Fri Feb 16 19:49:06 2007 From: fedora-extras-commits at redhat.com (Christian Jodar (tian)) Date: Fri, 16 Feb 2007 14:49:06 -0500 Subject: rpms/gcstar/devel .cvsignore, 1.3, 1.4 gcstar.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200702161949.l1GJn6Wm004568@cvs-int.fedora.redhat.com> Author: tian Update of /cvs/extras/rpms/gcstar/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4542 Modified Files: .cvsignore gcstar.spec sources Log Message: New upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gcstar/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 16 Dec 2006 19:48:36 -0000 1.3 +++ .cvsignore 16 Feb 2007 19:48:34 -0000 1.4 @@ -1 +1 @@ -gcstar-1.0.0.tar.gz +gcstar-1.1.1.tar.gz Index: gcstar.spec =================================================================== RCS file: /cvs/extras/rpms/gcstar/devel/gcstar.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gcstar.spec 16 Dec 2006 19:48:36 -0000 1.3 +++ gcstar.spec 16 Feb 2007 19:48:34 -0000 1.4 @@ -1,5 +1,5 @@ Name: gcstar -Version: 1.0.0 +Version: 1.1.1 Release: 1%{?dist} Summary: Personal collections manager @@ -99,6 +99,8 @@ %{_datadir}/mime/packages/%{name}.xml %changelog +* Fri Feb 16 2007 Tian - 1.1.1-1 + - New upstream version * Sat Dec 16 2006 Tian - 1.0.0-1 - New upstream version * Sat Oct 28 2006 Tian - 0.5.0-4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gcstar/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Dec 2006 19:48:36 -0000 1.2 +++ sources 16 Feb 2007 19:48:34 -0000 1.3 @@ -1 +1 @@ -0bf2ce46a4adba23136e65ec6d2bd65d gcstar-1.0.0.tar.gz +0a7067d460ac7fb16cb51ba2dc5a24ac gcstar-1.1.1.tar.gz From fedora-extras-commits at redhat.com Fri Feb 16 20:45:02 2007 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Fri, 16 Feb 2007 15:45:02 -0500 Subject: rpms/gossip/devel gossip.spec,1.36,1.37 Message-ID: <200702162045.l1GKj269008797@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gossip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8773 Modified Files: gossip.spec Log Message: * Fri Feb 16 2007 Brian Pepple - 0.22-2 - Build peek-a-boo applet. - Add BR for gnome-panel-devel. Index: gossip.spec =================================================================== RCS file: /cvs/extras/rpms/gossip/devel/gossip.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- gossip.spec 13 Jan 2007 19:03:29 -0000 1.36 +++ gossip.spec 16 Feb 2007 20:44:29 -0000 1.37 @@ -1,9 +1,7 @@ -%define with_dbus 1 - Name: gossip Version: 0.22 -Release: 1%{?dist} -Summary: Gnome Jabber Client +Release: 2%{?dist} +Summary: GNOME Jabber Client Group: Applications/Communications License: GPL @@ -16,9 +14,9 @@ BuildRequires: libxslt-devel BuildRequires: libXScrnSaver-devel BuildRequires: libXt-devel -BuildRequires: xorg-x11-proto-devel BuildRequires: libnotify-devel BuildRequires: desktop-file-utils +BuildRequires: gnome-panel-devel BuildRequires: aspell-devel BuildRequires: gettext BuildRequires: scrollkeeper @@ -26,17 +24,13 @@ BuildRequires: gnome-doc-utils BuildRequires: perl(XML::Parser) - -%if %{with_dbus} -BuildRequires: dbus-devel >= 0.60 -%endif - Requires(pre): GConf2 Requires(post): GConf2 Requires(post): scrollkeeper Requires(preun): GConf2 Requires(postun): scrollkeeper + %description Gossip aims at making Jabber easy to use and tries to give GNOME users a real user friendly way of chatting with their friends. @@ -51,11 +45,7 @@ --disable-schemas-install \ --with-backend=gnome \ --enable-libnotify=yes \ -%if %{with_dbus} --enable-dbus=yes -%else - --enable-dbus=no -%endif make %{?_smp_mflags} @@ -122,9 +112,15 @@ %{_datadir}/sounds/%{name}/ %{_datadir}/omf/%{name}/ %{_datadir}/gnome/help/%{name}/ +%{_libdir}/bonobo/servers/GNOME_Peekaboo_Applet.server +%{_libexecdir}/peekaboo-applet %changelog +* Fri Feb 16 2007 Brian Pepple - 0.22-2 +- Build peek-a-boo applet. +- Add BR for gnome-panel-devel. + * Sat Jan 13 2007 Brian Pepple - 0.22-1 - Update to 0.22. - Drop message focus patch. Fixed upstream. From fedora-extras-commits at redhat.com Fri Feb 16 22:06:59 2007 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 16 Feb 2007 17:06:59 -0500 Subject: rpms/kchmviewer/devel kchmviewer-desktop.diff, 1.1, 1.2 kchmviewer.spec, 1.6, 1.7 Message-ID: <200702162206.l1GM6x5x016712@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/kchmviewer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16685 Modified Files: kchmviewer-desktop.diff kchmviewer.spec Log Message: * Fri Feb 16 2007 Patrice Dumas 2.7-2 - fixes in desktop file. Fix #229070 kchmviewer-desktop.diff: Index: kchmviewer-desktop.diff =================================================================== RCS file: /cvs/extras/rpms/kchmviewer/devel/kchmviewer-desktop.diff,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kchmviewer-desktop.diff 1 May 2006 08:35:31 -0000 1.1 +++ kchmviewer-desktop.diff 16 Feb 2007 22:06:26 -0000 1.2 @@ -1,16 +1,19 @@ ---- kio-msits/kchmviewer.desktop-orig 2006-03-13 23:08:01.000000000 +0100 -+++ kio-msits/kchmviewer.desktop 2006-03-13 23:09:16.000000000 +0100 +--- kchmviewer-2.7/kio-msits/kchmviewer.desktop.fix 2006-04-02 03:15:03.000000000 +0200 ++++ kchmviewer-2.7/kio-msits/kchmviewer.desktop 2007-02-16 22:56:55.000000000 +0100 @@ -1,11 +1,11 @@ [Desktop Entry] Categories=Qt;KDE;Utility; Encoding=UTF-8 +GenericName=CHM file viewer Type=Application - Exec=kchmviewer %U - Icon=kchmviewer.png +-Exec=kchmviewer %U +-Icon=kchmviewer.png -Comment= -Terminal=0 ++Exec=kchmviewer %f ++Icon=kchmviewer +Terminal=false Name=KchmViewer Comment=A viewer of CHM (MS-Help) files - MimeType=application/chm +-MimeType=application/chm ++MimeType=application/chm;application/x-chm Index: kchmviewer.spec =================================================================== RCS file: /cvs/extras/rpms/kchmviewer/devel/kchmviewer.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- kchmviewer.spec 29 Jan 2007 21:25:06 -0000 1.6 +++ kchmviewer.spec 16 Feb 2007 22:06:26 -0000 1.7 @@ -1,6 +1,6 @@ Name: kchmviewer Version: 2.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: CHM viewer with KDE support Group: Applications/Publishing @@ -23,7 +23,7 @@ %prep %setup -q -%patch0 +%patch0 -p1 -b .fix chmod -x kio-msits/msits.* @@ -72,6 +72,9 @@ %changelog +* Fri Feb 16 2007 Patrice Dumas 2.7-2 +- fixes in desktop file. Fix #229070 + * Mon Jan 29 2007 Patrice Dumas 2.7-1 - update to 2.7 From fedora-extras-commits at redhat.com Fri Feb 16 22:09:08 2007 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 16 Feb 2007 17:09:08 -0500 Subject: rpms/kchmviewer/devel kchmviewer.spec,1.7,1.8 Message-ID: <200702162209.l1GM989x016798@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/kchmviewer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16770 Modified Files: kchmviewer.spec Log Message: add -p to install Index: kchmviewer.spec =================================================================== RCS file: /cvs/extras/rpms/kchmviewer/devel/kchmviewer.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- kchmviewer.spec 16 Feb 2007 22:06:26 -0000 1.7 +++ kchmviewer.spec 16 Feb 2007 22:08:35 -0000 1.8 @@ -36,7 +36,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps -install -m644 src/pics/cr48-app-kchmviewer.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/kchmviewer.png +install -p -m644 src/pics/cr48-app-kchmviewer.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/kchmviewer.png desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ From fedora-extras-commits at redhat.com Fri Feb 16 22:11:09 2007 From: fedora-extras-commits at redhat.com (Christian Jodar (tian)) Date: Fri, 16 Feb 2007 17:11:09 -0500 Subject: rpms/gcstar/FC-5 gcstar.spec,1.3,1.4 sources,1.2,1.3 Message-ID: <200702162211.l1GMB9Sj016870@cvs-int.fedora.redhat.com> Author: tian Update of /cvs/extras/rpms/gcstar/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16831 Modified Files: gcstar.spec sources Log Message: New upstream version Index: gcstar.spec =================================================================== RCS file: /cvs/extras/rpms/gcstar/FC-5/gcstar.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gcstar.spec 16 Dec 2006 20:07:13 -0000 1.3 +++ gcstar.spec 16 Feb 2007 22:10:36 -0000 1.4 @@ -1,5 +1,5 @@ Name: gcstar -Version: 1.0.0 +Version: 1.1.1 Release: 1%{?dist} Summary: Personal collections manager @@ -99,6 +99,8 @@ %{_datadir}/mime/packages/%{name}.xml %changelog +* Fri Feb 16 2007 Tian - 1.1.1-1 + - New upstream version * Sat Dec 16 2006 Tian - 1.0.0-1 - New upstream version * Sat Oct 28 2006 Tian - 0.5.0-4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gcstar/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Dec 2006 20:07:13 -0000 1.2 +++ sources 16 Feb 2007 22:10:36 -0000 1.3 @@ -1 +1 @@ -0bf2ce46a4adba23136e65ec6d2bd65d gcstar-1.0.0.tar.gz +0a7067d460ac7fb16cb51ba2dc5a24ac gcstar-1.1.1.tar.gz From fedora-extras-commits at redhat.com Fri Feb 16 22:11:10 2007 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 16 Feb 2007 17:11:10 -0500 Subject: rpms/tcldom/devel tcldom.spec,1.7,1.8 Message-ID: <200702162211.l1GMBAKr016873@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tcldom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16829 Modified Files: tcldom.spec Log Message: Rebuild for reversion back to tcl8.4 Index: tcldom.spec =================================================================== RCS file: /cvs/extras/rpms/tcldom/devel/tcldom.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- tcldom.spec 8 Feb 2007 23:29:46 -0000 1.7 +++ tcldom.spec 16 Feb 2007 22:10:37 -0000 1.8 @@ -4,7 +4,7 @@ Summary: TclDOM is a package that provides a DOM binding for the Tcl scripting language Name: tcldom Version: 3.1 -Release: 8%{?dist} +Release: 9%{?dist} License: BSD Group: Development/Libraries URL: http://tclxml.sourceforge.net/ @@ -136,6 +136,9 @@ %{_libdir}/%{name}_libxml2%{version}/*.a %changelog +* Fri Feb 16 2007 Wart - 3.1-9 +- Rebuild for reversion to tcl8.4 + * Thu Feb 8 2007 Wart - 3.1-8 - Add missing BuildRequires: tcl From fedora-extras-commits at redhat.com Fri Feb 16 22:13:39 2007 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 16 Feb 2007 17:13:39 -0500 Subject: rpms/tclsoap/devel tclsoap.spec,1.3,1.4 Message-ID: <200702162213.l1GMDdK2017002@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tclsoap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16973 Modified Files: tclsoap.spec Log Message: Rebuild for reversion back to tcl8.4 Index: tclsoap.spec =================================================================== RCS file: /cvs/extras/rpms/tclsoap/devel/tclsoap.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tclsoap.spec 2 Feb 2007 21:34:12 -0000 1.3 +++ tclsoap.spec 16 Feb 2007 22:13:07 -0000 1.4 @@ -1,9 +1,10 @@ -%{!?tcl_sitelib: %define tcl_sitelib %{_datadir}/tcl%(echo 'puts $tcl_version' | tclsh)} +%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)} +%{!?tcl_sitelib: %define tcl_sitelib %{_datadir}/tcl%{tcl_version}} Summary: Tcl commands for SOAP remote procedure calls Name: tclsoap Version: 1.6.7 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT URL: http://tclsoap.sourceforge.net/ Group: Development/Libraries @@ -45,6 +46,9 @@ %doc doc/* %changelog +* Fri Feb 16 2007 Wart - 1.6.7-4 +- Rebuild for reversion back to tcl8.4 + * Fri Feb 2 2007 Wart - 1.6.7-3 - Add patch to fix version mismatch - Move package to tcl-specific directory From fedora-extras-commits at redhat.com Fri Feb 16 22:15:56 2007 From: fedora-extras-commits at redhat.com (Christian Jodar (tian)) Date: Fri, 16 Feb 2007 17:15:56 -0500 Subject: rpms/gcstar/FC-6 gcstar.spec,1.3,1.4 sources,1.2,1.3 Message-ID: <200702162215.l1GMFuGm017044@cvs-int.fedora.redhat.com> Author: tian Update of /cvs/extras/rpms/gcstar/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17001 Modified Files: gcstar.spec sources Log Message: New upstream version Index: gcstar.spec =================================================================== RCS file: /cvs/extras/rpms/gcstar/FC-6/gcstar.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gcstar.spec 16 Dec 2006 20:11:03 -0000 1.3 +++ gcstar.spec 16 Feb 2007 22:15:23 -0000 1.4 @@ -1,5 +1,5 @@ Name: gcstar -Version: 1.0.0 +Version: 1.1.1 Release: 1%{?dist} Summary: Personal collections manager @@ -99,6 +99,8 @@ %{_datadir}/mime/packages/%{name}.xml %changelog +* Fri Feb 16 2007 Tian - 1.1.1-1 + - New upstream version * Sat Dec 16 2006 Tian - 1.0.0-1 - New upstream version * Sat Oct 28 2006 Tian - 0.5.0-4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gcstar/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Dec 2006 20:11:03 -0000 1.2 +++ sources 16 Feb 2007 22:15:23 -0000 1.3 @@ -1 +1 @@ -0bf2ce46a4adba23136e65ec6d2bd65d gcstar-1.0.0.tar.gz +0a7067d460ac7fb16cb51ba2dc5a24ac gcstar-1.1.1.tar.gz From fedora-extras-commits at redhat.com Fri Feb 16 22:30:39 2007 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 16 Feb 2007 17:30:39 -0500 Subject: rpms/lilypond/FC-5 lilypond.spec, 1.15, 1.16 lilypond-2.10.2-configure.patch, 1.1, NONE Message-ID: <200702162230.l1GMUdJY017233@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/lilypond/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17216 Modified Files: lilypond.spec Removed Files: lilypond-2.10.2-configure.patch Log Message: Remove old patch. Index: lilypond.spec =================================================================== RCS file: /cvs/extras/rpms/lilypond/FC-5/lilypond.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- lilypond.spec 15 Feb 2007 22:22:29 -0000 1.15 +++ lilypond.spec 16 Feb 2007 22:30:06 -0000 1.16 @@ -1,13 +1,12 @@ Name: lilypond Version: 2.10.17 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A typesetting system for music notation Group: Applications/Publishing License: GPL URL: http://www.lilypond.org Source0: http://www.lilypond.org/download/sources/v2.10/%{name}-%{version}.tar.gz -Patch0: lilypond-2.10.2-configure.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ghostscript >= 8.15 @@ -30,7 +29,6 @@ %prep %setup -q -%patch0 -p1 %build @@ -95,6 +93,9 @@ %changelog +* Fri Feb 16 2007 Quentin Spencer 2.10.17-2 +- Patch no longer needed. + * Thu Feb 15 2007 Quentin Spencer 2.10.17-1 - New release. Fix bug 225410. --- lilypond-2.10.2-configure.patch DELETED --- From fedora-extras-commits at redhat.com Sat Feb 17 01:26:56 2007 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 16 Feb 2007 20:26:56 -0500 Subject: rpms/tcllib/devel tcllib.spec,1.9,1.10 Message-ID: <200702170126.l1H1QuWr029185@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tcllib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29167 Modified Files: tcllib.spec Log Message: Rebuild for reversion back to tcl8.4 Index: tcllib.spec =================================================================== RCS file: /cvs/extras/rpms/tcllib/devel/tcllib.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- tcllib.spec 1 Feb 2007 18:57:35 -0000 1.9 +++ tcllib.spec 17 Feb 2007 01:26:24 -0000 1.10 @@ -1,7 +1,10 @@ +%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)} +%{!?tcl_sitelib: %define tcl_sitelib %{_datadir}/tcl%{tcl_version}} + Summary: The standard Tcl library Name: tcllib Version: 1.9 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD-like Group: Development/Libraries Source: http://download.sourceforge.net/tcllib/tcllib-1.9.tar.gz @@ -53,10 +56,13 @@ %doc support/releases/PACKAGES README support/releases/history/README-1.9.txt %doc ChangeLog license.terms %doc exif/ ftp/ mime/ stooop/ struct/ textutil/ -%{_datadir}/tcl*/%{name}-%{version} +%{tcl_sitelib}/%{name}-%{version} %{_mandir}/mann/* %changelog +* Fri Feb 16 2007 Wart - 1.9-3 +- Rebuild for reversion back to tcl8.4 + * Thu Feb 1 2007 Wart 1.9-2 - Rebuild for tcl8.5 (changes tcllib's install directory) From fedora-extras-commits at redhat.com Sat Feb 17 02:02:29 2007 From: fedora-extras-commits at redhat.com (Xavier LAMIEN (laxathom)) Date: Fri, 16 Feb 2007 21:02:29 -0500 Subject: rpms/ntfs-config - New directory Message-ID: <200702170202.l1H22Tsr001383@cvs-int.fedora.redhat.com> Author: laxathom Update of /cvs/extras/rpms/ntfs-config In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1378/ntfs-config Log Message: Directory /cvs/extras/rpms/ntfs-config added to the repository From fedora-extras-commits at redhat.com Sat Feb 17 02:02:36 2007 From: fedora-extras-commits at redhat.com (Xavier LAMIEN (laxathom)) Date: Fri, 16 Feb 2007 21:02:36 -0500 Subject: rpms/ntfs-config/devel - New directory Message-ID: <200702170202.l1H22aCk001397@cvs-int.fedora.redhat.com> Author: laxathom Update of /cvs/extras/rpms/ntfs-config/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1378/ntfs-config/devel Log Message: Directory /cvs/extras/rpms/ntfs-config/devel added to the repository From fedora-extras-commits at redhat.com Sat Feb 17 07:44:27 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sat, 17 Feb 2007 02:44:27 -0500 Subject: comps comps-fe5.xml.in, 1.249, 1.250 comps-fe6.xml.in, 1.294, 1.295 comps-fe7.xml.in, 1.102, 1.103 Message-ID: <200702170744.l1H7iRwS021778@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21758 Modified Files: comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in Log Message: add kazehakase Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.249 retrieving revision 1.250 diff -u -r1.249 -r1.250 --- comps-fe5.xml.in 3 Feb 2007 21:14:09 -0000 1.249 +++ comps-fe5.xml.in 17 Feb 2007 07:43:57 -0000 1.250 @@ -555,6 +555,7 @@ jd kadu kasablanca + kazehakase kickpim kita konversation Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.294 retrieving revision 1.295 diff -u -r1.294 -r1.295 --- comps-fe6.xml.in 14 Feb 2007 08:47:10 -0000 1.294 +++ comps-fe6.xml.in 17 Feb 2007 07:43:57 -0000 1.295 @@ -618,6 +618,7 @@ jd kadu kasablanca + kazehakase kickpim kita knetstats Index: comps-fe7.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe7.xml.in,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- comps-fe7.xml.in 14 Feb 2007 08:47:10 -0000 1.102 +++ comps-fe7.xml.in 17 Feb 2007 07:43:57 -0000 1.103 @@ -619,6 +619,7 @@ jd kadu kasablanca + kazehakase kickpim kita knetstats From fedora-extras-commits at redhat.com Sat Feb 17 07:58:23 2007 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sat, 17 Feb 2007 02:58:23 -0500 Subject: rpms/basket/FC-6 basket.spec,1.10,1.11 Message-ID: <200702170758.l1H7wNJB021902@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/basket/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21868/FC-6 Modified Files: basket.spec Log Message: bug 228966 Index: basket.spec =================================================================== RCS file: /cvs/extras/rpms/basket/FC-6/basket.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- basket.spec 12 Feb 2007 19:56:32 -0000 1.10 +++ basket.spec 17 Feb 2007 07:57:51 -0000 1.11 @@ -1,7 +1,7 @@ Name: basket Summary: Notes taker for KDE Version: 1.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://basket.kde.org/ Source0: http://basket.kde.org/downloads/basket-%{version}.tar.gz License: GPL @@ -18,6 +18,15 @@ images, sounds, files, colors, application launcher... BasKet lets you keep all objects in one place, and keep data at hand. +%package kontact +Group: Applications/Productivity +Summary: Basket plugin for Kontact +Requires: %{name} = %{version}-%{release} +Requires: kdepim + +%description kontact +This package contains the kontact plugin for BasKet. + %prep %setup -q @@ -89,19 +98,21 @@ %{_libdir}/kde3/kcm_basket.* %{_libdir}/kde3/libbasketpart.* %{_libdir}/kde3/basketthumbcreator.* -%{_libdir}/kde3/libkontact_basket.* %{_libdir}/libbasketcommon.so %{_datadir}/services/*.desktop %{_datadir}/config/magic/basket.magic %{_datadir}/mimelnk/application/*.desktop -# Kontact + +%files kontact %{_datadir}/apps/kontact/ksettingsdialog/kontact_basketplugin.setdlg %{_datadir}/services/kontact/*.desktop - - +%{_libdir}/kde3/libkontact_basket.* %changelog +* Sat Feb 17 2007 Aurelien Bompard 1.0-2 +- Split off the kontact plugin, patch by Laurent Rineau (see bug 228966) + * Mon Feb 12 2007 Aurelien Bompard 1.0-1 - version 1.0 From fedora-extras-commits at redhat.com Sat Feb 17 07:58:26 2007 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sat, 17 Feb 2007 02:58:26 -0500 Subject: rpms/basket/devel basket.spec,1.10,1.11 Message-ID: <200702170758.l1H7wQRH021905@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/basket/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21868/devel Modified Files: basket.spec Log Message: bug 228966 Index: basket.spec =================================================================== RCS file: /cvs/extras/rpms/basket/devel/basket.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- basket.spec 12 Feb 2007 19:56:35 -0000 1.10 +++ basket.spec 17 Feb 2007 07:57:54 -0000 1.11 @@ -1,7 +1,7 @@ Name: basket Summary: Notes taker for KDE Version: 1.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://basket.kde.org/ Source0: http://basket.kde.org/downloads/basket-%{version}.tar.gz License: GPL @@ -18,6 +18,15 @@ images, sounds, files, colors, application launcher... BasKet lets you keep all objects in one place, and keep data at hand. +%package kontact +Group: Applications/Productivity +Summary: Basket plugin for Kontact +Requires: %{name} = %{version}-%{release} +Requires: kdepim + +%description kontact +This package contains the kontact plugin for BasKet. + %prep %setup -q @@ -89,19 +98,21 @@ %{_libdir}/kde3/kcm_basket.* %{_libdir}/kde3/libbasketpart.* %{_libdir}/kde3/basketthumbcreator.* -%{_libdir}/kde3/libkontact_basket.* %{_libdir}/libbasketcommon.so %{_datadir}/services/*.desktop %{_datadir}/config/magic/basket.magic %{_datadir}/mimelnk/application/*.desktop -# Kontact + +%files kontact %{_datadir}/apps/kontact/ksettingsdialog/kontact_basketplugin.setdlg %{_datadir}/services/kontact/*.desktop - - +%{_libdir}/kde3/libkontact_basket.* %changelog +* Sat Feb 17 2007 Aurelien Bompard 1.0-2 +- Split off the kontact plugin, patch by Laurent Rineau (see bug 228966) + * Mon Feb 12 2007 Aurelien Bompard 1.0-1 - version 1.0 From fedora-extras-commits at redhat.com Sat Feb 17 08:36:46 2007 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Sat, 17 Feb 2007 03:36:46 -0500 Subject: rpms/kchmviewer/FC-6 .cvsignore, 1.4, 1.5 kchmviewer-desktop.diff, 1.1, 1.2 kchmviewer.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200702170836.l1H8akXb025708@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/kchmviewer/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25681 Modified Files: .cvsignore kchmviewer-desktop.diff kchmviewer.spec sources Log Message: Feb 16 2007 Patrice Dumas 2.7-2 - fixes in desktop file. Fix #229070 * Mon Jan 29 2007 Patrice Dumas 2.7-1 - update to 2.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kchmviewer/FC-6/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 Jul 2006 21:04:17 -0000 1.4 +++ .cvsignore 17 Feb 2007 08:36:13 -0000 1.5 @@ -1 +1 @@ -kchmviewer-2.6.tar.gz +kchmviewer-2.7.tar.gz kchmviewer-desktop.diff: Index: kchmviewer-desktop.diff =================================================================== RCS file: /cvs/extras/rpms/kchmviewer/FC-6/kchmviewer-desktop.diff,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kchmviewer-desktop.diff 1 May 2006 08:35:31 -0000 1.1 +++ kchmviewer-desktop.diff 17 Feb 2007 08:36:13 -0000 1.2 @@ -1,16 +1,19 @@ ---- kio-msits/kchmviewer.desktop-orig 2006-03-13 23:08:01.000000000 +0100 -+++ kio-msits/kchmviewer.desktop 2006-03-13 23:09:16.000000000 +0100 +--- kchmviewer-2.7/kio-msits/kchmviewer.desktop.fix 2006-04-02 03:15:03.000000000 +0200 ++++ kchmviewer-2.7/kio-msits/kchmviewer.desktop 2007-02-16 22:56:55.000000000 +0100 @@ -1,11 +1,11 @@ [Desktop Entry] Categories=Qt;KDE;Utility; Encoding=UTF-8 +GenericName=CHM file viewer Type=Application - Exec=kchmviewer %U - Icon=kchmviewer.png +-Exec=kchmviewer %U +-Icon=kchmviewer.png -Comment= -Terminal=0 ++Exec=kchmviewer %f ++Icon=kchmviewer +Terminal=false Name=KchmViewer Comment=A viewer of CHM (MS-Help) files - MimeType=application/chm +-MimeType=application/chm ++MimeType=application/chm;application/x-chm Index: kchmviewer.spec =================================================================== RCS file: /cvs/extras/rpms/kchmviewer/FC-6/kchmviewer.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- kchmviewer.spec 12 Sep 2006 16:52:31 -0000 1.5 +++ kchmviewer.spec 17 Feb 2007 08:36:13 -0000 1.6 @@ -1,53 +1,29 @@ Name: kchmviewer -Version: 2.6 +Version: 2.7 Release: 2%{?dist} -Summary: CHM viewer +Summary: CHM viewer with KDE support Group: Applications/Publishing License: GPL URL: http://www.kchmviewer.net/ -Source0: http://download.sf.net/kchmviewer/kchmviewer-%{version}.tar.gz +Source0: http://ovh.dl.sourceforge.net/sourceforge/kchmviewer/kchmviewer-%{version}.tar.gz # fix the desktop file Patch0: kchmviewer-desktop.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel chmlib-devel BuildRequires: desktop-file-utils kdelibs-devel -Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils %description KchmViewer is a chm (MS HTML help file format) viewer, written in C++. -The main advantage of KchmViewer is extended support for non-English -languages. Unlike others, KchmViewer in most cases correctly detects chm -file encoding, correctly shows tables of context of Russian, Korean, -Chinese and Japanese help files, and correctly searches in non-English -help files (search for MBCS languages - ja/ko/ch is still in progress). - -- Completely safe and harmless. Does not support JavaScript in any way, - optionally warns you before opening an external web page, or switching - to another help file. -- Shows an appropriate image for every TOC entry. -- Has complete chm index support, including multiple index entries, - cross-links and parent/child entries in index. -- Persistent bookmarks support. Allows to store bookmarks even if - "Favorites" window was not enabled for this chm file. Also stores the - screen position for every bookmark. You can also edit/delete bookmarks. -- For any opened chm file, stores the last opened window, search history, - bookmark history, font size and so on, so when you open this file again, - everything is always on the place. -- Has easy and powerful search-in-page support. -- Allows to increase or decrease the font size, so physically handicapped - people can read texts easily. -- Has standard Back/Forward/Home navigation. -- Can print the opened pages on a standard printer (usually via CUPS). -- Has complex search query support. You can use search queries like "lazy - people" + learn -not. +Unlike most existing CHM viewers for Unix, it uses Trolltech Qt widget +library. It is compiled with full KDE support, including KDE widgets +and KIO/KHTML. %prep %setup -q -%patch +%patch0 -p1 -b .fix chmod -x kio-msits/msits.* @@ -55,15 +31,15 @@ %configure --disable-static --with-kde --disable-rpath make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -install -d -m755 ${RPM_BUILD_ROOT}%{_datadir}/pixmaps -install -m644 src/pics/cr48-app-kchmviewer.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/kchmviewer.png +mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps +install -p -m644 src/pics/cr48-app-kchmviewer.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/kchmviewer.png desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - --add-category X-Fedora \ --delete-original \ $RPM_BUILD_ROOT%{_datadir}/applnk/kchmviewer.desktop @@ -71,11 +47,17 @@ %clean rm -rf $RPM_BUILD_ROOT + %post update-desktop-database &> /dev/null ||: +touch --no-create %{_datadir}/icons/crystalsvg || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || : %postun update-desktop-database &> /dev/null ||: +touch --no-create %{_datadir}/icons/crystalsvg || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || : + %files %defattr(-,root,root,-) @@ -88,7 +70,14 @@ %{_datadir}/services/msits.protocol %{_datadir}/icons/crystalsvg/*/apps/kchmviewer.png + %changelog +* Fri Feb 16 2007 Patrice Dumas 2.7-2 +- fixes in desktop file. Fix #229070 + +* Mon Jan 29 2007 Patrice Dumas 2.7-1 +- update to 2.7 + * Tue Sep 12 2006 Patrice Dumas 2.6-2 - rebuild for FC6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kchmviewer/FC-6/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 Jul 2006 21:04:17 -0000 1.4 +++ sources 17 Feb 2007 08:36:13 -0000 1.5 @@ -1 +1 @@ -7898095c413b4262c5aff6bf5fcaf25b kchmviewer-2.6.tar.gz +f7bb9fb4b10f351f93d32a5ebca5e078 kchmviewer-2.7.tar.gz From fedora-extras-commits at redhat.com Sat Feb 17 09:02:36 2007 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 17 Feb 2007 04:02:36 -0500 Subject: rpms/wine-docs/devel .cvsignore, 1.21, 1.22 sources, 1.21, 1.22 wine-docs.spec, 1.21, 1.22 Message-ID: <200702170902.l1H92atM030206@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine-docs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26550/devel Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine-docs/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 7 Feb 2007 08:47:05 -0000 1.21 +++ .cvsignore 17 Feb 2007 09:02:04 -0000 1.22 @@ -1 +1 @@ -wine-docs-0.9.30.tar.bz2 +wine-docs-0.9.31.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine-docs/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 7 Feb 2007 08:47:05 -0000 1.21 +++ sources 17 Feb 2007 09:02:04 -0000 1.22 @@ -1 +1 @@ -99ac7665f88e127b4da9ac1bda5d8688 wine-docs-0.9.30.tar.bz2 +5825e3e3d2a88fc8bcff759a4aef7225 wine-docs-0.9.31.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/devel/wine-docs.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- wine-docs.spec 7 Feb 2007 08:47:05 -0000 1.21 +++ wine-docs.spec 17 Feb 2007 09:02:04 -0000 1.22 @@ -1,12 +1,12 @@ Name: wine-docs -Version: 0.9.30 +Version: 0.9.31 Release: 1%{?dist} Summary: Documentation for wine Group: Documentation License: LGPL URL: http://www.winehq.org -Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.30.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.31.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf @@ -37,6 +37,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Sat Feb 17 2007 Andreas Bierfert +0.9.31-1 +- version upgrade + * Wed Feb 07 2007 Andreas Bierfert 0.9.30-1 - version upgrade From fedora-extras-commits at redhat.com Sat Feb 17 09:02:31 2007 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 17 Feb 2007 04:02:31 -0500 Subject: rpms/wine-docs/FC-5 .cvsignore, 1.21, 1.22 sources, 1.21, 1.22 wine-docs.spec, 1.21, 1.22 Message-ID: <200702170902.l1H92VwC030196@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine-docs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26550/FC-5 Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-5/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 7 Feb 2007 08:47:00 -0000 1.21 +++ .cvsignore 17 Feb 2007 09:01:58 -0000 1.22 @@ -1 +1 @@ -wine-docs-0.9.30.tar.bz2 +wine-docs-0.9.31.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-5/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 7 Feb 2007 08:47:00 -0000 1.21 +++ sources 17 Feb 2007 09:01:58 -0000 1.22 @@ -1 +1 @@ -99ac7665f88e127b4da9ac1bda5d8688 wine-docs-0.9.30.tar.bz2 +5825e3e3d2a88fc8bcff759a4aef7225 wine-docs-0.9.31.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-5/wine-docs.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- wine-docs.spec 7 Feb 2007 08:47:00 -0000 1.21 +++ wine-docs.spec 17 Feb 2007 09:01:58 -0000 1.22 @@ -1,12 +1,12 @@ Name: wine-docs -Version: 0.9.30 +Version: 0.9.31 Release: 1%{?dist} Summary: Documentation for wine Group: Documentation License: LGPL URL: http://www.winehq.org -Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.30.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.31.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf @@ -37,6 +37,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Sat Feb 17 2007 Andreas Bierfert +0.9.31-1 +- version upgrade + * Wed Feb 07 2007 Andreas Bierfert 0.9.30-1 - version upgrade From fedora-extras-commits at redhat.com Sat Feb 17 09:02:33 2007 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 17 Feb 2007 04:02:33 -0500 Subject: rpms/wine-docs/FC-6 .cvsignore, 1.21, 1.22 sources, 1.21, 1.22 wine-docs.spec, 1.21, 1.22 Message-ID: <200702170902.l1H92XUJ030201@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine-docs/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26550/FC-6 Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-6/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 7 Feb 2007 08:47:02 -0000 1.21 +++ .cvsignore 17 Feb 2007 09:02:01 -0000 1.22 @@ -1 +1 @@ -wine-docs-0.9.30.tar.bz2 +wine-docs-0.9.31.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-6/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 7 Feb 2007 08:47:02 -0000 1.21 +++ sources 17 Feb 2007 09:02:01 -0000 1.22 @@ -1 +1 @@ -99ac7665f88e127b4da9ac1bda5d8688 wine-docs-0.9.30.tar.bz2 +5825e3e3d2a88fc8bcff759a4aef7225 wine-docs-0.9.31.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-6/wine-docs.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- wine-docs.spec 7 Feb 2007 08:47:02 -0000 1.21 +++ wine-docs.spec 17 Feb 2007 09:02:01 -0000 1.22 @@ -1,12 +1,12 @@ Name: wine-docs -Version: 0.9.30 +Version: 0.9.31 Release: 1%{?dist} Summary: Documentation for wine Group: Documentation License: LGPL URL: http://www.winehq.org -Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.30.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.31.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf @@ -37,6 +37,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Sat Feb 17 2007 Andreas Bierfert +0.9.31-1 +- version upgrade + * Wed Feb 07 2007 Andreas Bierfert 0.9.30-1 - version upgrade From fedora-extras-commits at redhat.com Sat Feb 17 10:07:24 2007 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Sat, 17 Feb 2007 05:07:24 -0500 Subject: rpms/libupnp import.log,1.14,1.15 Message-ID: <200702171007.l1HA7OTQ001837@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/libupnp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1803 Modified Files: import.log Log Message: auto-import libupnp-1.4.2-1 on branch devel from libupnp-1.4.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libupnp/import.log,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- import.log 14 Aug 2006 16:30:05 -0000 1.14 +++ import.log 17 Feb 2007 10:06:52 -0000 1.15 @@ -11,3 +11,4 @@ libupnp-1_4_1-1:FC-5:libupnp-1.4.1-1.src.rpm:1155572726 libupnp-1_4_1-1:FC-4:libupnp-1.4.1-1.src.rpm:1155572860 libupnp-1_4_1-1:FC-3:libupnp-1.4.1-1.src.rpm:1155573008 +libupnp-1_4_2-1:HEAD:libupnp-1.4.2-1.src.rpm:1171706799 From fedora-extras-commits at redhat.com Sat Feb 17 10:07:27 2007 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Sat, 17 Feb 2007 05:07:27 -0500 Subject: rpms/libupnp/devel .cvsignore, 1.5, 1.6 libupnp.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200702171007.l1HA7RYO001842@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/libupnp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1803/devel Modified Files: .cvsignore libupnp.spec sources Log Message: auto-import libupnp-1.4.2-1 on branch devel from libupnp-1.4.2-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libupnp/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 14 Aug 2006 16:14:39 -0000 1.5 +++ .cvsignore 17 Feb 2007 10:06:54 -0000 1.6 @@ -1 +1 @@ -libupnp-1.4.1.tar.gz +libupnp-1.4.2.tar.bz2 Index: libupnp.spec =================================================================== RCS file: /cvs/extras/rpms/libupnp/devel/libupnp.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libupnp.spec 28 Aug 2006 07:10:23 -0000 1.9 +++ libupnp.spec 17 Feb 2007 10:06:54 -0000 1.10 @@ -1,15 +1,15 @@ -Version: 1.4.1 +Version: 1.4.2 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 2%{?dist} +Release: 1%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.libupnp.org/ -Source: http://puzzle.dl.sourceforge.net/sourceforge/pupnp/%{name}-%{version}.tar.gz +Source: http://puzzle.dl.sourceforge.net/sourceforge/pupnp/%{name}-%{version}.tar.bz2 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%define docdir %{_docdir}/%{name}-%{version}-%{release} -%define docdeveldir %{_docdir}/%{name}-devel-%{version}-%{release} +%define docdeveldir %{_docdir}/%{name}-devel-%{version} +%define docdir %{_docdir}/%{name}-%{version} %description The Universal Plug and Play (UPnP) SDK for Linux provides @@ -29,7 +29,7 @@ %setup -q %build -%configure --with-docdir=%{docdir}/ +%configure --with-documentation make %{?_smp_mflags} %install @@ -78,8 +78,8 @@ rm -rf %{buildroot} %changelog -* Mon Aug 28 2006 Eric Tanguy - 1.4.1-2 -- Rebuild for Fedora Extras 6 +* Fri Feb 02 2007 Eric Tanguy - 1.4.2-1 +- Update to version 1.4.2 * Wed Jul 05 2006 Eric Tanguy - 1.4.1-1 - Update to version 1.4.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libupnp/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 14 Aug 2006 16:14:39 -0000 1.5 +++ sources 17 Feb 2007 10:06:54 -0000 1.6 @@ -1 +1 @@ -f3b55c24ff77ee6789d758ec1634d5e7 libupnp-1.4.1.tar.gz +6f760cf67132a5aab8b7dfa56456fd42 libupnp-1.4.2.tar.bz2 From fedora-extras-commits at redhat.com Sat Feb 17 10:28:00 2007 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Sat, 17 Feb 2007 05:28:00 -0500 Subject: rpms/libupnp import.log,1.15,1.16 Message-ID: <200702171028.l1HAS0lx002194@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/libupnp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2158 Modified Files: import.log Log Message: auto-import libupnp-1.4.2-1 on branch FC-6 from libupnp-1.4.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libupnp/import.log,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- import.log 17 Feb 2007 10:06:52 -0000 1.15 +++ import.log 17 Feb 2007 10:27:28 -0000 1.16 @@ -12,3 +12,4 @@ libupnp-1_4_1-1:FC-4:libupnp-1.4.1-1.src.rpm:1155572860 libupnp-1_4_1-1:FC-3:libupnp-1.4.1-1.src.rpm:1155573008 libupnp-1_4_2-1:HEAD:libupnp-1.4.2-1.src.rpm:1171706799 +libupnp-1_4_2-1:FC-6:libupnp-1.4.2-1.src.rpm:1171708038 From fedora-extras-commits at redhat.com Sat Feb 17 10:28:03 2007 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Sat, 17 Feb 2007 05:28:03 -0500 Subject: rpms/libupnp/FC-6 .cvsignore, 1.5, 1.6 libupnp.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200702171028.l1HAS3Jg002199@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/libupnp/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2158/FC-6 Modified Files: .cvsignore libupnp.spec sources Log Message: auto-import libupnp-1.4.2-1 on branch FC-6 from libupnp-1.4.2-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libupnp/FC-6/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 14 Aug 2006 16:14:39 -0000 1.5 +++ .cvsignore 17 Feb 2007 10:27:30 -0000 1.6 @@ -1 +1 @@ -libupnp-1.4.1.tar.gz +libupnp-1.4.2.tar.bz2 Index: libupnp.spec =================================================================== RCS file: /cvs/extras/rpms/libupnp/FC-6/libupnp.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libupnp.spec 28 Aug 2006 07:10:23 -0000 1.9 +++ libupnp.spec 17 Feb 2007 10:27:30 -0000 1.10 @@ -1,15 +1,15 @@ -Version: 1.4.1 +Version: 1.4.2 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 2%{?dist} +Release: 1%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.libupnp.org/ -Source: http://puzzle.dl.sourceforge.net/sourceforge/pupnp/%{name}-%{version}.tar.gz +Source: http://puzzle.dl.sourceforge.net/sourceforge/pupnp/%{name}-%{version}.tar.bz2 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%define docdir %{_docdir}/%{name}-%{version}-%{release} -%define docdeveldir %{_docdir}/%{name}-devel-%{version}-%{release} +%define docdeveldir %{_docdir}/%{name}-devel-%{version} +%define docdir %{_docdir}/%{name}-%{version} %description The Universal Plug and Play (UPnP) SDK for Linux provides @@ -29,7 +29,7 @@ %setup -q %build -%configure --with-docdir=%{docdir}/ +%configure --with-documentation make %{?_smp_mflags} %install @@ -78,8 +78,8 @@ rm -rf %{buildroot} %changelog -* Mon Aug 28 2006 Eric Tanguy - 1.4.1-2 -- Rebuild for Fedora Extras 6 +* Fri Feb 02 2007 Eric Tanguy - 1.4.2-1 +- Update to version 1.4.2 * Wed Jul 05 2006 Eric Tanguy - 1.4.1-1 - Update to version 1.4.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libupnp/FC-6/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 14 Aug 2006 16:14:39 -0000 1.5 +++ sources 17 Feb 2007 10:27:30 -0000 1.6 @@ -1 +1 @@ -f3b55c24ff77ee6789d758ec1634d5e7 libupnp-1.4.1.tar.gz +6f760cf67132a5aab8b7dfa56456fd42 libupnp-1.4.2.tar.bz2 From fedora-extras-commits at redhat.com Sat Feb 17 10:29:41 2007 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Sat, 17 Feb 2007 05:29:41 -0500 Subject: rpms/libupnp import.log,1.16,1.17 Message-ID: <200702171029.l1HATfPf002349@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/libupnp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2286 Modified Files: import.log Log Message: auto-import libupnp-1.4.2-1 on branch FC-5 from libupnp-1.4.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libupnp/import.log,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- import.log 17 Feb 2007 10:27:28 -0000 1.16 +++ import.log 17 Feb 2007 10:29:09 -0000 1.17 @@ -13,3 +13,4 @@ libupnp-1_4_1-1:FC-3:libupnp-1.4.1-1.src.rpm:1155573008 libupnp-1_4_2-1:HEAD:libupnp-1.4.2-1.src.rpm:1171706799 libupnp-1_4_2-1:FC-6:libupnp-1.4.2-1.src.rpm:1171708038 +libupnp-1_4_2-1:FC-5:libupnp-1.4.2-1.src.rpm:1171708140 From fedora-extras-commits at redhat.com Sat Feb 17 10:29:44 2007 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Sat, 17 Feb 2007 05:29:44 -0500 Subject: rpms/libupnp/FC-5 .cvsignore, 1.4, 1.5 libupnp.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200702171029.l1HATi9B002355@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/libupnp/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2286/FC-5 Modified Files: .cvsignore libupnp.spec sources Log Message: auto-import libupnp-1.4.2-1 on branch FC-5 from libupnp-1.4.2-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libupnp/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 14 Aug 2006 16:25:26 -0000 1.4 +++ .cvsignore 17 Feb 2007 10:29:12 -0000 1.5 @@ -1 +1 @@ -libupnp-1.4.1.tar.gz +libupnp-1.4.2.tar.bz2 Index: libupnp.spec =================================================================== RCS file: /cvs/extras/rpms/libupnp/FC-5/libupnp.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libupnp.spec 14 Aug 2006 16:25:26 -0000 1.5 +++ libupnp.spec 17 Feb 2007 10:29:12 -0000 1.6 @@ -1,15 +1,15 @@ -Version: 1.4.1 +Version: 1.4.2 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp Release: 1%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.libupnp.org/ -Source: http://puzzle.dl.sourceforge.net/sourceforge/pupnp/%{name}-%{version}.tar.gz +Source: http://puzzle.dl.sourceforge.net/sourceforge/pupnp/%{name}-%{version}.tar.bz2 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%define docdir %{_docdir}/%{name}-%{version}-%{release} -%define docdeveldir %{_docdir}/%{name}-devel-%{version}-%{release} +%define docdeveldir %{_docdir}/%{name}-devel-%{version} +%define docdir %{_docdir}/%{name}-%{version} %description The Universal Plug and Play (UPnP) SDK for Linux provides @@ -29,7 +29,7 @@ %setup -q %build -%configure --with-docdir=%{docdir}/ +%configure --with-documentation make %{?_smp_mflags} %install @@ -78,6 +78,9 @@ rm -rf %{buildroot} %changelog +* Fri Feb 02 2007 Eric Tanguy - 1.4.2-1 +- Update to version 1.4.2 + * Wed Jul 05 2006 Eric Tanguy - 1.4.1-1 - Update to version 1.4.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libupnp/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 14 Aug 2006 16:25:26 -0000 1.4 +++ sources 17 Feb 2007 10:29:12 -0000 1.5 @@ -1 +1 @@ -f3b55c24ff77ee6789d758ec1634d5e7 libupnp-1.4.1.tar.gz +6f760cf67132a5aab8b7dfa56456fd42 libupnp-1.4.2.tar.bz2 From fedora-extras-commits at redhat.com Sat Feb 17 12:44:47 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik)) Date: Sat, 17 Feb 2007 07:44:47 -0500 Subject: rpms/sonata/devel sonata.spec,1.1,1.2 Message-ID: <200702171244.l1HCilDq010917@cvs-int.fedora.redhat.com> Author: ecik Update of /cvs/extras/rpms/sonata/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10897 Modified Files: sonata.spec Log Message: * Sat Feb 17 2007 Micha?? Bentkowski - 1.0.1-3 - Rebuild Index: sonata.spec =================================================================== RCS file: /cvs/extras/rpms/sonata/devel/sonata.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sonata.spec 15 Feb 2007 14:32:13 -0000 1.1 +++ sonata.spec 17 Feb 2007 12:44:14 -0000 1.2 @@ -2,7 +2,7 @@ Name: sonata Version: 1.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An elegant GTK+ client for the Music Player Daemon (MPD) Group: Applications/Multimedia License: GPL @@ -66,6 +66,9 @@ %changelog +* Sat Feb 17 2007 Micha?? Bentkowski - 1.0.1-3 +- Rebuild + * Wed Feb 14 2007 Micha?? Bentkowski - 1.0.1-2 - Add dbus-python and gnome-python2-libegg dependencies From fedora-extras-commits at redhat.com Sat Feb 17 13:28:21 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Sat, 17 Feb 2007 08:28:21 -0500 Subject: rpms/hunspell-ms import.log,1.1,1.2 Message-ID: <200702171328.l1HDSLLF014861@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-ms In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14825 Modified Files: import.log Log Message: auto-import hunspell-ms-0.20050117-1 on branch devel from hunspell-ms-0.20050117-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/hunspell-ms/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 16 Feb 2007 00:32:22 -0000 1.1 +++ import.log 17 Feb 2007 13:27:49 -0000 1.2 @@ -0,0 +1 @@ +hunspell-ms-0_20050117-1:HEAD:hunspell-ms-0.20050117-1.src.rpm:1171718963 From fedora-extras-commits at redhat.com Sat Feb 17 13:28:24 2007 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Sat, 17 Feb 2007 08:28:24 -0500 Subject: rpms/hunspell-ms/devel hunspell-ms.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702171328.l1HDSOhM014865@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/extras/rpms/hunspell-ms/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14825/devel Modified Files: .cvsignore sources Added Files: hunspell-ms.spec Log Message: auto-import hunspell-ms-0.20050117-1 on branch devel from hunspell-ms-0.20050117-1.src.rpm --- NEW FILE hunspell-ms.spec --- Name: hunspell-ms Summary: Malay hunspell dictionaries %define upstreamid 20050117 Version: 0.%{upstreamid} Release: 1%{?dist} Source: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/ms_MY.zip Group: Applications/Text URL: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: GFDL BuildArch: noarch Requires: hunspell %description Malay hunspell dictionaries. %prep %setup -q -c -n hunspell-ms %build chmod -x * %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell pushd $RPM_BUILD_ROOT/%{_datadir}/myspell/ ms_MY_aliases="ms_BN" for lang in $ms_MY_aliases; do ln -s ms_MY.aff $lang.aff ln -s ms_MY.dic $lang.dic done %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README_ms_MY.txt %{_datadir}/myspell/* %changelog * Thu Dec 07 2006 Caolan McNamara - 0.20050117-1 - initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hunspell-ms/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 16 Feb 2007 00:32:29 -0000 1.1 +++ .cvsignore 17 Feb 2007 13:27:52 -0000 1.2 @@ -0,0 +1 @@ +ms_MY.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/hunspell-ms/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 16 Feb 2007 00:32:29 -0000 1.1 +++ sources 17 Feb 2007 13:27:52 -0000 1.2 @@ -0,0 +1 @@ +4b984b699541c12e1bd81b2f5f7b0050 ms_MY.zip From fedora-extras-commits at redhat.com Sat Feb 17 13:36:45 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Sat, 17 Feb 2007 08:36:45 -0500 Subject: rpms/skencil/devel skencil.spec,1.16,1.17 Message-ID: <200702171336.l1HDajY4015072@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/skencil/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15055 Modified Files: skencil.spec Log Message: rebuild for tcltk 8.4 again Index: skencil.spec =================================================================== RCS file: /cvs/extras/rpms/skencil/devel/skencil.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- skencil.spec 5 Feb 2007 23:08:02 -0000 1.16 +++ skencil.spec 17 Feb 2007 13:36:13 -0000 1.17 @@ -1,6 +1,6 @@ Name: skencil Version: 0.6.17 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Vector drawing program @@ -45,7 +45,7 @@ %patch0 -p1 grep -rl lib/ . | xargs perl -pi -e's,lib/,%{_lib}/,g' grep -rl lib\' . | xargs perl -pi -es,lib\',%{_lib}\',g -sed -i 's|8.4|8.5|' setup.py +#sed -i 's|8.4|8.5|' setup.py %build find \( -name \*.sk -or -name \*.ppm -or -name \*.jpg \) -exec chmod 644 \{\} \; @@ -118,6 +118,9 @@ %changelog +* Sat Feb 17 2007 Gerard Milmeister - 0.6.17-13 +- rebuild for tcltk 8.4 again + * Tue Feb 6 2007 Gerard Milmeister - 0.6.17-11 - add support for tcltk 8.5 From fedora-extras-commits at redhat.com Sat Feb 17 14:47:40 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik)) Date: Sat, 17 Feb 2007 09:47:40 -0500 Subject: rpms/sonata/FC-6 sonata.spec,1.1,1.2 Message-ID: <200702171447.l1HEleHa019182@cvs-int.fedora.redhat.com> Author: ecik Update of /cvs/extras/rpms/sonata/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19162 Modified Files: sonata.spec Log Message: * Sat Feb 17 2007 Micha?? Bentkowski - 1.0.1-3 - Rebuild Index: sonata.spec =================================================================== RCS file: /cvs/extras/rpms/sonata/FC-6/sonata.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sonata.spec 15 Feb 2007 15:52:34 -0000 1.1 +++ sonata.spec 17 Feb 2007 14:47:08 -0000 1.2 @@ -2,7 +2,7 @@ Name: sonata Version: 1.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An elegant GTK+ client for the Music Player Daemon (MPD) Group: Applications/Multimedia License: GPL @@ -66,6 +66,9 @@ %changelog +* Sat Feb 17 2007 Micha?? Bentkowski - 1.0.1-3 +- Rebuild + * Wed Feb 14 2007 Micha?? Bentkowski - 1.0.1-2 - Add dbus-python and gnome-python2-libegg dependencies From fedora-extras-commits at redhat.com Sat Feb 17 15:07:33 2007 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Sat, 17 Feb 2007 10:07:33 -0500 Subject: rpms/cfitsio/devel cfitsio.spec,1.19,1.20 Message-ID: <200702171507.l1HF7Xl3022762@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/cfitsio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22745 Modified Files: cfitsio.spec Log Message: Don't let configure clobber CFLAGS so we get useful debuginfo packages. Bugzilla 229041 Index: cfitsio.spec =================================================================== RCS file: /cvs/extras/rpms/cfitsio/devel/cfitsio.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- cfitsio.spec 8 Jan 2007 15:23:23 -0000 1.19 +++ cfitsio.spec 17 Feb 2007 15:07:00 -0000 1.20 @@ -1,6 +1,6 @@ Name: cfitsio Version: 3.030 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library for manipulating FITS data files Group: Development/Libraries @@ -28,6 +28,7 @@ Group: Development/Libraries Summary: Headers required when building programs against cfitsio Requires: %{name} = %{version}-%{release} +Requires: pkgconfig %description devel Headers required when building a program against the cfitsio library. @@ -39,6 +40,7 @@ %build FC=f95 export FC +export CC=gcc # fixes -O*, -g %configure make shared %{?_smp_mflags} unset FC @@ -74,6 +76,12 @@ %{_libdir}/pkgconfig/cfitsio.pc %changelog +* Fri Feb 16 2007 Matthew Truch - 3.030-2 +- Require pkgconfig for -devel. +- export CC=gcc so we don't clobber $RPM_OPT_FLAGS, thereby + ruining any -debuginfo packages. + See RedHat Bugzilla 229041. + * Fri Jan 5 2007 Matthew Truch - 3.030-1 - Upgrade to version 3.020 of cfitsio. From fedora-extras-commits at redhat.com Sat Feb 17 15:26:39 2007 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Sat, 17 Feb 2007 10:26:39 -0500 Subject: rpms/cfitsio/FC-5 cfitsio.spec,1.17,1.18 Message-ID: <200702171526.l1HFQds0023016@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/cfitsio/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22948/FC-5 Modified Files: cfitsio.spec Log Message: Fix for Bugzilla Bug 229041 in FC-5 and FC-6 -Don't let configure clobber CFLAGS so we can produce valid debuginfo. Index: cfitsio.spec =================================================================== RCS file: /cvs/extras/rpms/cfitsio/FC-5/cfitsio.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- cfitsio.spec 8 Jan 2007 16:08:12 -0000 1.17 +++ cfitsio.spec 17 Feb 2007 15:26:07 -0000 1.18 @@ -1,6 +1,6 @@ Name: cfitsio Version: 3.030 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library for manipulating FITS data files Group: Development/Libraries @@ -28,6 +28,7 @@ Group: Development/Libraries Summary: Headers required when building programs against cfitsio Requires: %{name} = %{version}-%{release} +Requires: pkgconfig %description devel Headers required when building a program against the cfitsio library. @@ -39,6 +40,7 @@ %build FC=f95 export FC +export CC=gcc # fixes -O*, -g %configure make shared %{?_smp_mflags} unset FC @@ -74,6 +76,12 @@ %{_libdir}/pkgconfig/cfitsio.pc %changelog +* Sat Feb 17 2007 Matthew Truch - 3.030-2 +- Require pkgconfig for -devel. +- export CC=gcc so we don't clobber $RPM_OPT_FLAGS, thereby + ruining any -debuginfo packages. + See RedHat Bugzilla 229041. + * Mon Jan 8 2007 Matthew Truch - 3.030-1 - Upgrade to 3.030. From fedora-extras-commits at redhat.com Sat Feb 17 15:26:42 2007 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Sat, 17 Feb 2007 10:26:42 -0500 Subject: rpms/cfitsio/FC-6 cfitsio.spec,1.18,1.19 Message-ID: <200702171526.l1HFQgPJ023019@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/cfitsio/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22948/FC-6 Modified Files: cfitsio.spec Log Message: Fix for Bugzilla Bug 229041 in FC-5 and FC-6 -Don't let configure clobber CFLAGS so we can produce valid debuginfo. Index: cfitsio.spec =================================================================== RCS file: /cvs/extras/rpms/cfitsio/FC-6/cfitsio.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- cfitsio.spec 8 Jan 2007 16:27:14 -0000 1.18 +++ cfitsio.spec 17 Feb 2007 15:26:09 -0000 1.19 @@ -1,6 +1,6 @@ Name: cfitsio Version: 3.030 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library for manipulating FITS data files Group: Development/Libraries @@ -28,6 +28,7 @@ Group: Development/Libraries Summary: Headers required when building programs against cfitsio Requires: %{name} = %{version}-%{release} +Requires: pkgconfig %description devel Headers required when building a program against the cfitsio library. @@ -39,6 +40,7 @@ %build FC=f95 export FC +export CC=gcc # fixes -O*, -g %configure make shared %{?_smp_mflags} unset FC @@ -74,6 +76,12 @@ %{_libdir}/pkgconfig/cfitsio.pc %changelog +* Sat Feb 17 2007 Matthew Truch - 3.030-2 +- Require pkgconfig for -devel. +- export CC=gcc so we don't clobber $RPM_OPT_FLAGS, thereby + ruining any -debuginfo packages. + See RedHat Bugzilla 229041. + * Mon Jan 8 2007 Matthew Truch - 3.030-1 - Upgrade to 3.030 from upstream. From fedora-extras-commits at redhat.com Sat Feb 17 16:10:01 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sat, 17 Feb 2007 11:10:01 -0500 Subject: rpms/jd/devel .cvsignore, 1.71, 1.72 jd.spec, 1.82, 1.83 sources, 1.71, 1.72 Message-ID: <200702171610.l1HGA1Nh031061@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30963 Modified Files: .cvsignore jd.spec sources Log Message: * Sat Feb 17 2007 Mamoru Tasaka - 1.8.5-2.cvs070217 - cvs 070217 (24:50 JST) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- .cvsignore 16 Feb 2007 16:49:25 -0000 1.71 +++ .cvsignore 17 Feb 2007 16:09:28 -0000 1.72 @@ -1 +1 @@ -jd-1.8.5-cvs070216.tgz +jd-1.8.5-cvs070217.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- jd.spec 16 Feb 2007 16:49:25 -0000 1.82 +++ jd.spec 17 Feb 2007 16:09:28 -0000 1.83 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 1.8.5 -%define strtag cvs070216 +%define strtag cvs070217 %define repoid 23816 @@ -106,8 +106,8 @@ %{icondir}/%{name}.png %changelog -* Thu Feb 16 2007 Mamoru Tasaka - 1.8.5-2.cvs070216 -- cvs 070216 (23:45 JST) +* Sat Feb 17 2007 Mamoru Tasaka - 1.8.5-2.cvs070217 +- cvs 070217 (24:50 JST) * Fri Feb 2 2007 Mamoru Tasaka - 1.8.5-1 - 1.8.5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- sources 16 Feb 2007 16:49:25 -0000 1.71 +++ sources 17 Feb 2007 16:09:28 -0000 1.72 @@ -1 +1 @@ -ed7f7355088e7a4f744a6ea7e1f4608d jd-1.8.5-cvs070216.tgz +9508f012a42d11b95e6ba44fc25a014c jd-1.8.5-cvs070217.tgz From fedora-extras-commits at redhat.com Sun Feb 18 00:13:11 2007 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sat, 17 Feb 2007 19:13:11 -0500 Subject: rpms/boo import.log,1.8,1.9 Message-ID: <200702180013.l1I0DBGO002067@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/boo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2035 Modified Files: import.log Log Message: auto-import boo-0.7.6.2237-13 on branch devel from boo-0.7.6.2237-13.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/boo/import.log,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- import.log 11 Feb 2007 13:16:25 -0000 1.8 +++ import.log 18 Feb 2007 00:12:39 -0000 1.9 @@ -5,3 +5,4 @@ boo-0_7_6_2237-8:HEAD:boo-0.7.6.2237-8.src.rpm:1154988521 boo-0_7_6_2237-12:HEAD:boo-0.7.6.2237-12.src.rpm:1171199678 boo-0_7_6_2237-12:FC-6:boo-0.7.6.2237-12.src.rpm:1171199772 +boo-0_7_6_2237-13:HEAD:boo-0.7.6.2237-13.src.rpm:1171757545 From fedora-extras-commits at redhat.com Sun Feb 18 00:13:13 2007 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sat, 17 Feb 2007 19:13:13 -0500 Subject: rpms/boo/devel boo.spec,1.6,1.7 Message-ID: <200702180013.l1I0DDYY002070@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/boo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2035/devel Modified Files: boo.spec Log Message: auto-import boo-0.7.6.2237-13 on branch devel from boo-0.7.6.2237-13.src.rpm Index: boo.spec =================================================================== RCS file: /cvs/extras/rpms/boo/devel/boo.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- boo.spec 11 Feb 2007 13:14:54 -0000 1.6 +++ boo.spec 18 Feb 2007 00:12:41 -0000 1.7 @@ -7,7 +7,7 @@ Summary: Boo is an OO statically typed language for CLI Name: boo Version: 0.7.6.2237 -Release: 12%{?dist} +Release: 13%{?dist} License: MIT Group: Development/Languages BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -33,6 +33,9 @@ %setup -q %if "%{?fedora}" > "5" %patch0 -p1 -b .original +sed -i -e 's!${libdir}!%{monodir}!' extras/booc.in +sed -i -e 's!${libdir}!%{monodir}!' extras/booi.in +sed -i -e 's!${libdir}!%{monodir}!' extras/booish.in %endif %build @@ -71,6 +74,9 @@ %{monodir}/pkgconfig/boo.pc %changelog +* Sun Feb 18 2007 Paul F. Johnson 0.7.6-2237-13 +- fix for correct libdir in bin scripts + * Wed Dec 20 2006 Paul F. Johnson 0.7.6-2237-11 - fix for correct libdir From fedora-extras-commits at redhat.com Sun Feb 18 00:14:42 2007 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sat, 17 Feb 2007 19:14:42 -0500 Subject: rpms/boo import.log,1.9,1.10 Message-ID: <200702180014.l1I0EgbP002158@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/boo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2126 Modified Files: import.log Log Message: auto-import boo-0.7.6.2237-13 on branch FC-6 from boo-0.7.6.2237-13.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/boo/import.log,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- import.log 18 Feb 2007 00:12:39 -0000 1.9 +++ import.log 18 Feb 2007 00:14:09 -0000 1.10 @@ -6,3 +6,4 @@ boo-0_7_6_2237-12:HEAD:boo-0.7.6.2237-12.src.rpm:1171199678 boo-0_7_6_2237-12:FC-6:boo-0.7.6.2237-12.src.rpm:1171199772 boo-0_7_6_2237-13:HEAD:boo-0.7.6.2237-13.src.rpm:1171757545 +boo-0_7_6_2237-13:FC-6:boo-0.7.6.2237-13.src.rpm:1171757633 From fedora-extras-commits at redhat.com Sun Feb 18 00:14:45 2007 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sat, 17 Feb 2007 19:14:45 -0500 Subject: rpms/boo/FC-6 boo.spec,1.6,1.7 Message-ID: <200702180014.l1I0EjVb002161@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/boo/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2126/FC-6 Modified Files: boo.spec Log Message: auto-import boo-0.7.6.2237-13 on branch FC-6 from boo-0.7.6.2237-13.src.rpm Index: boo.spec =================================================================== RCS file: /cvs/extras/rpms/boo/FC-6/boo.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- boo.spec 11 Feb 2007 13:16:28 -0000 1.6 +++ boo.spec 18 Feb 2007 00:14:12 -0000 1.7 @@ -7,7 +7,7 @@ Summary: Boo is an OO statically typed language for CLI Name: boo Version: 0.7.6.2237 -Release: 12%{?dist} +Release: 13%{?dist} License: MIT Group: Development/Languages BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -33,6 +33,9 @@ %setup -q %if "%{?fedora}" > "5" %patch0 -p1 -b .original +sed -i -e 's!${libdir}!%{monodir}!' extras/booc.in +sed -i -e 's!${libdir}!%{monodir}!' extras/booi.in +sed -i -e 's!${libdir}!%{monodir}!' extras/booish.in %endif %build @@ -71,6 +74,9 @@ %{monodir}/pkgconfig/boo.pc %changelog +* Sun Feb 18 2007 Paul F. Johnson 0.7.6-2237-13 +- fix for correct libdir in bin scripts + * Wed Dec 20 2006 Paul F. Johnson 0.7.6-2237-11 - fix for correct libdir From fedora-extras-commits at redhat.com Sun Feb 18 02:10:33 2007 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sat, 17 Feb 2007 21:10:33 -0500 Subject: rpms/wormux/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 wormux.spec, 1.5, 1.6 Message-ID: <200702180210.l1I2AXY7010824@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/wormux/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10734 Modified Files: .cvsignore sources wormux.spec Log Message: Update to 0.7.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wormux/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 Sep 2006 00:31:31 -0000 1.3 +++ .cvsignore 18 Feb 2007 02:10:01 -0000 1.4 @@ -1 +1 @@ -wormux-0.7.4.tar.gz +wormux-0.7.9.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wormux/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Sep 2006 00:31:31 -0000 1.3 +++ sources 18 Feb 2007 02:10:01 -0000 1.4 @@ -1 +1 @@ -271de7da072bc4e8c023f55e85a42eb0 wormux-0.7.4.tar.gz +d921ae5bad243dec7bb6825d6e0b9d16 wormux-0.7.9.tar.gz Index: wormux.spec =================================================================== RCS file: /cvs/extras/rpms/wormux/devel/wormux.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- wormux.spec 3 Sep 2006 00:05:35 -0000 1.5 +++ wormux.spec 18 Feb 2007 02:10:01 -0000 1.6 @@ -1,5 +1,5 @@ Name: wormux -Version: 0.7.4 +Version: 0.7.9 Release: 1%{?dist} Summary: 2D convivial mass murder game @@ -11,7 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_image-devel SDL_gfx-devel SDL_mixer-devel -BuildRequires: SDL_ttf-devel SDL_net-devel +BuildRequires: SDL_ttf-devel SDL_net-devel curl-devel BuildRequires: gettext libxml++-devel desktop-file-utils Requires: wormux-data @@ -50,7 +50,7 @@ Exec=wormux Icon=wormux.png Terminal=false -Categories=Application;Game;ArcadeGame; +Categories=Game;ArcadeGame; Type=Application EOF @@ -91,6 +91,9 @@ %{_datadir}/%{name} %changelog +* Sat Feb 17 2007 Wart 0.7.9-1 +- Update to 0.7.9 + * Fri Sep 1 2006 Wart 0.7.4-1 - Update to 0.7.4 From fedora-extras-commits at redhat.com Sun Feb 18 02:54:51 2007 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sat, 17 Feb 2007 21:54:51 -0500 Subject: rpms/wormux/FC-6 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 wormux.spec, 1.5, 1.6 Message-ID: <200702180254.l1I2spK9016239@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/wormux/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16107 Modified Files: .cvsignore sources wormux.spec Log Message: Update to 0.7.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wormux/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 Sep 2006 00:31:31 -0000 1.3 +++ .cvsignore 18 Feb 2007 02:54:18 -0000 1.4 @@ -1 +1 @@ -wormux-0.7.4.tar.gz +wormux-0.7.9.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wormux/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Sep 2006 00:31:31 -0000 1.3 +++ sources 18 Feb 2007 02:54:18 -0000 1.4 @@ -1 +1 @@ -271de7da072bc4e8c023f55e85a42eb0 wormux-0.7.4.tar.gz +d921ae5bad243dec7bb6825d6e0b9d16 wormux-0.7.9.tar.gz Index: wormux.spec =================================================================== RCS file: /cvs/extras/rpms/wormux/FC-6/wormux.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- wormux.spec 3 Sep 2006 00:05:35 -0000 1.5 +++ wormux.spec 18 Feb 2007 02:54:18 -0000 1.6 @@ -1,5 +1,5 @@ Name: wormux -Version: 0.7.4 +Version: 0.7.9 Release: 1%{?dist} Summary: 2D convivial mass murder game @@ -11,7 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_image-devel SDL_gfx-devel SDL_mixer-devel -BuildRequires: SDL_ttf-devel SDL_net-devel +BuildRequires: SDL_ttf-devel SDL_net-devel curl-devel BuildRequires: gettext libxml++-devel desktop-file-utils Requires: wormux-data @@ -50,7 +50,7 @@ Exec=wormux Icon=wormux.png Terminal=false -Categories=Application;Game;ArcadeGame; +Categories=Game;ArcadeGame; Type=Application EOF @@ -91,6 +91,9 @@ %{_datadir}/%{name} %changelog +* Sat Feb 17 2007 Wart 0.7.9-1 +- Update to 0.7.9 + * Fri Sep 1 2006 Wart 0.7.4-1 - Update to 0.7.4 From fedora-extras-commits at redhat.com Sun Feb 18 07:48:10 2007 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Sun, 18 Feb 2007 02:48:10 -0500 Subject: rpms/NetworkManager-vpnc/FC-6 NetworkManager-vpnc-0.6.4-keepalive.patch, NONE, 1.1 NetworkManager-vpnc.spec, 1.21, 1.22 Message-ID: <200702180748.l1I7mAP8007117@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/NetworkManager-vpnc/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7094 Modified Files: NetworkManager-vpnc.spec Added Files: NetworkManager-vpnc-0.6.4-keepalive.patch Log Message: Readded NAT-keepalive support patch from SVN branch NetworkManager-vpnc-0.6.4-keepalive.patch: --- NEW FILE NetworkManager-vpnc-0.6.4-keepalive.patch --- diff -u -r -N NetworkManager-vpnc-0.6.4.orig/properties/nm-vpnc.c NetworkManager-vpnc-0.6.4/properties/nm-vpnc.c --- NetworkManager-vpnc-0.6.4.orig/properties/nm-vpnc.c 2006-04-11 22:44:14.000000000 +0200 +++ NetworkManager-vpnc-0.6.4/properties/nm-vpnc.c 2007-02-17 08:17:41.000000000 +0100 @@ -1,5 +1,5 @@ /*************************************************************************** - * CVSID: $Id: nm-vpnc.c,v 1.5.2.1 2006/04/10 20:34:25 rml Exp $ + * CVSID: $Id: nm-vpnc.c,v 1.5.2.3 2006/11/01 16:33:28 tambeti Exp $ * * nm-vpnc.c : GNOME UI dialogs for configuring vpnc VPN connections * @@ -31,6 +31,7 @@ #define NM_VPN_API_SUBJECT_TO_CHANGE #include +#include "pcf-file.h" typedef struct _NetworkManagerVpnUIImpl NetworkManagerVpnUIImpl; @@ -478,95 +479,85 @@ static gboolean import_from_file (NetworkManagerVpnUIImpl *impl, const char *path) { - char *basename; - GKeyFile *keyfile; - gboolean file_is_good; - - /*printf ("path='%s'\n", path);*/ - - file_is_good = FALSE; - basename = g_path_get_basename (path); - - keyfile = g_key_file_new (); - if (g_key_file_load_from_file (keyfile, path, 0, NULL)) { - char *connectionname = NULL; - char *gateway = NULL; - char *groupname = NULL; - char *username = NULL; - char *domain = NULL; - char *tunneling_mode = NULL; - char *routes = NULL; - gboolean should_expand; - - if ((connectionname = g_key_file_get_string (keyfile, "main", "Description", NULL)) == NULL) - goto error; - if ((gateway = g_key_file_get_string (keyfile, "main", "Host", NULL)) == NULL) - goto error; - if ((groupname = g_key_file_get_string (keyfile, "main", "GroupName", NULL)) == NULL) - goto error; - if ((username = g_key_file_get_string (keyfile, "main", "Username", NULL)) == NULL) - goto error; - if ((domain = g_key_file_get_string (keyfile, "main", "NTDomain", NULL)) == NULL) - goto error; - if ((tunneling_mode = g_key_file_get_string (keyfile, "main", "TunnelingMode", NULL)) == NULL) - goto error; - - /* may not exist */ - if ((routes = g_key_file_get_string (keyfile, "main", "X-NM-Routes", NULL)) == NULL) - routes = g_strdup (""); - - /* sanity check data */ - if (! (strlen (gateway) > 0 && - strlen (groupname) > 0)) - goto error; - - gtk_entry_set_text (impl->w_connection_name, connectionname); - gtk_entry_set_text (impl->w_gateway, gateway); - gtk_entry_set_text (impl->w_group_name, groupname); - - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_alternate_username), strlen (username) > 0); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_routes), strlen (routes) > 0); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_domain), strlen (domain) > 0); - gtk_entry_set_text (impl->w_username, username); - gtk_entry_set_text (impl->w_routes, routes); - gtk_entry_set_text (impl->w_domain, domain); - gtk_widget_set_sensitive (GTK_WIDGET (impl->w_username), strlen (username) > 0); - gtk_widget_set_sensitive (GTK_WIDGET (impl->w_routes), strlen (routes) > 0); - gtk_widget_set_sensitive (GTK_WIDGET (impl->w_domain), strlen (username) > 0); + GHashTable *pcf; + const char *buf; + gboolean have_value; + char *basename = NULL; + gboolean expand = FALSE; + gboolean success = FALSE; + + pcf = pcf_file_load (path); + if (pcf == NULL) + return FALSE; - should_expand = (strlen (username) > 0) || (strlen (domain) > 0) || (strlen (routes) > 0); - gtk_expander_set_expanded (impl->w_opt_info_expander, should_expand); + /* Connection name */ + if ((buf = pcf_file_lookup_value (pcf, "main", "Description")) == NULL || strlen (buf) < 1) + goto error; + gtk_entry_set_text (impl->w_connection_name, buf); + + /* Gateway */ + if ((buf = pcf_file_lookup_value (pcf, "main", "Host")) == NULL || strlen (buf) < 1) + goto error; + gtk_entry_set_text (impl->w_gateway, buf); + + /* Group name */ + if ((buf = pcf_file_lookup_value (pcf, "main", "GroupName")) == NULL || strlen (buf) < 1) + goto error; + gtk_entry_set_text (impl->w_group_name, buf); + + /* Optional settings */ + + if ((buf = pcf_file_lookup_value (pcf, "main", "UserName"))) + gtk_entry_set_text (impl->w_username, buf); + have_value = buf == NULL ? FALSE : strlen (buf) > 0; + expand |= have_value; + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_alternate_username), have_value); + gtk_widget_set_sensitive (GTK_WIDGET (impl->w_username), have_value); + gtk_widget_set_sensitive (GTK_WIDGET (impl->w_domain), have_value); + + if ((buf = pcf_file_lookup_value (pcf, "main", "NTDomain"))) + gtk_entry_set_text (impl->w_domain, buf); + have_value = buf == NULL ? FALSE : strlen (buf) > 0; + expand |= have_value; + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_domain), have_value); + + if ((buf = pcf_file_lookup_value (pcf, "main", "X-NM-Routes"))) + gtk_entry_set_text (impl->w_routes, buf); + have_value = buf == NULL ? FALSE : strlen (buf) > 0; + expand |= have_value; + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_routes), have_value); + gtk_widget_set_sensitive (GTK_WIDGET (impl->w_routes), have_value); + + gtk_expander_set_expanded (impl->w_opt_info_expander, expand); + if ((buf = pcf_file_lookup_value (pcf, "main", "TunnelingMode"))) { /* If applicable, put up warning that TCP tunneling will be disabled */ - if (strcmp (tunneling_mode, "1") == 0) { + + if (strncmp (buf, "1", 1) == 0) { GtkWidget *dialog; - dialog = gtk_message_dialog_new (NULL, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_WARNING, - GTK_BUTTONS_CLOSE, - _("TCP tunneling not supported")); + basename = g_path_get_basename (path); + dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE, + _("TCP tunneling not supported")); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - _("The VPN settings file '%s' specifies that VPN traffic should be tunneled through TCP which is currently not supported in the vpnc software.\n\nThe connection can still be created, with TCP tunneling disabled, however it may not work as expected."), basename); + _("The VPN settings file '%s' specifies that VPN traffic should be tunneled through TCP which is currently not supported in the vpnc software.\n\nThe connection can still be created, with TCP tunneling disabled, however it may not work as expected."), basename); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } + } - file_is_good = TRUE; + success = TRUE; - error: - g_free (connectionname); - g_free (gateway); - g_free (groupname); - g_free (username); - g_free (domain); - g_free (tunneling_mode); - } - g_key_file_free (keyfile); + error: + g_hash_table_destroy (pcf); - if (!file_is_good) { + if (!success) { GtkWidget *dialog; - + + if (!basename) + basename = g_path_get_basename (path); + dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, @@ -580,7 +571,7 @@ g_free (basename); - return file_is_good; + return success; } static void diff -u -r -N NetworkManager-vpnc-0.6.4.orig/properties/pcf-file.c NetworkManager-vpnc-0.6.4/properties/pcf-file.c --- NetworkManager-vpnc-0.6.4.orig/properties/pcf-file.c 1970-01-01 01:00:00.000000000 +0100 +++ NetworkManager-vpnc-0.6.4/properties/pcf-file.c 2006-11-28 11:23:14.000000000 +0100 @@ -0,0 +1,184 @@ +#include +#include +#include +#include + +#include "pcf-file.h" + +static void +pcf_entry_free (PcfEntry *entry) +{ + if (entry) { + g_free (entry->key); + g_free (entry->value); + g_free (entry); + } +} + +/* Stolen from gaim */ + +static char * +pcf_utf8_try_convert (const char *str) +{ + char *utf8; + gsize converted; + + if (!str) + return NULL; + + if (g_utf8_validate (str, -1, NULL)) + return g_strdup (str); + + utf8 = g_locale_to_utf8 (str, -1, NULL, NULL, NULL); + if (utf8) + return utf8; + + utf8 = g_convert (str, -1, "UTF-8", "ISO-8859-15", &converted, NULL, NULL); + if (utf8 && converted == strlen (str)) + return utf8; + + g_free (utf8); + return NULL; +} + +/* + The main reader loop here is based on the simple .ini file + parser from avahi/avahi-daemon/ini-file-parser.c +*/ + +GHashTable * +pcf_file_load (const char *fname) +{ + FILE *fo; + unsigned line; + GHashTable *pcf; + GHashTable *group = NULL; + + g_return_val_if_fail (fname != NULL, NULL); + + if (!(fo = fopen (fname, "r"))) { + g_warning ("Failed to open file '%s': %s", fname, strerror (errno)); + return NULL; + } + + pcf = g_hash_table_new_full (g_str_hash, g_str_equal, + g_free, + (GDestroyNotify) g_hash_table_destroy); + + line = 0; + while (!feof (fo)) { + char ln[256], *s, *e; + + if (!(fgets (ln, sizeof (ln), fo))) + break; + + line++; + + s = ln + strspn (ln, " \t"); + s[strcspn (s, "\r\n")] = 0; + + /* Skip comments and empty lines */ + if (*s == ';' || *s == 0) + continue; + + if (*s == '[') { + /* new group */ + + if (!(e = strchr (s, ']'))) { + g_warning ("Unclosed group header in %s:%u: <%s>", fname, line, s); + goto fail; + } + + *e = 0; + + group = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, + (GDestroyNotify) pcf_entry_free); + + g_hash_table_insert (pcf, g_utf8_strdown (s+1, -1), group); + } else { + PcfEntry *entry; + + /* Normal assignment */ + if (!(e = strchr (s, '='))) { + g_warning ("Missing assignment in %s:%u: <%s>", fname, line, s); + goto fail; + } + + if (!group) { + g_warning ("Assignment outside group in %s:%u <%s>", fname, line, s); + goto fail; + } + + /* Split the key and the value */ + *(e++) = 0; + + entry = g_new (PcfEntry, 1); + entry->value = pcf_utf8_try_convert (e); + + if (*s == '!') { + entry->key = g_utf8_strdown (s+1, -1); + entry->read_only = TRUE; + } else { + entry->key = g_utf8_strdown (s, -1); + entry->read_only = FALSE; + } + + g_hash_table_insert (group, entry->key, entry); + } + } + + fclose (fo); + + return pcf; + +fail: + + if (fo) + fclose (fo); + + if (pcf) + g_hash_table_destroy (pcf); + + return NULL; +} + +PcfEntry * +pcf_file_lookup (GHashTable *pcf_file, + const char *group, + const char *key) +{ + gpointer section; + PcfEntry *entry = NULL; + char *group_lower = NULL; + char *key_lower = NULL; + + g_return_val_if_fail (pcf_file != NULL, NULL); + g_return_val_if_fail (group != NULL, NULL); + g_return_val_if_fail (key != NULL, NULL); + + group_lower = g_utf8_strdown (group, -1); + section = g_hash_table_lookup (pcf_file, group_lower); + if (section) { + key_lower = g_utf8_strdown (key, -1); + entry = (PcfEntry *) g_hash_table_lookup ((GHashTable *) section, key_lower); + } + + g_free (group_lower); + g_free (key_lower); + + return entry; +} + +const char * +pcf_file_lookup_value (GHashTable *pcf_file, + const char *group, + const char *key) +{ + PcfEntry *entry; + + entry = pcf_file_lookup (pcf_file, group, key); + if (entry) + return entry->value; + + return NULL; +} diff -u -r -N NetworkManager-vpnc-0.6.4.orig/properties/pcf-file.h NetworkManager-vpnc-0.6.4/properties/pcf-file.h --- NetworkManager-vpnc-0.6.4.orig/properties/pcf-file.h 1970-01-01 01:00:00.000000000 +0100 +++ NetworkManager-vpnc-0.6.4/properties/pcf-file.h 2006-11-01 17:33:28.000000000 +0100 @@ -0,0 +1,23 @@ +#ifndef PCF_FILE_H +#define PCF_FILE_H + +#include + +typedef struct PcfEntry PcfEntry; + +struct PcfEntry { + char *key; + char *value; + gboolean read_only; +}; + +GHashTable *pcf_file_load (const char *fname); +PcfEntry *pcf_file_lookup (GHashTable *pcf_file, + const char *group, + const char *key); + +const char *pcf_file_lookup_value (GHashTable *pcf_file, + const char *group, + const char *key); + +#endif /* PCF_FILE_H */ diff -u -r -N NetworkManager-vpnc-0.6.4.orig/src/nm-vpnc-service.c NetworkManager-vpnc-0.6.4/src/nm-vpnc-service.c --- NetworkManager-vpnc-0.6.4.orig/src/nm-vpnc-service.c 2006-07-13 18:02:36.000000000 +0200 +++ NetworkManager-vpnc-0.6.4/src/nm-vpnc-service.c 2007-02-17 08:17:41.000000000 +0100 @@ -492,18 +492,19 @@ static gboolean nm_vpnc_config_options_validate (char **data_items, int num_items) { Option allowed_opts[] = { - { "IPSec gateway", OPT_TYPE_ADDRESS }, - { "IPSec ID", OPT_TYPE_ASCII }, - { "IPSec secret", OPT_TYPE_ASCII }, - { "Xauth username", OPT_TYPE_ASCII }, - { "UDP Encapsulate", OPT_TYPE_NONE }, - { "UDP Encapsulation Port", OPT_TYPE_ASCII }, - { "Domain", OPT_TYPE_ASCII }, - { "IKE DH Group", OPT_TYPE_ASCII }, - { "Perfect Forward Secrecy", OPT_TYPE_ASCII }, - { "Application Version", OPT_TYPE_ASCII }, - { "Rekeying interval", OPT_TYPE_ASCII }, - { NULL, OPT_TYPE_UNKNOWN } + { "IPSec gateway", OPT_TYPE_ADDRESS }, + { "IPSec ID", OPT_TYPE_ASCII }, + { "IPSec secret", OPT_TYPE_ASCII }, + { "Xauth username", OPT_TYPE_ASCII }, + { "UDP Encapsulate", OPT_TYPE_NONE }, + { "UDP Encapsulation Port", OPT_TYPE_ASCII }, + { "Domain", OPT_TYPE_ASCII }, + { "IKE DH Group", OPT_TYPE_ASCII }, + { "Perfect Forward Secrecy", OPT_TYPE_ASCII }, + { "Application Version", OPT_TYPE_ASCII }, + { "Rekeying interval", OPT_TYPE_ASCII }, + { "NAT-Keepalive packet interval", OPT_TYPE_ASCII }, + { NULL, OPT_TYPE_UNKNOWN } }; unsigned int i; --- NetworkManager-vpnc-0.6.4/properties/Makefile.in~ 2006-07-14 21:06:09.000000000 +0200 +++ NetworkManager-vpnc-0.6.4/properties/Makefile.in 2007-02-17 10:49:35.000000000 +0100 @@ -61,7 +61,8 @@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) am_libnm_vpnc_properties_la_OBJECTS = \ - libnm_vpnc_properties_la-nm-vpnc.lo + libnm_vpnc_properties_la-nm-vpnc.lo \ + libnm_vpnc_properties_la-pcf-file.lo libnm_vpnc_properties_la_OBJECTS = \ $(am_libnm_vpnc_properties_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) @@ -254,7 +255,9 @@ target_alias = @target_alias@ lib_LTLIBRARIES = libnm-vpnc-properties.la libnm_vpnc_properties_la_SOURCES = \ - nm-vpnc.c + nm-vpnc.c \ + pcf-file.c \ + pcf-file.h gladedir = $(datadir)/gnome-vpn-properties/vpnc glade_DATA = nm-vpnc-dialog.glade @@ -351,6 +354,7 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libnm_vpnc_properties_la-nm-vpnc.Plo at am__quote@ + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libnm_vpnc_properties_la-pcf-file.Plo at am__quote@ .c.o: @am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \ @@ -383,6 +387,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnm_vpnc_properties_la_CFLAGS) $(CFLAGS) -c -o libnm_vpnc_properties_la-nm-vpnc.lo `test -f 'nm-vpnc.c' || echo '$(srcdir)/'`nm-vpnc.c +libnm_vpnc_properties_la-pcf-file.lo: pcf-file.c + at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnm_vpnc_properties_la_CFLAGS) $(CFLAGS) -MT libnm_vpnc_properties_la-pcf-file.lo -MD -MP -MF "$(DEPDIR)/libnm_vpnc_properties_la-pcf-file.Tpo" -c -o libnm_vpnc_properties_la-pcf-file.lo `test -f 'pcf-file.c' || echo '$(srcdir)/'`pcf-file.c; \ + at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libnm_vpnc_properties_la-pcf-file.Tpo" "$(DEPDIR)/libnm_vpnc_properties_la-pcf-file.Plo"; else rm -f "$(DEPDIR)/libnm_vpnc_properties_la-pcf-file.Tpo"; exit 1; fi + at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pcf-file.c' object='libnm_vpnc_properties_la-pcf-file.lo' libtool=yes @AMDEPBACKSLASH@ + at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnm_vpnc_properties_la_CFLAGS) $(CFLAGS) -c -o libnm_vpnc_properties_la-pcf-file.lo `test -f 'pcf-file.c' || echo '$(srcdir)/'`pcf-file.c + mostlyclean-libtool: -rm -f *.lo Index: NetworkManager-vpnc.spec =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/FC-6/NetworkManager-vpnc.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- NetworkManager-vpnc.spec 14 Feb 2007 08:42:36 -0000 1.21 +++ NetworkManager-vpnc.spec 18 Feb 2007 07:47:37 -0000 1.22 @@ -8,12 +8,13 @@ Name: NetworkManager-vpnc Epoch: 1 Version: 0.6.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ Source: %{name}-%{version}.tar.gz Patch0: NetworkManager-vpnc-0.7.0-gppasswd.patch +Patch1: NetworkManager-vpnc-0.6.4-keepalive.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gtk2-devel >= %{gtk2_version} @@ -44,6 +45,7 @@ %prep %setup -q %patch0 -p1 -b .gppasswd +%patch1 -p1 -b .keepalive %build @@ -95,6 +97,9 @@ %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png %changelog +* Sat Feb 17 2007 Denis Leroy - 1:0.6.4-2 +- Readded NAT-keepalive support patch from SVN branch + * Wed Feb 14 2007 Denis Leroy - 1:0.6.4-1 - Downgrading to 1:0.6.4 to keep par with NetworkManager core version From fedora-extras-commits at redhat.com Sun Feb 18 07:53:55 2007 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Sun, 18 Feb 2007 02:53:55 -0500 Subject: rpms/yafc/devel gssapi2.diff,NONE,1.1 yafc.spec,1.2,1.3 Message-ID: <200702180753.l1I7rtJE007218@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/yafc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7198 Modified Files: yafc.spec Added Files: gssapi2.diff Log Message: Add patch from https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=226764 to hopefully make this compile in devel gssapi2.diff: --- NEW FILE gssapi2.diff --- --- yafc-1.1.1/configure.gssapih 2005-10-06 08:26:31.000000000 +0200 +++ yafc-1.1.1/configure 2007-02-15 19:00:41.000000000 +0100 @@ -27689,7 +27689,6 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include int main () { Index: yafc.spec =================================================================== RCS file: /cvs/extras/rpms/yafc/devel/yafc.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- yafc.spec 1 Feb 2007 17:24:21 -0000 1.2 +++ yafc.spec 18 Feb 2007 07:53:23 -0000 1.3 @@ -5,7 +5,7 @@ Name: yafc Version: 1.1.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Yet Another FTP/SFTP Client Group: Applications/Internet @@ -16,7 +16,8 @@ Source: http://dl.sourceforge.net/yafc/%{name}-%{version}.tar.bz2 -Patch: gssapi.diff +Patch1: gssapi.diff +Patch2: gssapi2.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -48,7 +49,8 @@ make distclean -%patch -p1 +%patch1 -p1 +%patch2 -p1 ################################################################################ @@ -109,6 +111,9 @@ %changelog +* Sat Feb 17 2007 Chris Petersen 1.1.1-7 +- Add gssapi2 patch from https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=226764 so this compiles in rawhide + * Thu Feb 1 2007 Chris Petersen 1.1.1-6 - Add ncurses BR so that yafc won't link against the deprecated termcap lib From fedora-extras-commits at redhat.com Sun Feb 18 08:10:23 2007 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Sun, 18 Feb 2007 03:10:23 -0500 Subject: rpms/NetworkManager-vpnc/devel NetworkManager-vpnc-0.6.4-keepalive.patch, NONE, 1.1 NetworkManager-vpnc.spec, 1.21, 1.22 Message-ID: <200702180810.l1I8ANx7010863@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/NetworkManager-vpnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10828 Modified Files: NetworkManager-vpnc.spec Added Files: NetworkManager-vpnc-0.6.4-keepalive.patch Log Message: Readded NAT-keepalive support patch from SVN branch NetworkManager-vpnc-0.6.4-keepalive.patch: --- NEW FILE NetworkManager-vpnc-0.6.4-keepalive.patch --- diff -u -r -N NetworkManager-vpnc-0.6.4.orig/properties/nm-vpnc.c NetworkManager-vpnc-0.6.4/properties/nm-vpnc.c --- NetworkManager-vpnc-0.6.4.orig/properties/nm-vpnc.c 2006-04-11 22:44:14.000000000 +0200 +++ NetworkManager-vpnc-0.6.4/properties/nm-vpnc.c 2007-02-17 08:17:41.000000000 +0100 @@ -1,5 +1,5 @@ /*************************************************************************** - * CVSID: $Id: nm-vpnc.c,v 1.5.2.1 2006/04/10 20:34:25 rml Exp $ + * CVSID: $Id: nm-vpnc.c,v 1.5.2.3 2006/11/01 16:33:28 tambeti Exp $ * * nm-vpnc.c : GNOME UI dialogs for configuring vpnc VPN connections * @@ -31,6 +31,7 @@ #define NM_VPN_API_SUBJECT_TO_CHANGE #include +#include "pcf-file.h" typedef struct _NetworkManagerVpnUIImpl NetworkManagerVpnUIImpl; @@ -478,95 +479,85 @@ static gboolean import_from_file (NetworkManagerVpnUIImpl *impl, const char *path) { - char *basename; - GKeyFile *keyfile; - gboolean file_is_good; - - /*printf ("path='%s'\n", path);*/ - - file_is_good = FALSE; - basename = g_path_get_basename (path); - - keyfile = g_key_file_new (); - if (g_key_file_load_from_file (keyfile, path, 0, NULL)) { - char *connectionname = NULL; - char *gateway = NULL; - char *groupname = NULL; - char *username = NULL; - char *domain = NULL; - char *tunneling_mode = NULL; - char *routes = NULL; - gboolean should_expand; - - if ((connectionname = g_key_file_get_string (keyfile, "main", "Description", NULL)) == NULL) - goto error; - if ((gateway = g_key_file_get_string (keyfile, "main", "Host", NULL)) == NULL) - goto error; - if ((groupname = g_key_file_get_string (keyfile, "main", "GroupName", NULL)) == NULL) - goto error; - if ((username = g_key_file_get_string (keyfile, "main", "Username", NULL)) == NULL) - goto error; - if ((domain = g_key_file_get_string (keyfile, "main", "NTDomain", NULL)) == NULL) - goto error; - if ((tunneling_mode = g_key_file_get_string (keyfile, "main", "TunnelingMode", NULL)) == NULL) - goto error; - - /* may not exist */ - if ((routes = g_key_file_get_string (keyfile, "main", "X-NM-Routes", NULL)) == NULL) - routes = g_strdup (""); - - /* sanity check data */ - if (! (strlen (gateway) > 0 && - strlen (groupname) > 0)) - goto error; - - gtk_entry_set_text (impl->w_connection_name, connectionname); - gtk_entry_set_text (impl->w_gateway, gateway); - gtk_entry_set_text (impl->w_group_name, groupname); - - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_alternate_username), strlen (username) > 0); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_routes), strlen (routes) > 0); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_domain), strlen (domain) > 0); - gtk_entry_set_text (impl->w_username, username); - gtk_entry_set_text (impl->w_routes, routes); - gtk_entry_set_text (impl->w_domain, domain); - gtk_widget_set_sensitive (GTK_WIDGET (impl->w_username), strlen (username) > 0); - gtk_widget_set_sensitive (GTK_WIDGET (impl->w_routes), strlen (routes) > 0); - gtk_widget_set_sensitive (GTK_WIDGET (impl->w_domain), strlen (username) > 0); + GHashTable *pcf; + const char *buf; + gboolean have_value; + char *basename = NULL; + gboolean expand = FALSE; + gboolean success = FALSE; + + pcf = pcf_file_load (path); + if (pcf == NULL) + return FALSE; - should_expand = (strlen (username) > 0) || (strlen (domain) > 0) || (strlen (routes) > 0); - gtk_expander_set_expanded (impl->w_opt_info_expander, should_expand); + /* Connection name */ + if ((buf = pcf_file_lookup_value (pcf, "main", "Description")) == NULL || strlen (buf) < 1) + goto error; + gtk_entry_set_text (impl->w_connection_name, buf); + + /* Gateway */ + if ((buf = pcf_file_lookup_value (pcf, "main", "Host")) == NULL || strlen (buf) < 1) + goto error; + gtk_entry_set_text (impl->w_gateway, buf); + + /* Group name */ + if ((buf = pcf_file_lookup_value (pcf, "main", "GroupName")) == NULL || strlen (buf) < 1) + goto error; + gtk_entry_set_text (impl->w_group_name, buf); + + /* Optional settings */ + + if ((buf = pcf_file_lookup_value (pcf, "main", "UserName"))) + gtk_entry_set_text (impl->w_username, buf); + have_value = buf == NULL ? FALSE : strlen (buf) > 0; + expand |= have_value; + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_alternate_username), have_value); + gtk_widget_set_sensitive (GTK_WIDGET (impl->w_username), have_value); + gtk_widget_set_sensitive (GTK_WIDGET (impl->w_domain), have_value); + + if ((buf = pcf_file_lookup_value (pcf, "main", "NTDomain"))) + gtk_entry_set_text (impl->w_domain, buf); + have_value = buf == NULL ? FALSE : strlen (buf) > 0; + expand |= have_value; + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_domain), have_value); + + if ((buf = pcf_file_lookup_value (pcf, "main", "X-NM-Routes"))) + gtk_entry_set_text (impl->w_routes, buf); + have_value = buf == NULL ? FALSE : strlen (buf) > 0; + expand |= have_value; + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_routes), have_value); + gtk_widget_set_sensitive (GTK_WIDGET (impl->w_routes), have_value); + + gtk_expander_set_expanded (impl->w_opt_info_expander, expand); + if ((buf = pcf_file_lookup_value (pcf, "main", "TunnelingMode"))) { /* If applicable, put up warning that TCP tunneling will be disabled */ - if (strcmp (tunneling_mode, "1") == 0) { + + if (strncmp (buf, "1", 1) == 0) { GtkWidget *dialog; - dialog = gtk_message_dialog_new (NULL, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_WARNING, - GTK_BUTTONS_CLOSE, - _("TCP tunneling not supported")); + basename = g_path_get_basename (path); + dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE, + _("TCP tunneling not supported")); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - _("The VPN settings file '%s' specifies that VPN traffic should be tunneled through TCP which is currently not supported in the vpnc software.\n\nThe connection can still be created, with TCP tunneling disabled, however it may not work as expected."), basename); + _("The VPN settings file '%s' specifies that VPN traffic should be tunneled through TCP which is currently not supported in the vpnc software.\n\nThe connection can still be created, with TCP tunneling disabled, however it may not work as expected."), basename); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } + } - file_is_good = TRUE; + success = TRUE; - error: - g_free (connectionname); - g_free (gateway); - g_free (groupname); - g_free (username); - g_free (domain); - g_free (tunneling_mode); - } - g_key_file_free (keyfile); + error: + g_hash_table_destroy (pcf); - if (!file_is_good) { + if (!success) { GtkWidget *dialog; - + + if (!basename) + basename = g_path_get_basename (path); + dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, @@ -580,7 +571,7 @@ g_free (basename); - return file_is_good; + return success; } static void diff -u -r -N NetworkManager-vpnc-0.6.4.orig/properties/pcf-file.c NetworkManager-vpnc-0.6.4/properties/pcf-file.c --- NetworkManager-vpnc-0.6.4.orig/properties/pcf-file.c 1970-01-01 01:00:00.000000000 +0100 +++ NetworkManager-vpnc-0.6.4/properties/pcf-file.c 2006-11-28 11:23:14.000000000 +0100 @@ -0,0 +1,184 @@ +#include +#include +#include +#include + +#include "pcf-file.h" + +static void +pcf_entry_free (PcfEntry *entry) +{ + if (entry) { + g_free (entry->key); + g_free (entry->value); + g_free (entry); + } +} + +/* Stolen from gaim */ + +static char * +pcf_utf8_try_convert (const char *str) +{ + char *utf8; + gsize converted; + + if (!str) + return NULL; + + if (g_utf8_validate (str, -1, NULL)) + return g_strdup (str); + + utf8 = g_locale_to_utf8 (str, -1, NULL, NULL, NULL); + if (utf8) + return utf8; + + utf8 = g_convert (str, -1, "UTF-8", "ISO-8859-15", &converted, NULL, NULL); + if (utf8 && converted == strlen (str)) + return utf8; + + g_free (utf8); + return NULL; +} + +/* + The main reader loop here is based on the simple .ini file + parser from avahi/avahi-daemon/ini-file-parser.c +*/ + +GHashTable * +pcf_file_load (const char *fname) +{ + FILE *fo; + unsigned line; + GHashTable *pcf; + GHashTable *group = NULL; + + g_return_val_if_fail (fname != NULL, NULL); + + if (!(fo = fopen (fname, "r"))) { + g_warning ("Failed to open file '%s': %s", fname, strerror (errno)); + return NULL; + } + + pcf = g_hash_table_new_full (g_str_hash, g_str_equal, + g_free, + (GDestroyNotify) g_hash_table_destroy); + + line = 0; + while (!feof (fo)) { + char ln[256], *s, *e; + + if (!(fgets (ln, sizeof (ln), fo))) + break; + + line++; + + s = ln + strspn (ln, " \t"); + s[strcspn (s, "\r\n")] = 0; + + /* Skip comments and empty lines */ + if (*s == ';' || *s == 0) + continue; + + if (*s == '[') { + /* new group */ + + if (!(e = strchr (s, ']'))) { + g_warning ("Unclosed group header in %s:%u: <%s>", fname, line, s); + goto fail; + } + + *e = 0; + + group = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, + (GDestroyNotify) pcf_entry_free); + + g_hash_table_insert (pcf, g_utf8_strdown (s+1, -1), group); + } else { + PcfEntry *entry; + + /* Normal assignment */ + if (!(e = strchr (s, '='))) { + g_warning ("Missing assignment in %s:%u: <%s>", fname, line, s); + goto fail; + } + + if (!group) { + g_warning ("Assignment outside group in %s:%u <%s>", fname, line, s); + goto fail; + } + + /* Split the key and the value */ + *(e++) = 0; + + entry = g_new (PcfEntry, 1); + entry->value = pcf_utf8_try_convert (e); + + if (*s == '!') { + entry->key = g_utf8_strdown (s+1, -1); + entry->read_only = TRUE; + } else { + entry->key = g_utf8_strdown (s, -1); + entry->read_only = FALSE; + } + + g_hash_table_insert (group, entry->key, entry); + } + } + + fclose (fo); + + return pcf; + +fail: + + if (fo) + fclose (fo); + + if (pcf) + g_hash_table_destroy (pcf); + + return NULL; +} + +PcfEntry * +pcf_file_lookup (GHashTable *pcf_file, + const char *group, + const char *key) +{ + gpointer section; + PcfEntry *entry = NULL; + char *group_lower = NULL; + char *key_lower = NULL; + + g_return_val_if_fail (pcf_file != NULL, NULL); + g_return_val_if_fail (group != NULL, NULL); + g_return_val_if_fail (key != NULL, NULL); + + group_lower = g_utf8_strdown (group, -1); + section = g_hash_table_lookup (pcf_file, group_lower); + if (section) { + key_lower = g_utf8_strdown (key, -1); + entry = (PcfEntry *) g_hash_table_lookup ((GHashTable *) section, key_lower); + } + + g_free (group_lower); + g_free (key_lower); + + return entry; +} + +const char * +pcf_file_lookup_value (GHashTable *pcf_file, + const char *group, + const char *key) +{ + PcfEntry *entry; + + entry = pcf_file_lookup (pcf_file, group, key); + if (entry) + return entry->value; + + return NULL; +} diff -u -r -N NetworkManager-vpnc-0.6.4.orig/properties/pcf-file.h NetworkManager-vpnc-0.6.4/properties/pcf-file.h --- NetworkManager-vpnc-0.6.4.orig/properties/pcf-file.h 1970-01-01 01:00:00.000000000 +0100 +++ NetworkManager-vpnc-0.6.4/properties/pcf-file.h 2006-11-01 17:33:28.000000000 +0100 @@ -0,0 +1,23 @@ +#ifndef PCF_FILE_H +#define PCF_FILE_H + +#include + +typedef struct PcfEntry PcfEntry; + +struct PcfEntry { + char *key; + char *value; + gboolean read_only; +}; + +GHashTable *pcf_file_load (const char *fname); +PcfEntry *pcf_file_lookup (GHashTable *pcf_file, + const char *group, + const char *key); + +const char *pcf_file_lookup_value (GHashTable *pcf_file, + const char *group, + const char *key); + +#endif /* PCF_FILE_H */ diff -u -r -N NetworkManager-vpnc-0.6.4.orig/src/nm-vpnc-service.c NetworkManager-vpnc-0.6.4/src/nm-vpnc-service.c --- NetworkManager-vpnc-0.6.4.orig/src/nm-vpnc-service.c 2006-07-13 18:02:36.000000000 +0200 +++ NetworkManager-vpnc-0.6.4/src/nm-vpnc-service.c 2007-02-17 08:17:41.000000000 +0100 @@ -492,18 +492,19 @@ static gboolean nm_vpnc_config_options_validate (char **data_items, int num_items) { Option allowed_opts[] = { - { "IPSec gateway", OPT_TYPE_ADDRESS }, - { "IPSec ID", OPT_TYPE_ASCII }, - { "IPSec secret", OPT_TYPE_ASCII }, - { "Xauth username", OPT_TYPE_ASCII }, - { "UDP Encapsulate", OPT_TYPE_NONE }, - { "UDP Encapsulation Port", OPT_TYPE_ASCII }, - { "Domain", OPT_TYPE_ASCII }, - { "IKE DH Group", OPT_TYPE_ASCII }, - { "Perfect Forward Secrecy", OPT_TYPE_ASCII }, - { "Application Version", OPT_TYPE_ASCII }, - { "Rekeying interval", OPT_TYPE_ASCII }, - { NULL, OPT_TYPE_UNKNOWN } + { "IPSec gateway", OPT_TYPE_ADDRESS }, + { "IPSec ID", OPT_TYPE_ASCII }, + { "IPSec secret", OPT_TYPE_ASCII }, + { "Xauth username", OPT_TYPE_ASCII }, + { "UDP Encapsulate", OPT_TYPE_NONE }, + { "UDP Encapsulation Port", OPT_TYPE_ASCII }, + { "Domain", OPT_TYPE_ASCII }, + { "IKE DH Group", OPT_TYPE_ASCII }, + { "Perfect Forward Secrecy", OPT_TYPE_ASCII }, + { "Application Version", OPT_TYPE_ASCII }, + { "Rekeying interval", OPT_TYPE_ASCII }, + { "NAT-Keepalive packet interval", OPT_TYPE_ASCII }, + { NULL, OPT_TYPE_UNKNOWN } }; unsigned int i; --- NetworkManager-vpnc-0.6.4/properties/Makefile.in~ 2006-07-14 21:06:09.000000000 +0200 +++ NetworkManager-vpnc-0.6.4/properties/Makefile.in 2007-02-17 10:49:35.000000000 +0100 @@ -61,7 +61,8 @@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) am_libnm_vpnc_properties_la_OBJECTS = \ - libnm_vpnc_properties_la-nm-vpnc.lo + libnm_vpnc_properties_la-nm-vpnc.lo \ + libnm_vpnc_properties_la-pcf-file.lo libnm_vpnc_properties_la_OBJECTS = \ $(am_libnm_vpnc_properties_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) @@ -254,7 +255,9 @@ target_alias = @target_alias@ lib_LTLIBRARIES = libnm-vpnc-properties.la libnm_vpnc_properties_la_SOURCES = \ - nm-vpnc.c + nm-vpnc.c \ + pcf-file.c \ + pcf-file.h gladedir = $(datadir)/gnome-vpn-properties/vpnc glade_DATA = nm-vpnc-dialog.glade @@ -351,6 +354,7 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libnm_vpnc_properties_la-nm-vpnc.Plo at am__quote@ + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libnm_vpnc_properties_la-pcf-file.Plo at am__quote@ .c.o: @am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \ @@ -383,6 +387,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnm_vpnc_properties_la_CFLAGS) $(CFLAGS) -c -o libnm_vpnc_properties_la-nm-vpnc.lo `test -f 'nm-vpnc.c' || echo '$(srcdir)/'`nm-vpnc.c +libnm_vpnc_properties_la-pcf-file.lo: pcf-file.c + at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnm_vpnc_properties_la_CFLAGS) $(CFLAGS) -MT libnm_vpnc_properties_la-pcf-file.lo -MD -MP -MF "$(DEPDIR)/libnm_vpnc_properties_la-pcf-file.Tpo" -c -o libnm_vpnc_properties_la-pcf-file.lo `test -f 'pcf-file.c' || echo '$(srcdir)/'`pcf-file.c; \ + at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libnm_vpnc_properties_la-pcf-file.Tpo" "$(DEPDIR)/libnm_vpnc_properties_la-pcf-file.Plo"; else rm -f "$(DEPDIR)/libnm_vpnc_properties_la-pcf-file.Tpo"; exit 1; fi + at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pcf-file.c' object='libnm_vpnc_properties_la-pcf-file.lo' libtool=yes @AMDEPBACKSLASH@ + at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnm_vpnc_properties_la_CFLAGS) $(CFLAGS) -c -o libnm_vpnc_properties_la-pcf-file.lo `test -f 'pcf-file.c' || echo '$(srcdir)/'`pcf-file.c + mostlyclean-libtool: -rm -f *.lo Index: NetworkManager-vpnc.spec =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- NetworkManager-vpnc.spec 14 Feb 2007 08:57:28 -0000 1.21 +++ NetworkManager-vpnc.spec 18 Feb 2007 08:09:50 -0000 1.22 @@ -8,12 +8,13 @@ Name: NetworkManager-vpnc Epoch: 1 Version: 0.6.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ Source: %{name}-%{version}.tar.gz Patch0: NetworkManager-vpnc-0.7.0-gppasswd.patch +Patch1: NetworkManager-vpnc-0.6.4-keepalive.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gtk2-devel >= %{gtk2_version} @@ -44,6 +45,7 @@ %prep %setup -q %patch0 -p1 -b .gppasswd +%patch1 -p1 -b .keepalive %build @@ -95,6 +97,9 @@ %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png %changelog +* Sun Feb 18 2007 Denis Leroy - 1:0.6.4-2 +- Readded NAT-keepalive support patch from SVN branch + * Wed Feb 14 2007 Denis Leroy - 1:0.6.4-1 - Downgrading to 1:0.6.4 to keep par with core NM version From fedora-extras-commits at redhat.com Sun Feb 18 09:54:46 2007 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Sun, 18 Feb 2007 04:54:46 -0500 Subject: rpms/ushare/devel ushare.spec,1.9,1.10 Message-ID: <200702180954.l1I9sk2Y005007@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/ushare/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4964 Modified Files: ushare.spec Log Message: Index: ushare.spec =================================================================== RCS file: /cvs/extras/rpms/ushare/devel/ushare.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ushare.spec 13 Dec 2006 19:43:37 -0000 1.9 +++ ushare.spec 18 Feb 2007 09:54:14 -0000 1.10 @@ -1,7 +1,7 @@ Summary: UPnP (TM) A/V Media Server Name: ushare Version: 0.9.8 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Multimedia URL: http://ushare.geexbox.org/ @@ -68,6 +68,9 @@ %attr(770,ushare,ushare) %dir %{_var}/lib/ushare/ %changelog +* Sat Feb 17 2007 Eric Tanguy - 0.9.8-2 +- Rebuild for libupnp 1.4.2 + * Wed Dec 13 2006 Eric Tanguy - 0.9.8-1 - Update to 0.9.8 From fedora-extras-commits at redhat.com Sun Feb 18 10:08:59 2007 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Sun, 18 Feb 2007 05:08:59 -0500 Subject: rpms/ushare/FC-6 ushare.spec,1.9,1.10 Message-ID: <200702181008.l1IA8xO8008857@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/ushare/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8803 Modified Files: ushare.spec Log Message: Index: ushare.spec =================================================================== RCS file: /cvs/extras/rpms/ushare/FC-6/ushare.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ushare.spec 13 Dec 2006 21:07:06 -0000 1.9 +++ ushare.spec 18 Feb 2007 10:08:26 -0000 1.10 @@ -1,7 +1,7 @@ Summary: UPnP (TM) A/V Media Server Name: ushare Version: 0.9.8 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Multimedia URL: http://ushare.geexbox.org/ @@ -68,6 +68,9 @@ %attr(770,ushare,ushare) %dir %{_var}/lib/ushare/ %changelog +* Sat Feb 17 2007 Eric Tanguy - 0.9.8-2 +- Rebuild for libupnp 1.4.2 + * Wed Dec 13 2006 Eric Tanguy - 0.9.8-1 - Update to 0.9.8 From fedora-extras-commits at redhat.com Sun Feb 18 10:11:03 2007 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Sun, 18 Feb 2007 05:11:03 -0500 Subject: rpms/ushare/FC-5 ushare.spec,1.7,1.8 Message-ID: <200702181011.l1IAB3jP008886@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/ushare/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8863 Modified Files: ushare.spec Log Message: Index: ushare.spec =================================================================== RCS file: /cvs/extras/rpms/ushare/FC-5/ushare.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ushare.spec 13 Dec 2006 21:10:00 -0000 1.7 +++ ushare.spec 18 Feb 2007 10:10:30 -0000 1.8 @@ -1,7 +1,7 @@ Summary: UPnP (TM) A/V Media Server Name: ushare Version: 0.9.8 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Multimedia URL: http://ushare.geexbox.org/ @@ -68,6 +68,9 @@ %attr(770,ushare,ushare) %dir %{_var}/lib/ushare/ %changelog +* Sat Feb 17 2007 Eric Tanguy - 0.9.8-2 +- Rebuild for libupnp 1.4.2 + * Wed Dec 13 2006 Eric Tanguy - 0.9.8-1 - Update to 0.9.8 From fedora-extras-commits at redhat.com Sun Feb 18 13:06:37 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sun, 18 Feb 2007 08:06:37 -0500 Subject: rpms/jd/devel .cvsignore, 1.72, 1.73 jd.spec, 1.83, 1.84 sources, 1.72, 1.73 Message-ID: <200702181306.l1ID6bYQ021295@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21194 Modified Files: .cvsignore jd.spec sources Log Message: * Sun Feb 18 2007 Mamoru Tasaka - 1.8.8.0.1.beta070218 - 1.8.8 beta070218 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- .cvsignore 17 Feb 2007 16:09:28 -0000 1.72 +++ .cvsignore 18 Feb 2007 13:06:05 -0000 1.73 @@ -1 +1 @@ -jd-1.8.5-cvs070217.tgz +jd-1.8.8-beta070218.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- jd.spec 17 Feb 2007 16:09:28 -0000 1.83 +++ jd.spec 18 Feb 2007 13:06:05 -0000 1.84 @@ -9,14 +9,14 @@ ########################################## # Defined by upsteam # -%define main_ver 1.8.5 -%define strtag cvs070217 -%define repoid 23816 +%define main_ver 1.8.8 +%define strtag beta070218 +%define repoid 24034 # Defined by vendor # -%define vendor_rel 2.%{strtag} +%define vendor_rel 1 # Tag name changed from vendor to vendorname so as not to # overwrite Vendor entry in Summary %define vendorname fedora @@ -24,7 +24,7 @@ %define icondir %{_datadir}/icons/hicolor/96x96/apps/ # Define this if this is pre-version -%define pre_release 0 +%define pre_release 1 %if %{pre_release} %define rel 0.%{vendor_rel}.%{strtag}%{?dist} @@ -106,8 +106,8 @@ %{icondir}/%{name}.png %changelog -* Sat Feb 17 2007 Mamoru Tasaka - 1.8.5-2.cvs070217 -- cvs 070217 (24:50 JST) +* Sun Feb 18 2007 Mamoru Tasaka - 1.8.8.0.1.beta070218 +- 1.8.8 beta070218 * Fri Feb 2 2007 Mamoru Tasaka - 1.8.5-1 - 1.8.5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- sources 17 Feb 2007 16:09:28 -0000 1.72 +++ sources 18 Feb 2007 13:06:05 -0000 1.73 @@ -1 +1 @@ -9508f012a42d11b95e6ba44fc25a014c jd-1.8.5-cvs070217.tgz +a79c0e8a8316800b37ab73fdffe4b6a4 jd-1.8.8-beta070218.tgz From fedora-extras-commits at redhat.com Sun Feb 18 13:06:45 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sun, 18 Feb 2007 08:06:45 -0500 Subject: rpms/jd/FC-6 .cvsignore, 1.17, 1.18 jd.spec, 1.20, 1.21 sources, 1.17, 1.18 Message-ID: <200702181306.l1ID6jAD021337@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21218 Modified Files: .cvsignore jd.spec sources Log Message: * Sun Feb 18 2007 Mamoru Tasaka - 1.8.8.0.1.beta070218 - 1.8.8 beta070218 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/FC-6/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 2 Feb 2007 15:48:15 -0000 1.17 +++ .cvsignore 18 Feb 2007 13:06:13 -0000 1.18 @@ -1 +1 @@ -jd-1.8.5-070203.tgz +jd-1.8.8-beta070218.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/FC-6/jd.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- jd.spec 2 Feb 2007 15:48:15 -0000 1.20 +++ jd.spec 18 Feb 2007 13:06:13 -0000 1.21 @@ -9,9 +9,9 @@ ########################################## # Defined by upsteam # -%define main_ver 1.8.5 -%define strtag 070203 -%define repoid 23816 +%define main_ver 1.8.8 +%define strtag beta070218 +%define repoid 24034 # Defined by vendor @@ -24,7 +24,7 @@ %define icondir %{_datadir}/icons/hicolor/96x96/apps/ # Define this if this is pre-version -%define pre_release 0 +%define pre_release 1 %if %{pre_release} %define rel 0.%{vendor_rel}.%{strtag}%{?dist} @@ -106,6 +106,9 @@ %{icondir}/%{name}.png %changelog +* Sun Feb 18 2007 Mamoru Tasaka - 1.8.8.0.1.beta070218 +- 1.8.8 beta070218 + * Fri Feb 2 2007 Mamoru Tasaka - 1.8.5-1 - 1.8.5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/FC-6/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 2 Feb 2007 15:48:15 -0000 1.17 +++ sources 18 Feb 2007 13:06:13 -0000 1.18 @@ -1 +1 @@ -8cc9aad86ea0458705c2937a7798a22a jd-1.8.5-070203.tgz +a79c0e8a8316800b37ab73fdffe4b6a4 jd-1.8.8-beta070218.tgz From fedora-extras-commits at redhat.com Sun Feb 18 13:07:05 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sun, 18 Feb 2007 08:07:05 -0500 Subject: rpms/jd/FC-5 .cvsignore, 1.16, 1.17 jd.spec, 1.19, 1.20 sources, 1.16, 1.17 Message-ID: <200702181307.l1ID75Jj021384@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21274 Modified Files: .cvsignore jd.spec sources Log Message: * Sun Feb 18 2007 Mamoru Tasaka - 1.8.8.0.1.beta070218 - 1.8.8 beta070218 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/FC-5/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 2 Feb 2007 15:48:45 -0000 1.16 +++ .cvsignore 18 Feb 2007 13:06:33 -0000 1.17 @@ -1 +1 @@ -jd-1.8.5-070203.tgz +jd-1.8.8-beta070218.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/FC-5/jd.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- jd.spec 2 Feb 2007 15:48:45 -0000 1.19 +++ jd.spec 18 Feb 2007 13:06:33 -0000 1.20 @@ -9,9 +9,9 @@ ########################################## # Defined by upsteam # -%define main_ver 1.8.5 -%define strtag 070203 -%define repoid 23816 +%define main_ver 1.8.8 +%define strtag beta070218 +%define repoid 24034 # Defined by vendor @@ -24,7 +24,7 @@ %define icondir %{_datadir}/icons/hicolor/96x96/apps/ # Define this if this is pre-version -%define pre_release 0 +%define pre_release 1 %if %{pre_release} %define rel 0.%{vendor_rel}.%{strtag}%{?dist} @@ -106,6 +106,9 @@ %{icondir}/%{name}.png %changelog +* Sun Feb 18 2007 Mamoru Tasaka - 1.8.8.0.1.beta070218 +- 1.8.8 beta070218 + * Fri Feb 2 2007 Mamoru Tasaka - 1.8.5-1 - 1.8.5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/FC-5/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 2 Feb 2007 15:48:45 -0000 1.16 +++ sources 18 Feb 2007 13:06:33 -0000 1.17 @@ -1 +1 @@ -8cc9aad86ea0458705c2937a7798a22a jd-1.8.5-070203.tgz +a79c0e8a8316800b37ab73fdffe4b6a4 jd-1.8.8-beta070218.tgz From fedora-extras-commits at redhat.com Sun Feb 18 13:08:50 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sun, 18 Feb 2007 08:08:50 -0500 Subject: rpms/jd/FC-5 jd.spec,1.20,1.21 Message-ID: <200702181308.l1ID8o1G021471@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21447 Modified Files: jd.spec Log Message: retag Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/FC-5/jd.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- jd.spec 18 Feb 2007 13:06:33 -0000 1.20 +++ jd.spec 18 Feb 2007 13:08:18 -0000 1.21 @@ -27,7 +27,7 @@ %define pre_release 1 %if %{pre_release} -%define rel 0.%{vendor_rel}.%{strtag}%{?dist} +%define rel 0.%{vendor_rel}.%{strtag}%{?dist}.1 %else %define rel %{vendor_rel}%{?dist} %endif From fedora-extras-commits at redhat.com Sun Feb 18 13:09:36 2007 From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier)) Date: Sun, 18 Feb 2007 08:09:36 -0500 Subject: rpms/testdisk/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 testdisk.spec, 1.10, 1.11 Message-ID: <200702181309.l1ID9aFg021534@cvs-int.fedora.redhat.com> Author: grenier Update of /cvs/extras/rpms/testdisk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21474 Modified Files: .cvsignore sources testdisk.spec Log Message: TestDisk 6.6 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/testdisk/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 24 Oct 2006 06:27:17 -0000 1.5 +++ .cvsignore 18 Feb 2007 13:09:04 -0000 1.6 @@ -1 +1 @@ -testdisk-6.5.tar.bz2 +testdisk-6.6.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/testdisk/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 24 Oct 2006 06:27:17 -0000 1.5 +++ sources 18 Feb 2007 13:09:04 -0000 1.6 @@ -1 +1 @@ -58cb6ebd95d524775720646a7bb79354 testdisk-6.5.tar.bz2 +ced8ef2b994c05376d958f4994661b2d testdisk-6.6.tar.bz2 Index: testdisk.spec =================================================================== RCS file: /cvs/extras/rpms/testdisk/devel/testdisk.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- testdisk.spec 4 Feb 2007 23:25:36 -0000 1.10 +++ testdisk.spec 18 Feb 2007 13:09:04 -0000 1.11 @@ -3,8 +3,8 @@ Summary(fr): Outil pour v??rifier et restorer des partitions Summary(ru_RU.UTF8): ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ?????????? Name: testdisk -Version: 6.5 -Release: 3%{?dist} +Version: 6.6 +Release: 1%{?dist} License: GPL Group: Applications/System Source0: http://www.cgsecurity.org/testdisk-%{version}.tar.bz2 @@ -41,7 +41,7 @@ %setup -q %build -%configure +%configure --without-ewf make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT @@ -58,6 +58,9 @@ %{_mandir}/man1/testdisk.1* %{_mandir}/man1/photorec.1* %changelog +* Sun Feb 18 2007 Christophe Grenier 6.6-1 +- Update to latest version + * Mon Feb 5 2007 Christophe Grenier 6.5-3 - Fix russian description in spec file From fedora-extras-commits at redhat.com Sun Feb 18 13:15:27 2007 From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing)) Date: Sun, 18 Feb 2007 08:15:27 -0500 Subject: rpms/audacious-plugins/devel audacious-plugins.spec,1.7,1.8 Message-ID: <200702181315.l1IDFRrK021632@cvs-int.fedora.redhat.com> Author: ertzing Update of /cvs/extras/rpms/audacious-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21597 Modified Files: audacious-plugins.spec Log Message: Rebuild against new FLAC libraries (for real, this time) Index: audacious-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/audacious-plugins/devel/audacious-plugins.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- audacious-plugins.spec 15 Feb 2007 13:09:18 -0000 1.7 +++ audacious-plugins.spec 18 Feb 2007 13:14:55 -0000 1.8 @@ -1,6 +1,6 @@ Name: audacious-plugins Version: 1.2.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Plugins for the Audacious media player Group: Applications/Multimedia @@ -119,6 +119,11 @@ # %patch0 -p1 -b .cddb-buffer %build +# F7 comes with a new FLAC library, the a-p plugins for flac are +# versionized and there is no plugin for this particular version of +# FLAC. The plugin for 1.1.3 works, however, we just have to move it +# to a place where the build process will find it. +ln -s flac113 src/flac114 %configure \ --disable-rpath \ --enable-gconf \ @@ -197,7 +202,10 @@ %changelog -* Mon Feb 15 2007 Ralf Ertzinger 1.2.5-5.fc7 +* Sun Feb 18 2007 Ralf Ertzinger 1.2.5-6.fc7 +- Rebuild against new FLAC libraries (for real, this time) + +* Thu Feb 15 2007 Ralf Ertzinger 1.2.5-5.fc7 - Rebuild against new FLAC libraries * Mon Jan 15 2007 Ralf Ertzinger 1.2.5-4.fc7 From fedora-extras-commits at redhat.com Sun Feb 18 13:56:37 2007 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sun, 18 Feb 2007 08:56:37 -0500 Subject: rpms/wine/FC-6 .cvsignore, 1.29, 1.30 sources, 1.30, 1.31 wine.spec, 1.42, 1.43 Message-ID: <200702181356.l1IDub9P021973@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21908/FC-6 Modified Files: .cvsignore sources wine.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine/FC-6/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 7 Feb 2007 09:33:04 -0000 1.29 +++ .cvsignore 18 Feb 2007 13:56:04 -0000 1.30 @@ -1 +1 @@ -wine-0.9.30-fe.tar.bz2 +wine-0.9.31-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine/FC-6/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 7 Feb 2007 09:33:04 -0000 1.30 +++ sources 18 Feb 2007 13:56:04 -0000 1.31 @@ -1 +1 @@ -9a6530d13d26dcb8fe5c0d0ca88e87e8 wine-0.9.30-fe.tar.bz2 +cf03fffff7dcc1bdb86100fddad66b74 wine-0.9.31-fe.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/FC-6/wine.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- wine.spec 7 Feb 2007 09:33:04 -0000 1.42 +++ wine.spec 18 Feb 2007 13:56:04 -0000 1.43 @@ -1,7 +1,7 @@ %define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fno-stack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables Name: wine -Version: 0.9.30 +Version: 0.9.31 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator @@ -9,7 +9,7 @@ License: LGPL URL: http://www.winehq.org/ # special fedora tarball without winemp3 stuff -Source0: wine-0.9.30-fe.tar.bz2 +Source0: wine-0.9.31-fe.tar.bz2 Source1: wine.init Source3: wine-README-Fedora Source4: wine-32.conf @@ -387,6 +387,7 @@ %{_libdir}/wine/avicap32.dll.so %{_libdir}/wine/avifil32.dll.so %{_libdir}/wine/avifile.dll16 +%{_libdir}/wine/browseui.dll.so %{_libdir}/wine/cabinet.dll.so %{_libdir}/wine/cards.dll.so %{_libdir}/wine/cfgmgr32.dll.so @@ -713,6 +714,10 @@ %{_libdir}/wine/*.def %changelog +* Sat Feb 17 2007 Andreas Bierfert +0.9.31-1 +- version upgrade + * Wed Feb 07 2007 Andreas Bierfert 0.9.30-1 - version upgrade From fedora-extras-commits at redhat.com Sun Feb 18 13:56:39 2007 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sun, 18 Feb 2007 08:56:39 -0500 Subject: rpms/wine/devel .cvsignore, 1.29, 1.30 sources, 1.30, 1.31 wine.spec, 1.42, 1.43 Message-ID: <200702181356.l1IDudgV021978@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21908/devel Modified Files: .cvsignore sources wine.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine/devel/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 7 Feb 2007 09:33:07 -0000 1.29 +++ .cvsignore 18 Feb 2007 13:56:07 -0000 1.30 @@ -1 +1 @@ -wine-0.9.30-fe.tar.bz2 +wine-0.9.31-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine/devel/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 7 Feb 2007 09:33:07 -0000 1.30 +++ sources 18 Feb 2007 13:56:07 -0000 1.31 @@ -1 +1 @@ -9a6530d13d26dcb8fe5c0d0ca88e87e8 wine-0.9.30-fe.tar.bz2 +cf03fffff7dcc1bdb86100fddad66b74 wine-0.9.31-fe.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- wine.spec 7 Feb 2007 09:33:07 -0000 1.42 +++ wine.spec 18 Feb 2007 13:56:07 -0000 1.43 @@ -1,7 +1,7 @@ %define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fno-stack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables Name: wine -Version: 0.9.30 +Version: 0.9.31 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator @@ -9,7 +9,7 @@ License: LGPL URL: http://www.winehq.org/ # special fedora tarball without winemp3 stuff -Source0: wine-0.9.30-fe.tar.bz2 +Source0: wine-0.9.31-fe.tar.bz2 Source1: wine.init Source3: wine-README-Fedora Source4: wine-32.conf @@ -387,6 +387,7 @@ %{_libdir}/wine/avicap32.dll.so %{_libdir}/wine/avifil32.dll.so %{_libdir}/wine/avifile.dll16 +%{_libdir}/wine/browseui.dll.so %{_libdir}/wine/cabinet.dll.so %{_libdir}/wine/cards.dll.so %{_libdir}/wine/cfgmgr32.dll.so @@ -713,6 +714,10 @@ %{_libdir}/wine/*.def %changelog +* Sat Feb 17 2007 Andreas Bierfert +0.9.31-1 +- version upgrade + * Wed Feb 07 2007 Andreas Bierfert 0.9.30-1 - version upgrade From fedora-extras-commits at redhat.com Sun Feb 18 13:56:34 2007 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sun, 18 Feb 2007 08:56:34 -0500 Subject: rpms/wine/FC-5 .cvsignore, 1.28, 1.29 sources, 1.29, 1.30 wine.spec, 1.41, 1.42 Message-ID: <200702181356.l1IDuYCY021968@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21908/FC-5 Modified Files: .cvsignore sources wine.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine/FC-5/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 7 Feb 2007 09:33:02 -0000 1.28 +++ .cvsignore 18 Feb 2007 13:56:02 -0000 1.29 @@ -1 +1 @@ -wine-0.9.30-fe.tar.bz2 +wine-0.9.31-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine/FC-5/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 7 Feb 2007 09:33:02 -0000 1.29 +++ sources 18 Feb 2007 13:56:02 -0000 1.30 @@ -1 +1 @@ -9a6530d13d26dcb8fe5c0d0ca88e87e8 wine-0.9.30-fe.tar.bz2 +cf03fffff7dcc1bdb86100fddad66b74 wine-0.9.31-fe.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/FC-5/wine.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- wine.spec 7 Feb 2007 09:33:02 -0000 1.41 +++ wine.spec 18 Feb 2007 13:56:02 -0000 1.42 @@ -1,7 +1,7 @@ %define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fno-stack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables Name: wine -Version: 0.9.30 +Version: 0.9.31 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator @@ -9,7 +9,7 @@ License: LGPL URL: http://www.winehq.org/ # special fedora tarball without winemp3 stuff -Source0: wine-0.9.30-fe.tar.bz2 +Source0: wine-0.9.31-fe.tar.bz2 Source1: wine.init Source3: wine-README-Fedora Source4: wine-32.conf @@ -387,6 +387,7 @@ %{_libdir}/wine/avicap32.dll.so %{_libdir}/wine/avifil32.dll.so %{_libdir}/wine/avifile.dll16 +%{_libdir}/wine/browseui.dll.so %{_libdir}/wine/cabinet.dll.so %{_libdir}/wine/cards.dll.so %{_libdir}/wine/cfgmgr32.dll.so @@ -713,6 +714,10 @@ %{_libdir}/wine/*.def %changelog +* Sat Feb 17 2007 Andreas Bierfert +0.9.31-1 +- version upgrade + * Wed Feb 07 2007 Andreas Bierfert 0.9.30-1 - version upgrade From fedora-extras-commits at redhat.com Sun Feb 18 14:06:51 2007 From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier)) Date: Sun, 18 Feb 2007 09:06:51 -0500 Subject: rpms/testdisk/FC-5 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 testdisk.spec, 1.9, 1.10 Message-ID: <200702181406.l1IE6pJX025631@cvs-int.fedora.redhat.com> Author: grenier Update of /cvs/extras/rpms/testdisk/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25589/FC-5 Modified Files: .cvsignore sources testdisk.spec Log Message: TestDisk 6.6 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/testdisk/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 24 Oct 2006 06:36:29 -0000 1.5 +++ .cvsignore 18 Feb 2007 14:06:18 -0000 1.6 @@ -1 +1 @@ -testdisk-6.5.tar.bz2 +testdisk-6.6.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/testdisk/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 24 Oct 2006 06:36:29 -0000 1.5 +++ sources 18 Feb 2007 14:06:18 -0000 1.6 @@ -1 +1 @@ -58cb6ebd95d524775720646a7bb79354 testdisk-6.5.tar.bz2 +ced8ef2b994c05376d958f4994661b2d testdisk-6.6.tar.bz2 Index: testdisk.spec =================================================================== RCS file: /cvs/extras/rpms/testdisk/FC-5/testdisk.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- testdisk.spec 26 Nov 2006 10:51:11 -0000 1.9 +++ testdisk.spec 18 Feb 2007 14:06:18 -0000 1.10 @@ -1,10 +1,10 @@ Summary: Tool to check and undelete partition Summary(pl): Narz??dzie sprawdzaj??ce i odzyskuj??ce partycje Summary(fr): Outil pour v??rifier et restorer des partitions -Summary(ru_RU.KOI8-R): ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ?????????? +Summary(ru_RU.UTF8): ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ?????????? Name: testdisk -Version: 6.5 -Release: 2%{?dist} +Version: 6.6 +Release: 1%{?dist} License: GPL Group: Applications/System Source0: http://www.cgsecurity.org/testdisk-%{version}.tar.bz2 @@ -31,9 +31,9 @@ FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS -%description -l ru_RU.KOI8-R -?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????. -???????????????????????? ?????????????????? ???????? ????????????????: +%description -l ru_RU.UTF8 +?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????. +???????????????????????? ?????????????????? ???????? ????????????????: FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS @@ -41,7 +41,7 @@ %setup -q %build -%configure +%configure --without-ewf make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT @@ -58,6 +58,12 @@ %{_mandir}/man1/testdisk.1* %{_mandir}/man1/photorec.1* %changelog +* Sun Feb 18 2007 Christophe Grenier 6.6-1 +- Update to latest version + +* Mon Feb 5 2007 Christophe Grenier 6.5-3 +- Fix russian description in spec file + * Tue Nov 26 2006 Christophe Grenier 6.5-2 - Use ntfsprogs to provide NTFS listing capabilities to TestDisk From fedora-extras-commits at redhat.com Sun Feb 18 14:06:53 2007 From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier)) Date: Sun, 18 Feb 2007 09:06:53 -0500 Subject: rpms/testdisk/FC-6 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 testdisk.spec, 1.9, 1.10 Message-ID: <200702181406.l1IE6r9N025638@cvs-int.fedora.redhat.com> Author: grenier Update of /cvs/extras/rpms/testdisk/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25589/FC-6 Modified Files: .cvsignore sources testdisk.spec Log Message: TestDisk 6.6 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/testdisk/FC-6/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 24 Oct 2006 16:10:11 -0000 1.5 +++ .cvsignore 18 Feb 2007 14:06:21 -0000 1.6 @@ -1 +1 @@ -testdisk-6.5.tar.bz2 +testdisk-6.6.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/testdisk/FC-6/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 24 Oct 2006 16:10:11 -0000 1.5 +++ sources 18 Feb 2007 14:06:21 -0000 1.6 @@ -1 +1 @@ -58cb6ebd95d524775720646a7bb79354 testdisk-6.5.tar.bz2 +ced8ef2b994c05376d958f4994661b2d testdisk-6.6.tar.bz2 Index: testdisk.spec =================================================================== RCS file: /cvs/extras/rpms/testdisk/FC-6/testdisk.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- testdisk.spec 26 Nov 2006 10:51:11 -0000 1.9 +++ testdisk.spec 18 Feb 2007 14:06:21 -0000 1.10 @@ -1,10 +1,10 @@ Summary: Tool to check and undelete partition Summary(pl): Narz??dzie sprawdzaj??ce i odzyskuj??ce partycje Summary(fr): Outil pour v??rifier et restorer des partitions -Summary(ru_RU.KOI8-R): ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ?????????? +Summary(ru_RU.UTF8): ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ?????????? Name: testdisk -Version: 6.5 -Release: 2%{?dist} +Version: 6.6 +Release: 1%{?dist} License: GPL Group: Applications/System Source0: http://www.cgsecurity.org/testdisk-%{version}.tar.bz2 @@ -31,9 +31,9 @@ FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS -%description -l ru_RU.KOI8-R -?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????. -???????????????????????? ?????????????????? ???????? ????????????????: +%description -l ru_RU.UTF8 +?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????. +???????????????????????? ?????????????????? ???????? ????????????????: FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS @@ -41,7 +41,7 @@ %setup -q %build -%configure +%configure --without-ewf make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT @@ -58,6 +58,12 @@ %{_mandir}/man1/testdisk.1* %{_mandir}/man1/photorec.1* %changelog +* Sun Feb 18 2007 Christophe Grenier 6.6-1 +- Update to latest version + +* Mon Feb 5 2007 Christophe Grenier 6.5-3 +- Fix russian description in spec file + * Tue Nov 26 2006 Christophe Grenier 6.5-2 - Use ntfsprogs to provide NTFS listing capabilities to TestDisk From fedora-extras-commits at redhat.com Sun Feb 18 15:13:16 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sun, 18 Feb 2007 10:13:16 -0500 Subject: rpms/catfish/devel .cvsignore, 1.5, 1.6 catfish.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200702181513.l1IFDGBQ030264@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/catfish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30199 Modified Files: .cvsignore catfish.spec sources Log Message: * Sun Feb 18 2007 Mamoru Tasaka 0.2.1-1 - 0.2.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/catfish/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 14 Feb 2007 09:45:52 -0000 1.5 +++ .cvsignore 18 Feb 2007 15:12:43 -0000 1.6 @@ -1 +1 @@ -catfish-0.2.tar.gz +catfish-0.2.1.tar.gz Index: catfish.spec =================================================================== RCS file: /cvs/extras/rpms/catfish/devel/catfish.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- catfish.spec 14 Feb 2007 09:45:52 -0000 1.5 +++ catfish.spec 18 Feb 2007 15:12:43 -0000 1.6 @@ -1,14 +1,12 @@ -%define _version 0.2 - Name: catfish -Version: 0.2stable +Version: 0.2.1 Release: 1%{?dist} Summary: A handy file search tool Group: Applications/File License: GPL URL: http://software.twotoasts.de/?page=%{name} -Source0: http://software.twotoasts.de/media/%{name}/%{name}-%{_version}.tar.gz +Source0: http://software.twotoasts.de/media/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -36,15 +34,17 @@ configuration options from the command line. %prep -%setup -q -n %{name}-%{_version} +%setup -q %build -# Some configulation change +# Some configulation changes +# +# msgfmt is fixed. +# Linking is still broken... %{__sed} -i.misc \ - -e 's|666|644|' \ -e '/svg/s|install|install -m 644|' \ - -e 's|install |%{__install} -c -p |' \ - -e 's|\([^ \t][^ \t]*\).glade|-m 644 \1.glade|' \ + -e '/glade/s|install| install -m 644|' \ + -e 's|install |install -p |' \ -e 's|pyc|py|' \ -e 's|^\([ \t]*\)ln |\1: ln |' \ -e 's|cp -rf|cp -prf|' \ @@ -62,15 +62,6 @@ # and does not accept --libdir= option ./configure --prefix=%{_prefix} -# Create gettext .mo files manually for now as -# Makefile.in does not work -for pofile in i18n/*.po ; do - lang=`basename $pofile | sed -e 's|\.po$||'` - dir=locale/${lang}/LC_MESSAGES - %{__mkdir_p} $dir - msgfmt -v --statistics $pofile -o $dir/%{name}.mo -done - %install %{__rm} -rf $RPM_BUILD_ROOT @@ -89,7 +80,6 @@ %{__ln_s} -f ../locale/ \ $RPM_BUILD_ROOT%{_datadir}/%{name}/ -%{__mv} -f $RPM_BUILD_ROOT%{_prefix}/locale $RPM_BUILD_ROOT%{_datadir} %{find_lang} %{name} %clean @@ -105,6 +95,9 @@ %{_datadir}/pixmaps/%{name}.svg %changelog +* Sun Feb 18 2007 Mamoru Tasaka 0.2.1-1 +- 0.2.1 + * Wed Feb 14 2007 Mamoru Tasaka 0.2stable-1 - 0.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/catfish/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 14 Feb 2007 09:45:52 -0000 1.5 +++ sources 18 Feb 2007 15:12:43 -0000 1.6 @@ -1 +1 @@ -848d61da8dcfd32dd1c5d2add6c10cd8 catfish-0.2.tar.gz +a46d609476ab0492c87aa75ffa9b4a98 catfish-0.2.1.tar.gz From fedora-extras-commits at redhat.com Sun Feb 18 15:13:25 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sun, 18 Feb 2007 10:13:25 -0500 Subject: rpms/catfish/FC-6 .cvsignore, 1.5, 1.6 catfish.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200702181513.l1IFDPQ7030303@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/catfish/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30221 Modified Files: .cvsignore catfish.spec sources Log Message: * Sun Feb 18 2007 Mamoru Tasaka 0.2.1-1 - 0.2.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/catfish/FC-6/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 14 Feb 2007 09:48:03 -0000 1.5 +++ .cvsignore 18 Feb 2007 15:12:53 -0000 1.6 @@ -1 +1 @@ -catfish-0.2.tar.gz +catfish-0.2.1.tar.gz Index: catfish.spec =================================================================== RCS file: /cvs/extras/rpms/catfish/FC-6/catfish.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- catfish.spec 14 Feb 2007 09:48:03 -0000 1.5 +++ catfish.spec 18 Feb 2007 15:12:53 -0000 1.6 @@ -1,14 +1,12 @@ -%define _version 0.2 - Name: catfish -Version: 0.2stable +Version: 0.2.1 Release: 1%{?dist} Summary: A handy file search tool Group: Applications/File License: GPL URL: http://software.twotoasts.de/?page=%{name} -Source0: http://software.twotoasts.de/media/%{name}/%{name}-%{_version}.tar.gz +Source0: http://software.twotoasts.de/media/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -36,15 +34,17 @@ configuration options from the command line. %prep -%setup -q -n %{name}-%{_version} +%setup -q %build -# Some configulation change +# Some configulation changes +# +# msgfmt is fixed. +# Linking is still broken... %{__sed} -i.misc \ - -e 's|666|644|' \ -e '/svg/s|install|install -m 644|' \ - -e 's|install |%{__install} -c -p |' \ - -e 's|\([^ \t][^ \t]*\).glade|-m 644 \1.glade|' \ + -e '/glade/s|install| install -m 644|' \ + -e 's|install |install -p |' \ -e 's|pyc|py|' \ -e 's|^\([ \t]*\)ln |\1: ln |' \ -e 's|cp -rf|cp -prf|' \ @@ -62,15 +62,6 @@ # and does not accept --libdir= option ./configure --prefix=%{_prefix} -# Create gettext .mo files manually for now as -# Makefile.in does not work -for pofile in i18n/*.po ; do - lang=`basename $pofile | sed -e 's|\.po$||'` - dir=locale/${lang}/LC_MESSAGES - %{__mkdir_p} $dir - msgfmt -v --statistics $pofile -o $dir/%{name}.mo -done - %install %{__rm} -rf $RPM_BUILD_ROOT @@ -89,7 +80,6 @@ %{__ln_s} -f ../locale/ \ $RPM_BUILD_ROOT%{_datadir}/%{name}/ -%{__mv} -f $RPM_BUILD_ROOT%{_prefix}/locale $RPM_BUILD_ROOT%{_datadir} %{find_lang} %{name} %clean @@ -105,6 +95,9 @@ %{_datadir}/pixmaps/%{name}.svg %changelog +* Sun Feb 18 2007 Mamoru Tasaka 0.2.1-1 +- 0.2.1 + * Wed Feb 14 2007 Mamoru Tasaka 0.2stable-1 - 0.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/catfish/FC-6/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 14 Feb 2007 09:48:03 -0000 1.5 +++ sources 18 Feb 2007 15:12:53 -0000 1.6 @@ -1 +1 @@ -848d61da8dcfd32dd1c5d2add6c10cd8 catfish-0.2.tar.gz +a46d609476ab0492c87aa75ffa9b4a98 catfish-0.2.1.tar.gz From fedora-extras-commits at redhat.com Sun Feb 18 15:13:35 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sun, 18 Feb 2007 10:13:35 -0500 Subject: rpms/catfish/FC-5 .cvsignore, 1.5, 1.6 catfish.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200702181513.l1IFDZ0S030346@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/catfish/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30243 Modified Files: .cvsignore catfish.spec sources Log Message: * Sun Feb 18 2007 Mamoru Tasaka 0.2.1-1 - 0.2.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/catfish/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 14 Feb 2007 09:48:57 -0000 1.5 +++ .cvsignore 18 Feb 2007 15:13:02 -0000 1.6 @@ -1 +1 @@ -catfish-0.2.tar.gz +catfish-0.2.1.tar.gz Index: catfish.spec =================================================================== RCS file: /cvs/extras/rpms/catfish/FC-5/catfish.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- catfish.spec 14 Feb 2007 09:48:57 -0000 1.5 +++ catfish.spec 18 Feb 2007 15:13:02 -0000 1.6 @@ -1,14 +1,12 @@ -%define _version 0.2 - Name: catfish -Version: 0.2stable +Version: 0.2.1 Release: 1%{?dist} Summary: A handy file search tool Group: Applications/File License: GPL URL: http://software.twotoasts.de/?page=%{name} -Source0: http://software.twotoasts.de/media/%{name}/%{name}-%{_version}.tar.gz +Source0: http://software.twotoasts.de/media/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -36,15 +34,17 @@ configuration options from the command line. %prep -%setup -q -n %{name}-%{_version} +%setup -q %build -# Some configulation change +# Some configulation changes +# +# msgfmt is fixed. +# Linking is still broken... %{__sed} -i.misc \ - -e 's|666|644|' \ -e '/svg/s|install|install -m 644|' \ - -e 's|install |%{__install} -c -p |' \ - -e 's|\([^ \t][^ \t]*\).glade|-m 644 \1.glade|' \ + -e '/glade/s|install| install -m 644|' \ + -e 's|install |install -p |' \ -e 's|pyc|py|' \ -e 's|^\([ \t]*\)ln |\1: ln |' \ -e 's|cp -rf|cp -prf|' \ @@ -62,15 +62,6 @@ # and does not accept --libdir= option ./configure --prefix=%{_prefix} -# Create gettext .mo files manually for now as -# Makefile.in does not work -for pofile in i18n/*.po ; do - lang=`basename $pofile | sed -e 's|\.po$||'` - dir=locale/${lang}/LC_MESSAGES - %{__mkdir_p} $dir - msgfmt -v --statistics $pofile -o $dir/%{name}.mo -done - %install %{__rm} -rf $RPM_BUILD_ROOT @@ -89,7 +80,6 @@ %{__ln_s} -f ../locale/ \ $RPM_BUILD_ROOT%{_datadir}/%{name}/ -%{__mv} -f $RPM_BUILD_ROOT%{_prefix}/locale $RPM_BUILD_ROOT%{_datadir} %{find_lang} %{name} %clean @@ -105,6 +95,9 @@ %{_datadir}/pixmaps/%{name}.svg %changelog +* Sun Feb 18 2007 Mamoru Tasaka 0.2.1-1 +- 0.2.1 + * Wed Feb 14 2007 Mamoru Tasaka 0.2stable-1 - 0.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/catfish/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 14 Feb 2007 09:48:57 -0000 1.5 +++ sources 18 Feb 2007 15:13:02 -0000 1.6 @@ -1 +1 @@ -848d61da8dcfd32dd1c5d2add6c10cd8 catfish-0.2.tar.gz +a46d609476ab0492c87aa75ffa9b4a98 catfish-0.2.1.tar.gz From fedora-extras-commits at redhat.com Sun Feb 18 15:54:48 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sun, 18 Feb 2007 10:54:48 -0500 Subject: rpms/xtide/devel .cvsignore, 1.15, 1.16 sources, 1.15, 1.16 xtide.spec, 1.22, 1.23 Message-ID: <200702181554.l1IFsmPI030860@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xtide/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30792 Modified Files: .cvsignore sources xtide.spec Log Message: * Sun Feb 18 2007 Mamoru Tasaka - 2.9-0.3.RC3 - 2.9 RC3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xtide/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 14 Feb 2007 08:02:43 -0000 1.15 +++ .cvsignore 18 Feb 2007 15:54:15 -0000 1.16 @@ -1 +1 @@ -xtide-2.9-RC2.tar.bz2 +xtide-2.9-RC3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xtide/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 14 Feb 2007 08:02:43 -0000 1.15 +++ sources 18 Feb 2007 15:54:15 -0000 1.16 @@ -1 +1 @@ -ff96ccf719b94924abd96708518f4000 xtide-2.9-RC2.tar.bz2 +73d8c8be6a91a5e70cd532a76ad0c233 xtide-2.9-RC3.tar.bz2 Index: xtide.spec =================================================================== RCS file: /cvs/extras/rpms/xtide/devel/xtide.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- xtide.spec 14 Feb 2007 08:02:43 -0000 1.22 +++ xtide.spec 18 Feb 2007 15:54:15 -0000 1.23 @@ -1,4 +1,4 @@ -%define betatag RC2 +%define betatag RC3 %define dwfdate 20070211 Summary: Calculate tide all over the world @@ -223,6 +223,9 @@ %{_datadir}/man/man8/xttpd.8* %changelog +* Sun Feb 18 2007 Mamoru Tasaka - 2.9-0.3.RC3 +- 2.9 RC3 + * Wed Feb 14 2007 Mamoru Tasaka - 2.9-0.3.RC2 - 2.9 RC2 From fedora-extras-commits at redhat.com Sun Feb 18 15:54:56 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sun, 18 Feb 2007 10:54:56 -0500 Subject: rpms/xtide/FC-6 .cvsignore, 1.15, 1.16 sources, 1.15, 1.16 xtide.spec, 1.22, 1.23 Message-ID: <200702181554.l1IFsut7030899@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xtide/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30814 Modified Files: .cvsignore sources xtide.spec Log Message: * Sun Feb 18 2007 Mamoru Tasaka - 2.9-0.3.RC3 - 2.9 RC3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xtide/FC-6/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 14 Feb 2007 08:03:27 -0000 1.15 +++ .cvsignore 18 Feb 2007 15:54:24 -0000 1.16 @@ -1 +1 @@ -xtide-2.9-RC2.tar.bz2 +xtide-2.9-RC3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xtide/FC-6/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 14 Feb 2007 08:03:27 -0000 1.15 +++ sources 18 Feb 2007 15:54:24 -0000 1.16 @@ -1 +1 @@ -ff96ccf719b94924abd96708518f4000 xtide-2.9-RC2.tar.bz2 +73d8c8be6a91a5e70cd532a76ad0c233 xtide-2.9-RC3.tar.bz2 Index: xtide.spec =================================================================== RCS file: /cvs/extras/rpms/xtide/FC-6/xtide.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- xtide.spec 14 Feb 2007 08:03:27 -0000 1.22 +++ xtide.spec 18 Feb 2007 15:54:24 -0000 1.23 @@ -1,4 +1,4 @@ -%define betatag RC2 +%define betatag RC3 %define dwfdate 20070211 Summary: Calculate tide all over the world @@ -223,6 +223,9 @@ %{_datadir}/man/man8/xttpd.8* %changelog +* Sun Feb 18 2007 Mamoru Tasaka - 2.9-0.3.RC3 +- 2.9 RC3 + * Wed Feb 14 2007 Mamoru Tasaka - 2.9-0.3.RC2 - 2.9 RC2 From fedora-extras-commits at redhat.com Sun Feb 18 15:55:04 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sun, 18 Feb 2007 10:55:04 -0500 Subject: rpms/xtide/FC-5 .cvsignore, 1.15, 1.16 sources, 1.15, 1.16 xtide.spec, 1.23, 1.24 Message-ID: <200702181555.l1IFt44r030944@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xtide/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30836 Modified Files: .cvsignore sources xtide.spec Log Message: * Sun Feb 18 2007 Mamoru Tasaka - 2.9-0.3.RC3 - 2.9 RC3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xtide/FC-5/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 14 Feb 2007 08:03:53 -0000 1.15 +++ .cvsignore 18 Feb 2007 15:54:31 -0000 1.16 @@ -1 +1 @@ -xtide-2.9-RC2.tar.bz2 +xtide-2.9-RC3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xtide/FC-5/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 14 Feb 2007 08:03:53 -0000 1.15 +++ sources 18 Feb 2007 15:54:31 -0000 1.16 @@ -1 +1 @@ -ff96ccf719b94924abd96708518f4000 xtide-2.9-RC2.tar.bz2 +73d8c8be6a91a5e70cd532a76ad0c233 xtide-2.9-RC3.tar.bz2 Index: xtide.spec =================================================================== RCS file: /cvs/extras/rpms/xtide/FC-5/xtide.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- xtide.spec 14 Feb 2007 08:03:53 -0000 1.23 +++ xtide.spec 18 Feb 2007 15:54:31 -0000 1.24 @@ -1,4 +1,4 @@ -%define betatag RC2 +%define betatag RC3 %define dwfdate 20070211 Summary: Calculate tide all over the world @@ -223,6 +223,9 @@ %{_datadir}/man/man8/xttpd.8* %changelog +* Sun Feb 18 2007 Mamoru Tasaka - 2.9-0.3.RC3 +- 2.9 RC3 + * Wed Feb 14 2007 Mamoru Tasaka - 2.9-0.3.RC2 - 2.9 RC2 From fedora-extras-commits at redhat.com Sun Feb 18 21:05:31 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Sun, 18 Feb 2007 16:05:31 -0500 Subject: rpms/audacity/FC-6 audacity-1.3.2-resample.patch, NONE, 1.1 audacity.spec, 1.25, 1.26 Message-ID: <200702182105.l1IL5Vrk022114@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/audacity/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22092 Modified Files: audacity.spec Added Files: audacity-1.3.2-resample.patch Log Message: added patch for compiling with libsamplerate audacity-1.3.2-resample.patch: --- NEW FILE audacity-1.3.2-resample.patch --- diff -Nur audacity-src-1.3.2-beta-orig/configure audacity-src-1.3.2-beta/configure --- audacity-src-1.3.2-beta-orig/configure 2006-10-29 01:05:36.000000000 +0200 +++ audacity-src-1.3.2-beta/configure 2007-02-18 21:07:34.000000000 +0100 @@ -6079,7 +6079,7 @@ fi - if false ; then + if true ; then cat >>confdefs.h <<\_ACEOF #define USE_LIBSAMPLERATE 1 diff -Nur audacity-src-1.3.2-beta-orig/src/Resample.cpp audacity-src-1.3.2-beta/src/Resample.cpp --- audacity-src-1.3.2-beta-orig/src/Resample.cpp 2006-10-29 01:05:28.000000000 +0200 +++ audacity-src-1.3.2-beta/src/Resample.cpp 2007-02-18 21:07:23.000000000 +0100 @@ -137,7 +137,7 @@ wxString Resample::GetMethodName(int index) { - return wxString(src_get_name(index)); + return wxString(wxString::FromAscii(src_get_name(index))); } int Resample::GetFastMethod() Index: audacity.spec =================================================================== RCS file: /cvs/extras/rpms/audacity/FC-6/audacity.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- audacity.spec 15 Feb 2007 22:47:43 -0000 1.25 +++ audacity.spec 18 Feb 2007 21:04:59 -0000 1.26 @@ -1,14 +1,15 @@ Name: audacity Version: 1.3.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A multitrack audio editor Group: Applications/Multimedia License: GPL URL: http://audacity.sourceforge.net -Source: http://dl.sf.net/sourceforge/audacity/audacity-src-1.3.2.tar.gz +Source: http://dl.sf.net/sourceforge/audacity/audacity-src-%{version}.tar.gz Source1: audacity.png Patch4: audacity-1.3.2-destdir.patch +Patch5: audacity-1.3.2-resample.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel BuildRequires: desktop-file-utils @@ -26,6 +27,8 @@ BuildRequires: wxGTK2-devel BuildRequires: zip BuildRequires: zlib-devel +%{?_with_mp3:BuildRequires: libmad-devel} + Requires(post): shared-mime-info, desktop-file-utils Requires(postun): shared-mime-info, desktop-file-utils @@ -44,6 +47,7 @@ %prep %setup -q -n %{name}-src-%{version}-beta %patch4 -p1 -b .destdir +%patch5 -p1 -b .resample cp -a src/Languages.cpp src/Languages.cpp.orig iconv -f ISO_8859-1 -t UTF-8 src/Languages.cpp.orig > src/Languages.cpp cp -a locale/fr.po locale/fr.po.orig @@ -119,6 +123,9 @@ %doc %{_datadir}/doc/* %changelog +* Sun Feb 18 2007 Gerard Milmeister - 1.3.2-7 +- added patch for compiling with libsamplerate + * Thu Feb 15 2007 Gerard Milmeister - 1.3.2-6 - build with system expat - added BuildReq alsa-lib-devel From fedora-extras-commits at redhat.com Sun Feb 18 21:10:34 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Sun, 18 Feb 2007 16:10:34 -0500 Subject: rpms/audacity/devel audacity-1.3.2-resample.patch, NONE, 1.1 audacity.spec, 1.29, 1.30 Message-ID: <200702182110.l1ILAY9s022209@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/audacity/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22185 Modified Files: audacity.spec Added Files: audacity-1.3.2-resample.patch Log Message: added patch for compiling with libsamplerate audacity-1.3.2-resample.patch: --- NEW FILE audacity-1.3.2-resample.patch --- diff -Nur audacity-src-1.3.2-beta-orig/configure audacity-src-1.3.2-beta/configure --- audacity-src-1.3.2-beta-orig/configure 2006-10-29 01:05:36.000000000 +0200 +++ audacity-src-1.3.2-beta/configure 2007-02-18 21:07:34.000000000 +0100 @@ -6079,7 +6079,7 @@ fi - if false ; then + if true ; then cat >>confdefs.h <<\_ACEOF #define USE_LIBSAMPLERATE 1 diff -Nur audacity-src-1.3.2-beta-orig/src/Resample.cpp audacity-src-1.3.2-beta/src/Resample.cpp --- audacity-src-1.3.2-beta-orig/src/Resample.cpp 2006-10-29 01:05:28.000000000 +0200 +++ audacity-src-1.3.2-beta/src/Resample.cpp 2007-02-18 21:07:23.000000000 +0100 @@ -137,7 +137,7 @@ wxString Resample::GetMethodName(int index) { - return wxString(src_get_name(index)); + return wxString(wxString::FromAscii(src_get_name(index))); } int Resample::GetFastMethod() Index: audacity.spec =================================================================== RCS file: /cvs/extras/rpms/audacity/devel/audacity.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- audacity.spec 15 Feb 2007 23:49:37 -0000 1.29 +++ audacity.spec 18 Feb 2007 21:10:02 -0000 1.30 @@ -1,6 +1,6 @@ Name: audacity Version: 1.3.2 -Release: 10.20070106cvs%{?dist} +Release: 11.20070106cvs%{?dist} Summary: A multitrack audio editor Group: Applications/Multimedia @@ -9,6 +9,7 @@ Source: http://dl.sf.net/sourceforge/audacity/audacity-cvs20070106.tar.bz2 Source1: audacity.png Patch4: audacity-1.3.2-destdir.patch +Patch5: audacity-1.3.2-resample.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel BuildRequires: desktop-file-utils @@ -26,6 +27,8 @@ BuildRequires: wxGTK2-devel BuildRequires: zip BuildRequires: zlib-devel +%{?_with_mp3:BuildRequires: libmad-devel} + Requires(post): shared-mime-info, desktop-file-utils Requires(postun): shared-mime-info, desktop-file-utils @@ -44,6 +47,7 @@ %prep %setup -q -n %{name} %patch4 -p1 -b .destdir +%patch5 -p1 -b .resample cp -a src/Languages.cpp src/Languages.cpp.orig iconv -f ISO_8859-1 -t UTF-8 src/Languages.cpp.orig > src/Languages.cpp cp -a locale/fr.po locale/fr.po.orig @@ -120,6 +124,9 @@ %changelog +* Sun Feb 18 2007 Gerard Milmeister - 1.3.2-11.20070106cvs +- added patch for compiling with libsamplerate + * Thu Feb 15 2007 Gerard Milmeister - 1.3.2-9.20070106cvs - disable flac for now From fedora-extras-commits at redhat.com Sun Feb 18 21:20:00 2007 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 18 Feb 2007 16:20:00 -0500 Subject: rpms/clamav/devel sources, 1.23, 1.24 clamav.spec, 1.47, 1.48 clamav-0.88.4-visibility.patch, 1.1, NONE Message-ID: <200702182120.l1ILK0a2022360@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22336 Modified Files: sources clamav.spec Removed Files: clamav-0.88.4-visibility.patch Log Message: - updated to final 0.90 - removed -visibility patch since fixed upstream Index: sources =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 3 Feb 2007 15:33:47 -0000 1.23 +++ sources 18 Feb 2007 21:19:28 -0000 1.24 @@ -1,2 +1,2 @@ -5af2bdbbb255829dd590609d900c1854 clamav-0.90rc3.tar.gz -978715ae312d5dda63a0591b0a4eae14 clamav-0.90rc3.tar.gz.sig +9d5d53eed766976c2cfc9b14d56b2bba clamav-0.90.tar.gz.sig +f04372e49c3c5ff3bd94bbe1fef2eaca clamav-0.90.tar.gz Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- clamav.spec 4 Feb 2007 11:57:35 -0000 1.47 +++ clamav.spec 18 Feb 2007 21:19:28 -0000 1.48 @@ -4,9 +4,6 @@ %bcond_without fedora ## - -%global rcver rc3 - %global username clamav %global homedir %_var/lib/clamav %global freshclamlog %_var/log/freshclam.log @@ -21,13 +18,13 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.90 -Release: %release_func 0.3.rc3 +Release: %release_func 0.4 License: GPL Group: Applications/File URL: http://www.clamav.net -Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?rcver}.tar.gz -Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?rcver}.tar.gz.sig +Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz +Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig Source1: clamd-wrapper Source2: clamd.sysconfig Source3: clamd.logrotate @@ -37,7 +34,6 @@ Source8: clamav-notify-servers Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch -Patch23: clamav-0.88.4-visibility.patch Patch24: clamav-0.90rc3-private.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release @@ -224,11 +220,10 @@ ## ------------------------------------------------------------ %prep -%setup -q -n %name-%version%{?rcver} +%setup -q %patch21 -p1 -b .path %patch22 -p1 -b .initoff -%patch23 -p1 -b .visibility %patch24 -p1 -b .private perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.!g; @@ -509,6 +504,10 @@ %changelog +* Sun Feb 18 2007 Enrico Scholz - 0.90-1 +- updated to final 0.90 +- removed -visibility patch since fixed upstream + * Sun Feb 4 2007 Enrico Scholz - 0.90-0.3.rc3 - build with -Wl,-as-needed and cleaned up pkgconfig file - removed old hack which forced installation of freshclam.conf; related --- clamav-0.88.4-visibility.patch DELETED --- From fedora-extras-commits at redhat.com Sun Feb 18 21:25:58 2007 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 18 Feb 2007 16:25:58 -0500 Subject: rpms/clamav/devel clamav.spec,1.48,1.49 Message-ID: <200702182125.l1ILPw0Z022460@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22439 Modified Files: clamav.spec Log Message: updated release Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- clamav.spec 18 Feb 2007 21:19:28 -0000 1.48 +++ clamav.spec 18 Feb 2007 21:25:26 -0000 1.49 @@ -18,7 +18,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.90 -Release: %release_func 0.4 +Release: %release_func 1 License: GPL Group: Applications/File From fedora-extras-commits at redhat.com Sun Feb 18 21:31:36 2007 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sun, 18 Feb 2007 16:31:36 -0500 Subject: rpms/mod_mono import.log,1.6,1.7 Message-ID: <200702182131.l1ILVacN022658@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/mod_mono In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22567 Modified Files: import.log Log Message: auto-import mod_mono-1.2.1-1 on branch FC-6 from mod_mono-1.2.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/mod_mono/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 25 Nov 2006 17:24:13 -0000 1.6 +++ import.log 18 Feb 2007 21:31:04 -0000 1.7 @@ -3,3 +3,4 @@ mod_mono-1_1_18-1:HEAD:mod_mono-1.1.18-1.src.rpm:1160861659 mod_mono-1_1_18-1:FC-5:mod_mono-1.1.18-1.src.rpm:1160861755 mod_mono-1_2_1-1:HEAD:mod_mono-1.2.1-1.src.rpm:1164475504 +mod_mono-1_2_1-1:FC-6:mod_mono-1.2.1-1.src.rpm:1171834243 From fedora-extras-commits at redhat.com Sun Feb 18 21:31:39 2007 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sun, 18 Feb 2007 16:31:39 -0500 Subject: rpms/mod_mono/FC-6 .cvsignore, 1.3, 1.4 mod_mono.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200702182131.l1ILVduw022663@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/mod_mono/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22567/FC-6 Modified Files: .cvsignore mod_mono.spec sources Log Message: auto-import mod_mono-1.2.1-1 on branch FC-6 from mod_mono-1.2.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_mono/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 14 Oct 2006 21:34:31 -0000 1.3 +++ .cvsignore 18 Feb 2007 21:31:06 -0000 1.4 @@ -1 +1 @@ -mod_mono-1.1.18.tar.gz +mod_mono-1.2.1.tar.gz Index: mod_mono.spec =================================================================== RCS file: /cvs/extras/rpms/mod_mono/FC-6/mod_mono.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mod_mono.spec 14 Oct 2006 21:34:31 -0000 1.2 +++ mod_mono.spec 18 Feb 2007 21:31:07 -0000 1.3 @@ -1,5 +1,5 @@ Name: mod_mono -Version: 1.1.18 +Version: 1.2.1 Release: 1%{?dist} License: Apache Software License BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -46,6 +46,12 @@ %{_mandir}/man8/mod_mono.8* %changelog +* Sat Nov 25 2006 Paul F. Johnson 1.2.1-1 +- bump + +* Fri Nov 03 2006 Paul F. Johnson 1.2-1 +- bump + * Sat Oct 14 2006 Paul F. Johnson 1.1.18-1 - bump Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_mono/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 14 Oct 2006 21:34:31 -0000 1.3 +++ sources 18 Feb 2007 21:31:07 -0000 1.4 @@ -1 +1 @@ -4b4eaee10dc1a0231a81f64a19d59555 mod_mono-1.1.18.tar.gz +7159da992ab6e656388bf1f55dea0961 mod_mono-1.2.1.tar.gz From fedora-extras-commits at redhat.com Sun Feb 18 21:33:41 2007 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sun, 18 Feb 2007 16:33:41 -0500 Subject: rpms/xsp import.log,1.22,1.23 Message-ID: <200702182133.l1ILXf4x022767@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/xsp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22731 Modified Files: import.log Log Message: auto-import xsp-1.2.3-1 on branch FC-6 from xsp-1.2.3-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/xsp/import.log,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- import.log 15 Feb 2007 13:50:32 -0000 1.22 +++ import.log 18 Feb 2007 21:33:08 -0000 1.23 @@ -19,3 +19,4 @@ xsp-1_1_18-1:HEAD:xsp-1.1.18-1.src.rpm:1160862214 xsp-1_2_1-1:HEAD:xsp-1.2.1-1.src.rpm:1164474621 xsp-1_2_3-1:HEAD:xsp-1.2.3-1.src.rpm:1171547370 +xsp-1_2_3-1:FC-6:xsp-1.2.3-1.src.rpm:1171834370 From fedora-extras-commits at redhat.com Sun Feb 18 21:33:43 2007 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sun, 18 Feb 2007 16:33:43 -0500 Subject: rpms/xsp/FC-6 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 xsp.spec, 1.12, 1.13 Message-ID: <200702182133.l1ILXhk8022772@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/xsp/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22731/FC-6 Modified Files: .cvsignore sources xsp.spec Log Message: auto-import xsp-1.2.3-1 on branch FC-6 from xsp-1.2.3-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xsp/FC-6/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 14 Oct 2006 21:43:49 -0000 1.7 +++ .cvsignore 18 Feb 2007 21:33:11 -0000 1.8 @@ -1 +1 @@ -xsp-1.1.18.tar.gz +xsp-1.2.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xsp/FC-6/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 14 Oct 2006 21:43:49 -0000 1.7 +++ sources 18 Feb 2007 21:33:11 -0000 1.8 @@ -1 +1 @@ -6c39f7cbdc2f7c59f25bedaf5495721a xsp-1.1.18.tar.gz +bdd6bd7d2dab9e117fc1fd4c03aac45b xsp-1.2.3.tar.gz Index: xsp.spec =================================================================== RCS file: /cvs/extras/rpms/xsp/FC-6/xsp.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- xsp.spec 14 Oct 2006 21:43:49 -0000 1.12 +++ xsp.spec 18 Feb 2007 21:33:11 -0000 1.13 @@ -1,5 +1,5 @@ Name: xsp -Version: 1.1.18 +Version: 1.2.3 Release: 1%{?dist} License: BSD BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -69,6 +69,12 @@ %{_libdir}/pkgconfig/xsp* %changelog +* Thu Feb 15 2007 Paul F. Johnson 1.2.3-1 +- bump + +* Sat Nov 23 2006 Paul F. Johnson 1.2.1-1 +- bump + * Sat Oct 14 2006 Paul F. Johnson 1.1.18-1 - bump From fedora-extras-commits at redhat.com Mon Feb 19 02:22:15 2007 From: fedora-extras-commits at redhat.com (Eric Moret (emoret)) Date: Sun, 18 Feb 2007 21:22:15 -0500 Subject: rpms/paprefs - New directory Message-ID: <200702190222.l1J2MFux009762@cvs-int.fedora.redhat.com> Author: emoret Update of /cvs/extras/rpms/paprefs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9757/paprefs Log Message: Directory /cvs/extras/rpms/paprefs added to the repository From fedora-extras-commits at redhat.com Mon Feb 19 02:22:23 2007 From: fedora-extras-commits at redhat.com (Eric Moret (emoret)) Date: Sun, 18 Feb 2007 21:22:23 -0500 Subject: rpms/paprefs/devel - New directory Message-ID: <200702190222.l1J2MNab009776@cvs-int.fedora.redhat.com> Author: emoret Update of /cvs/extras/rpms/paprefs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9757/paprefs/devel Log Message: Directory /cvs/extras/rpms/paprefs/devel added to the repository From fedora-extras-commits at redhat.com Mon Feb 19 06:09:50 2007 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Mon, 19 Feb 2007 01:09:50 -0500 Subject: rpms/darcs/devel .cvsignore, 1.7, 1.8 darcs.spec, 1.15, 1.16 sources, 1.7, 1.8 Message-ID: <200702190609.l1J69oQe025553@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25518 Modified Files: .cvsignore darcs.spec sources Log Message: update to 1.0.9rc2 which builds with ghc66 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/darcs/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 21 Jun 2006 08:34:35 -0000 1.7 +++ .cvsignore 19 Feb 2007 06:09:17 -0000 1.8 @@ -1 +1 @@ -darcs-1.0.8.tar.gz +darcs-1.0.9rc2.tar.gz Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/devel/darcs.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- darcs.spec 2 Feb 2007 00:48:48 -0000 1.15 +++ darcs.spec 19 Feb 2007 06:09:17 -0000 1.16 @@ -1,12 +1,14 @@ +%define prerel rc2 + Name: darcs -Version: 1.0.8 -Release: 5%{?dist} +Version: 1.0.9 +Release: 0.%{prerel}.1%{?dist} Summary: David's advanced revision control system Group: Development/Tools License: GPL URL: http://www.darcs.net/ -Source0: http://www.darcs.net/%{name}-%{version}.tar.gz +Source0: http://www.darcs.net/%{name}-%{version}%{prerel}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ghc, %{_sbindir}/sendmail, curl-devel, ncurses-devel, zlib-devel @@ -47,7 +49,7 @@ %prep -%setup -q +%setup -q -n %{name}-%{version}%{prerel} # skip test currently failing in buildsystem mv tests/send.sh{,-disabled} @@ -89,6 +91,9 @@ %changelog +* Mon Feb 19 2007 Jens Petersen - 1.0.9-0.rc2.1 +- update to 1.0.9rc2 which builds with ghc66 + * Fri Feb 2 2007 Jens Petersen - 1.0.8-5 - rebuild for ncurses replacing termcap (#226754) Index: sources =================================================================== RCS file: /cvs/extras/rpms/darcs/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 21 Jun 2006 08:34:35 -0000 1.7 +++ sources 19 Feb 2007 06:09:17 -0000 1.8 @@ -1 +1 @@ -a7a26d1a98c5675dcab4c2cc30eba59d darcs-1.0.8.tar.gz +fe268bc6d030141fc7f92417b96fca16 darcs-1.0.9rc2.tar.gz From fedora-extras-commits at redhat.com Mon Feb 19 06:18:00 2007 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Mon, 19 Feb 2007 01:18:00 -0500 Subject: rpms/darcs/devel darcs.spec,1.16,1.17 Message-ID: <200702190618.l1J6I0Pb025673@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25649 Modified Files: darcs.spec Log Message: improve release field for rc release Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/devel/darcs.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- darcs.spec 19 Feb 2007 06:09:17 -0000 1.16 +++ darcs.spec 19 Feb 2007 06:17:28 -0000 1.17 @@ -2,7 +2,7 @@ Name: darcs Version: 1.0.9 -Release: 0.%{prerel}.1%{?dist} +Release: 0.1.%{prerel}%{?dist} Summary: David's advanced revision control system Group: Development/Tools @@ -91,7 +91,7 @@ %changelog -* Mon Feb 19 2007 Jens Petersen - 1.0.9-0.rc2.1 +* Mon Feb 19 2007 Jens Petersen - 1.0.9-0.1.rc2 - update to 1.0.9rc2 which builds with ghc66 * Fri Feb 2 2007 Jens Petersen - 1.0.8-5 From fedora-extras-commits at redhat.com Mon Feb 19 09:49:36 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 19 Feb 2007 04:49:36 -0500 Subject: rpms/gnumeric/devel gnumeric.spec,1.22,1.23 Message-ID: <200702190949.l1J9na2Z008409@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gnumeric/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8382 Modified Files: gnumeric.spec Log Message: * Mon Feb 19 2007 Hans de Goede 1:1.6.3-6 - Change BuildRequires: libgsf-devel to libgsf-gnome-devel to fix rawhide build Index: gnumeric.spec =================================================================== RCS file: /cvs/extras/rpms/gnumeric/devel/gnumeric.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- gnumeric.spec 9 Sep 2006 13:26:31 -0000 1.22 +++ gnumeric.spec 19 Feb 2007 09:49:04 -0000 1.23 @@ -1,7 +1,7 @@ Name: gnumeric Epoch: 1 Version: 1.6.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Spreadsheet program for GNOME Group: Applications/Productivity License: GPL @@ -15,7 +15,7 @@ BuildRequires: libgnomeui-devel >= 2.4.0 BuildRequires: libgnomeprintui22-devel >= 2.8.2 BuildRequires: python-devel -BuildRequires: libgsf-devel >= 1.13.2 +BuildRequires: libgsf-gnome-devel >= 1.13.2 BuildRequires: automake autoconf libtool BuildRequires: intltool scrollkeeper gettext BuildRequires: libgnomedb-devel >= 1.0.4 @@ -167,6 +167,9 @@ %changelog +* Mon Feb 19 2007 Hans de Goede 1:1.6.3-6 +- Change BuildRequires: libgsf-devel to libgsf-gnome-devel to fix rawhide build + * Sat Sep 9 2006 Hans de Goede 1:1.6.3-5 - Various specfile cleanups - Don't own /usr/share/omf (bug 205667) From fedora-extras-commits at redhat.com Mon Feb 19 09:59:36 2007 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 19 Feb 2007 04:59:36 -0500 Subject: rpms/mhash/devel .cvsignore, 1.5, 1.6 mhash.spec, 1.18, 1.19 sources, 1.5, 1.6 mhash-0.9.7.1-haval-be.patch, 1.3, NONE Message-ID: <200702190959.l1J9xaEN008587@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/mhash/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8541 Modified Files: .cvsignore mhash.spec sources Removed Files: mhash-0.9.7.1-haval-be.patch Log Message: * Mon Feb 19 2007 Michael Schwendt - 0.9.8-1 - Update to 0.9.8 (includes the patch). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mhash/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 25 Nov 2006 12:41:36 -0000 1.5 +++ .cvsignore 19 Feb 2007 09:59:03 -0000 1.6 @@ -1 +1 @@ -mhash-0.9.7.1.tar.bz2 +mhash-0.9.8.tar.bz2 Index: mhash.spec =================================================================== RCS file: /cvs/extras/rpms/mhash/devel/mhash.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- mhash.spec 2 Feb 2007 17:21:16 -0000 1.18 +++ mhash.spec 19 Feb 2007 09:59:03 -0000 1.19 @@ -1,12 +1,11 @@ Summary: Thread-safe hash algorithms library Name: mhash -Version: 0.9.7.1 -Release: 4 +Version: 0.9.8 +Release: 1 URL: http://mhash.sourceforge.net/ License: LGPL Group: System Environment/Libraries Source: http://download.sourceforge.net/mhash/mhash-%{version}.tar.bz2 -Patch0: mhash-0.9.7.1-haval-be.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) Provides: libmhash = %{version}-%{release} @@ -37,7 +36,6 @@ %prep %setup -q -%patch0 -p1 -b .be-test %build @@ -76,7 +74,7 @@ %files -n %{name}-devel %defattr(-,root,root,-) -%doc ChangeLog ./doc/*.txt ./doc/*.c ./doc/skid2-authentication +%doc ChangeLog ./doc/*.c ./doc/skid2-authentication %{_includedir}/*.h %{_includedir}/mutils/ %{?_with_static: %{_libdir}/*.a} @@ -86,6 +84,9 @@ %changelog +* Mon Feb 19 2007 Michael Schwendt - 0.9.8-1 +- Update to 0.9.8 (includes the patch). + * Fri Feb 2 2007 Michael Schwendt - 0.9.7.1-4 - Fix big-endian memory leaks in haval.c - Patch is sufficient to pass test-suite on ppc. Fixes #226987. Index: sources =================================================================== RCS file: /cvs/extras/rpms/mhash/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 25 Nov 2006 12:41:36 -0000 1.5 +++ sources 19 Feb 2007 09:59:03 -0000 1.6 @@ -1 +1 @@ -e2a7f6594d468c5d0edbfa788dbdca0f mhash-0.9.7.1.tar.bz2 +93c0251713c2ddd5b9ef967e12cb42e8 mhash-0.9.8.tar.bz2 --- mhash-0.9.7.1-haval-be.patch DELETED --- From fedora-extras-commits at redhat.com Mon Feb 19 09:59:43 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 19 Feb 2007 04:59:43 -0500 Subject: rpms/gkrellm-wifi/devel gkrellm-wifi-0.9.12-asm_h.patch, NONE, 1.1 gkrellm-wifi.spec, 1.2, 1.3 Message-ID: <200702190959.l1J9xhix008592@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gkrellm-wifi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8563 Modified Files: gkrellm-wifi.spec Added Files: gkrellm-wifi-0.9.12-asm_h.patch Log Message: * Mon Feb 19 2007 Hans de Goede 0.9.12-4 - Add #include to fix compile with recent kernel-headers gkrellm-wifi-0.9.12-asm_h.patch: --- NEW FILE gkrellm-wifi-0.9.12-asm_h.patch --- --- gkrellm-wifi-0.9.12/gkrellm-wifi-linux.c.asm_h 2007-02-19 10:58:27.000000000 +0100 +++ gkrellm-wifi-0.9.12/gkrellm-wifi-linux.c 2007-02-19 10:59:51.000000000 +0100 @@ -29,6 +29,8 @@ #include #include +#include +#include #include #include "gkrellm-wifi-monitor.h" Index: gkrellm-wifi.spec =================================================================== RCS file: /cvs/extras/rpms/gkrellm-wifi/devel/gkrellm-wifi.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gkrellm-wifi.spec 28 Aug 2006 11:28:58 -0000 1.2 +++ gkrellm-wifi.spec 19 Feb 2007 09:59:11 -0000 1.3 @@ -1,12 +1,13 @@ Name: gkrellm-wifi Version: 0.9.12 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Wireless monitor plugin for the GNU Krell Monitors Group: Applications/System License: GPL URL: http://www.gkrellm.net/ Source0: http://dev.gentoo.org/~brix/files/%{name}/%{name}-%{version}.tar.gz Patch0: %{name}-%{version}.patch +Patch1: gkrellm-wifi-0.9.12-asm_h.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gkrellm-devel Requires: gkrellm >= 2.2, gkrellm < 3 @@ -25,6 +26,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 -z .asm_h %build @@ -49,6 +51,9 @@ %changelog +* Mon Feb 19 2007 Hans de Goede 0.9.12-4 +- Add #include to fix compile with recent kernel-headers + * Mon Aug 28 2006 Hans de Goede 0.9.12-3 - FE6 Rebuild From fedora-extras-commits at redhat.com Mon Feb 19 10:07:49 2007 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Mon, 19 Feb 2007 05:07:49 -0500 Subject: rpms/yum-utils/devel .cvsignore, 1.7, 1.8 sources, 1.8, 1.9 yum-utils.spec, 1.16, 1.17 Message-ID: <200702191007.l1JA7nRi012258@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yum-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12206 Modified Files: .cvsignore sources yum-utils.spec Log Message: yum-utils release 1.1.0 (yum >= 3.1.1 only) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yum-utils/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 6 Feb 2007 11:06:53 -0000 1.7 +++ .cvsignore 19 Feb 2007 10:07:16 -0000 1.8 @@ -1 +1 @@ -yum-utils-1.0.2.tar.gz +yum-utils-1.1.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yum-utils/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 6 Feb 2007 11:06:53 -0000 1.8 +++ sources 19 Feb 2007 10:07:16 -0000 1.9 @@ -1 +1 @@ -3d63ecea2d0472ca2e1d893e7b5bfb78 yum-utils-1.0.2.tar.gz +e6f7ab679089936a598fa9730a6b6128 yum-utils-1.1.0.tar.gz Index: yum-utils.spec =================================================================== RCS file: /cvs/extras/rpms/yum-utils/devel/yum-utils.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- yum-utils.spec 6 Feb 2007 11:17:56 -0000 1.16 +++ yum-utils.spec 19 Feb 2007 10:07:16 -0000 1.17 @@ -1,14 +1,14 @@ Summary: Utilities based around the yum package manager Name: yum-utils -Version: 1.0.2 -Release: 2%{?dist} +Version: 1.1.0 +Release: 1%{?dist} License: GPL Group: Development/Tools Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz URL: http://linux.duke.edu/yum/download/yum-utils/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: python >= 2.4 , yum >= 3.0 +Requires: python >= 2.4 , yum >= 3.1.1 %description yum-utils is a collection of utilities and examples for the yum package @@ -117,7 +117,7 @@ Requires: yum >= 3.0 %description -n yum-skip-broken -This plugin adds a --ignore-broken to yum to make it possible to +This plugin adds a --skip-broken to yum to make it possible to check packages for dependency problems and skip the one with problems. %package -n yum-priorities @@ -130,6 +130,17 @@ Packages in a repository with a lower priority can't be overridden by packages from a repository with a higher priority even if repo has a later version. +%package -n yum-refresh-updatesd +Summary: Tell yum-updatesd to check for updates when yum exits +Group: System Environment/Base +Requires: yum >= 3.0 + +%description -n yum-refresh-updatesd +yum-refresh-updatesd tells yum-updatesd to check for updates when yum exits. +This way, if you run 'yum list updates' and yum says there's a new version +of (for example) zsh available, puplet will almost instantly update itself +to reflect this. + %prep %setup -q @@ -139,7 +150,7 @@ make -C updateonboot DESTDIR=$RPM_BUILD_ROOT install # Plugins to install -plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module downloadonly allowdowngrade skip-broken priorities" +plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module downloadonly allowdowngrade skip-broken priorities refresh-updatesd" mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/ cd plugins @@ -187,6 +198,8 @@ %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/changelog.conf /usr/lib/yum-plugins/changelog.* +%{_mandir}/man1/yum-changelog.1.* +%{_mandir}/man5/yum-changelog.conf.5.* %files -n yum-fastestmirror %defattr(-, root, root) @@ -238,11 +251,34 @@ %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/priorities.conf /usr/lib/yum-plugins/priorities.* +%files -n yum-refresh-updatesd +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/refresh-updatesd.conf +/usr/lib/yum-plugins/refresh-updatesd.* %changelog +* Mon Feb 19 2007 Tim Lauridsen +- mark it as 1.1.0 (again) + +* Thu Feb 15 2007 Tim Lauridsen +- removed versionlock.list installation. + +* Wed Feb 14 2007 Tim Lauridsen +- Added versionlock.list installation. +- fixed skip-broken description (--ignore-broken -> --skip-broken) + +* Tue Feb 13 2007 James Bowes +- Add yum-refresh-updatesd plugin + +* Thu Feb 8 2007 Tim Lauridsen +- Added man dirs to yum-changelog files section + +* Wed Feb 7 2007 Tim Lauridsen +- mark it as 1.1.0 +- Requires: yum >= 3.1.1 for yum-utils. * Tue Feb 6 2007 Tim Lauridsen -- bumped release and added %%{dist} tag +- Added %%{?dist} tag * Sun Dec 31 2006 Tim Lauridsen - mark it as 1.0.2 From fedora-extras-commits at redhat.com Mon Feb 19 10:08:07 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 19 Feb 2007 05:08:07 -0500 Subject: rpms/xmms-speex/devel speex-xmms-0.9.1-includes.patch, NONE, 1.1 xmms-speex.spec, 1.8, 1.9 Message-ID: <200702191008.l1JA87cU012285@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/xmms-speex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12228 Modified Files: xmms-speex.spec Added Files: speex-xmms-0.9.1-includes.patch Log Message: Include patch to add new speex/ prefix to speex header files. speex-xmms-0.9.1-includes.patch: --- NEW FILE speex-xmms-0.9.1-includes.patch --- diff -Naupr speex-xmms.orig/fileinfo.c speex-xmms/fileinfo.c --- speex-xmms.orig/fileinfo.c 2003-05-23 14:03:39.000000000 +0200 +++ speex-xmms/fileinfo.c 2007-02-19 11:01:33.000000000 +0100 @@ -10,8 +10,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff -Naupr speex-xmms.orig/http.c speex-xmms/http.c --- speex-xmms.orig/http.c 2003-05-23 00:36:05.000000000 +0200 +++ speex-xmms/http.c 2007-02-19 11:02:08.000000000 +0100 @@ -37,7 +37,7 @@ #include "xmms/util.h" #include "xmms/plugin.h" -#include +#include #include "libspeex.h" diff -Naupr speex-xmms.orig/libspeex.c speex-xmms/libspeex.c --- speex-xmms.orig/libspeex.c 2003-08-03 17:33:11.000000000 +0200 +++ speex-xmms/libspeex.c 2007-02-19 11:02:35.000000000 +0100 @@ -22,10 +22,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include diff -Naupr speex-xmms.orig/libspeex.h speex-xmms/libspeex.h --- speex-xmms.orig/libspeex.h 2003-05-21 20:32:26.000000000 +0200 +++ speex-xmms/libspeex.h 2007-02-19 11:02:47.000000000 +0100 @@ -5,7 +5,7 @@ #ifndef __LIBSPEEX_H__ #define __LIBSPEEX_H__ -#include +#include #include #include "speexutil.h" diff -Naupr speex-xmms.orig/speexutil.c speex-xmms/speexutil.c --- speex-xmms.orig/speexutil.c 2003-08-03 18:18:34.000000000 +0200 +++ speex-xmms/speexutil.c 2007-02-19 11:03:03.000000000 +0100 @@ -9,8 +9,8 @@ #include #include #include -#include -#include +#include +#include #include "speexutil.h" int speex_seek(FILE* spxfile, int time, char direction, int freq) { diff -Naupr speex-xmms.orig/speexutil.h speex-xmms/speexutil.h --- speex-xmms.orig/speexutil.h 2003-04-27 22:02:37.000000000 +0200 +++ speex-xmms/speexutil.h 2007-02-19 11:03:11.000000000 +0100 @@ -5,7 +5,7 @@ #ifndef __SPEEXUTIL_H__ #define __SPEEXUTIL_H__ -#include +#include typedef struct { Index: xmms-speex.spec =================================================================== RCS file: /cvs/extras/rpms/xmms-speex/devel/xmms-speex.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xmms-speex.spec 28 Aug 2006 16:40:23 -0000 1.8 +++ xmms-speex.spec 19 Feb 2007 10:07:35 -0000 1.9 @@ -3,13 +3,14 @@ Summary: X MultiMedia System input plugin to play speex files Name: xmms-speex Version: 0.9.1 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL Group: Applications/Multimedia URL: http://jzb.rapanden.dk/projects/speex-xmms Source: http://jzb.rapanden.dk/pub/speex-xmms-%{version}.tar.gz Patch0: speex-xmms-0.9.1.patch Patch1: speex-xmms-0.9.1-gcc4.patch +Patch2: speex-xmms-0.9.1-includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: xmms-devel, speex-devel, libogg-devel @@ -22,6 +23,7 @@ %setup -n speex-xmms %patch0 -p1 %patch1 -p1 -b .gcc4 +%patch2 -p1 -b .includes %build @@ -44,6 +46,9 @@ %changelog +* Mon Feb 19 2007 Matthias Saou 0.9.1-9 +- Include patch to add new speex/ prefix to speex header files. + * Mon Aug 28 2006 Matthias Saou 0.9.1-8 - FC6 rebuild. From fedora-extras-commits at redhat.com Mon Feb 19 10:08:36 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 19 Feb 2007 05:08:36 -0500 Subject: rpms/php-eaccelerator/devel php-eaccelerator.spec,1.26,1.27 Message-ID: <200702191008.l1JA8aYA012337@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12266 Modified Files: php-eaccelerator.spec Log Message: Rebuild against PHP 5.2.1. Index: php-eaccelerator.spec =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/devel/php-eaccelerator.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- php-eaccelerator.spec 4 Dec 2006 09:47:57 -0000 1.26 +++ php-eaccelerator.spec 19 Feb 2007 10:08:03 -0000 1.27 @@ -1,7 +1,7 @@ # Useful defaults when building in chroots on systems where PHP is unavailable %define default_extdir %{_libdir}/php4 %define default_apiver 20041225 -%define default_version 5.2.0 +%define default_version 5.2.1 %define module_version 0.9.5 @@ -16,7 +16,7 @@ Summary: PHP accelerator, optimizer, encoder and dynamic content cacher Name: php-eaccelerator Version: %{php_version}_%{module_version} -Release: 2%{?dist} +Release: 1%{?dist} License: GPL Group: Development/Languages URL: http://eaccelerator.net/ @@ -94,6 +94,9 @@ %changelog +* Mon Feb 19 2007 Matthias Saou 5.2.1_0.9.5-1 +- Rebuild against PHP 5.2.1. + * Mon Dec 4 2006 Matthias Saou 5.2.0_0.9.5-2 - Include patch to fix use of PHP 5.2 (ea #204, rh #218166). From fedora-extras-commits at redhat.com Mon Feb 19 10:12:09 2007 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Mon, 19 Feb 2007 05:12:09 -0500 Subject: rpms/yum-utils/FC-6 .cvsignore, 1.7, 1.8 sources, 1.8, 1.9 yum-utils.spec, 1.16, 1.17 Message-ID: <200702191012.l1JAC9T4012436@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yum-utils/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12413 Modified Files: .cvsignore sources yum-utils.spec Log Message: yum-utils release 1.0.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yum-utils/FC-6/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 31 Oct 2006 14:33:08 -0000 1.7 +++ .cvsignore 19 Feb 2007 10:11:37 -0000 1.8 @@ -1,2 +1 @@ -yum-utils-1.0.tar.gz -yum-utils-1.0.1.tar.gz +yum-utils-1.0.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yum-utils/FC-6/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 6 Feb 2007 11:06:51 -0000 1.8 +++ sources 19 Feb 2007 10:11:37 -0000 1.9 @@ -1 +1 @@ -3d63ecea2d0472ca2e1d893e7b5bfb78 yum-utils-1.0.2.tar.gz +045295ff480b9761d04ac5e07896ff77 yum-utils-1.0.3.tar.gz Index: yum-utils.spec =================================================================== RCS file: /cvs/extras/rpms/yum-utils/FC-6/yum-utils.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- yum-utils.spec 6 Feb 2007 11:17:54 -0000 1.16 +++ yum-utils.spec 19 Feb 2007 10:11:37 -0000 1.17 @@ -1,7 +1,7 @@ Summary: Utilities based around the yum package manager Name: yum-utils -Version: 1.0.2 -Release: 2%{?dist} +Version: 1.0.3 +Release: 1%{?dist} License: GPL Group: Development/Tools Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz @@ -117,7 +117,7 @@ Requires: yum >= 3.0 %description -n yum-skip-broken -This plugin adds a --ignore-broken to yum to make it possible to +This plugin adds a --skip-broken to yum to make it possible to check packages for dependency problems and skip the one with problems. %package -n yum-priorities @@ -187,6 +187,8 @@ %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/changelog.conf /usr/lib/yum-plugins/changelog.* +%{_mandir}/man1/yum-changelog.1.* +%{_mandir}/man5/yum-changelog.conf.5.* %files -n yum-fastestmirror %defattr(-, root, root) @@ -240,9 +242,25 @@ %changelog +* Mon Feb 19 2007 Tim Lauridsen +- Added %%{?dist} tag again + +* Mon Feb 19 2007 Tim Lauridsen +- mark it as 1.0.3 +- Removed %%{?dist} tag + +* Thu Feb 15 2007 Tim Lauridsen +- removed versionlock.list installation. + +* Wed Feb 14 2007 Tim Lauridsen +- Added versionlock.list installation. +- fixed skip-broken description (--ignore-broken -> --skip-broken) + +* Thu Feb 8 2007 Tim Lauridsen +- Added man dirs to yum-changelog files section * Tue Feb 6 2007 Tim Lauridsen -- bumped release and added %%{dist} tag +- Added %%{?dist} tag * Sun Dec 31 2006 Tim Lauridsen - mark it as 1.0.2 From fedora-extras-commits at redhat.com Mon Feb 19 10:22:02 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 19 Feb 2007 05:22:02 -0500 Subject: rpms/soundtouch/devel soundtouch.spec,1.4,1.5 Message-ID: <200702191022.l1JAM2Be012633@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/soundtouch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12614 Modified Files: soundtouch.spec Log Message: * Mon Feb 19 2007 Hans de Goede 1.3.1-7 - Fix building with automake-1.10 Index: soundtouch.spec =================================================================== RCS file: /cvs/extras/rpms/soundtouch/devel/soundtouch.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- soundtouch.spec 29 Aug 2006 06:05:41 -0000 1.4 +++ soundtouch.spec 19 Feb 2007 10:21:30 -0000 1.5 @@ -1,6 +1,6 @@ Name: soundtouch Version: 1.3.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Audio Processing library for changing Tempo, Pitch and Playback Rates License: LGPL Group: System Environment/Libraries @@ -44,9 +44,13 @@ sed -i 's|-O3 -msse|$(CFLAGS)|' source/SoundTouch/Makefile.* %endif sed -i 's|-O3|$(CFLAGS)|' source/example/*/Makefile.* +# fix compile with automake-1.10 +for i in install-sh depcomp missing; do + ln -f -s /usr/share/automake-1.10/$i config/$i +done # cleanup a bit -chmod -x README.html -sed -i 's|\r||' README.html COPYING.TXT +chmod -x README.html source/SoundTouch/RateTransposer.cpp +sed -i 's|\r||g' README.html COPYING.TXT source/SoundTouch/RateTransposer.cpp %build @@ -101,6 +105,9 @@ %changelog +* Mon Feb 19 2007 Hans de Goede 1.3.1-7 +- Fix building with automake-1.10 + * Tue Aug 29 2006 Hans de Goede 1.3.1-6 - FE6 Rebuild From fedora-extras-commits at redhat.com Mon Feb 19 10:34:15 2007 From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak)) Date: Mon, 19 Feb 2007 05:34:15 -0500 Subject: fedora-security/audit fc5,1.452,1.453 fc6,1.206,1.207 Message-ID: <200702191034.l1JAYFb7012840@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12821 Modified Files: fc5 fc6 Log Message: spamassassin Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.452 retrieving revision 1.453 diff -u -r1.452 -r1.453 --- fc5 16 Feb 2007 14:06:47 -0000 1.452 +++ fc5 19 Feb 2007 10:34:13 -0000 1.453 @@ -10,6 +10,7 @@ CVE-2007-0650 ignore (tetex) needs user's assistance CVE-2007-0494 version (bind, fixed 9.3.4) #225268 [since FEDORA-2007-164] CVE-2007-0493 version (bind, fixed 9.3.4) #224443 [since FEDORA-2007-164] +CVE-2007-0451 version (spamassassin, fixed 3.1.8) [since FEDORA-2007-242] CVE-2007-0247 backport(squid, fixed 2.6.STABLE7) #222883 [since FEDORA-2007-092] CVE-2007-0235 VULNERABLE (libgtop2) #222637 not sure, will triage CVE-2007-0104 ignore (poppler) only client DoS Index: fc6 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc6,v retrieving revision 1.206 retrieving revision 1.207 diff -u -r1.206 -r1.207 --- fc6 16 Feb 2007 14:06:47 -0000 1.206 +++ fc6 19 Feb 2007 10:34:13 -0000 1.207 @@ -16,6 +16,7 @@ CVE-2007-0457 VULNERABLE (wireshark, fixed 0.99.5) #227140 CVE-2007-0456 VULNERABLE (wireshark, fixed 0.99.5) #227140 CVE-2007-0455 VULNERABLE (gd) #224610 +CVE-2007-0451 version (spamassassin, fixed 3.1.8) [since FEDORA-2007-241] CVE-2007-0248 version (squid, fixed 2.6.STABLE7) [since FEDORA-2007-073] CVE-2007-0247 version (squid, fixed 2.6.STABLE7) #222883 [since FEDORA-2007-073] CVE-2007-0235 VULNERABLE (libgtop2) #222637 not sure, will triage From fedora-extras-commits at redhat.com Mon Feb 19 10:38:01 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 19 Feb 2007 05:38:01 -0500 Subject: rpms/gnumeric/devel gnumeric.spec,1.23,1.24 Message-ID: <200702191038.l1JAc1QF012884@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gnumeric/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12867 Modified Files: gnumeric.spec Log Message: small specfile cleanups (rpmlint) Index: gnumeric.spec =================================================================== RCS file: /cvs/extras/rpms/gnumeric/devel/gnumeric.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- gnumeric.spec 19 Feb 2007 09:49:04 -0000 1.23 +++ gnumeric.spec 19 Feb 2007 10:37:28 -0000 1.24 @@ -34,7 +34,7 @@ %package devel -Summary: Files necessary to develop gnumeric-based applications. +Summary: Files necessary to develop gnumeric-based applications Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} @@ -49,6 +49,7 @@ %patch0 -p1 -b .desktop %patch1 -p1 -b .excelcrash %patch2 -p1 -b .helppath +chmod -x plugins/excel/rc4.? %build @@ -328,7 +329,7 @@ - add ssconvert * Tue Oct 14 2003 Havoc Pennington 1:1.2.1-1 -- add %post to install schemas +- add %%post to install schemas - 1.2.1 * Fri Sep 19 2003 Havoc Pennington 1:1.2.0-1 @@ -453,7 +454,7 @@ * Mon Jul 16 2001 Jonathan Blandford - backport sheet corruption fix -* Tue Jul 10 2001 Trond Eivind Glomsr?d +* Tue Jul 10 2001 Trond Eivind Glomsr??d - Make devel subpackage depend on main package * Sat Jul 07 2001 Owen Taylor From fedora-extras-commits at redhat.com Mon Feb 19 10:54:20 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 19 Feb 2007 05:54:20 -0500 Subject: rpms/easytag/FC-6 easytag-1.99.13-noape.patch, NONE, 1.1 easytag.spec, 1.15, 1.16 Message-ID: <200702191054.l1JAsKbO013009@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/easytag/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12969/FC-6 Modified Files: easytag.spec Added Files: easytag-1.99.13-noape.patch Log Message: Include patch to remove APE tags when tagging MP3 files (#200507). easytag-1.99.13-noape.patch: --- NEW FILE easytag-1.99.13-noape.patch --- diff -ruN easytag-1.99.13.orig/src/id3_tag.c easytag-1.99.13/src/id3_tag.c --- easytag-1.99.13.orig/src/id3_tag.c 2006-12-06 22:08:38.000000000 +0100 +++ easytag-1.99.13/src/id3_tag.c 2007-02-17 00:50:37.603618408 +0100 @@ -30,6 +30,7 @@ #include "id3_tag.h" #include "id3lib/id3_bugfix.h" +#include "ape_tag.h" #include "picture.h" #include "easytag.h" #include "browser.h" @@ -493,6 +494,7 @@ { File_Tag *FileTag; gchar *filename; + gchar *filename_utf8; gchar *basename_utf8; gchar *temp; FILE *file; @@ -542,13 +544,12 @@ FileTag = (File_Tag *)ETFile->FileTag->data; filename = ((File_Name *)ETFile->FileNameCur->data)->value; + filename_utf8 = filename_to_display(filename); /* Test to know if we can write into the file */ if ( (file=fopen(filename,"r+"))==NULL ) { - gchar *filename_utf8 = filename_to_display(filename); g_print(_("ERROR while opening file: '%s' (%s).\n\a"),filename_utf8,g_strerror(errno)); - g_free(filename_utf8); return FALSE; } fclose(file); @@ -847,6 +848,26 @@ } + /****************************** + * Delete an APE tag if found * + ******************************/ + { + // Delete the APE tag (create a dummy ETFile for the Ape_Tag_... function) + ET_File *ETFile_tmp = ET_File_Item_New(); + File_Name *FileName_tmp = ET_File_Name_Item_New(); + File_Tag *FileTag_tmp = ET_File_Tag_Item_New(); + // Same file... + FileName_tmp->value = g_strdup(filename_utf8); + ETFile_tmp->FileNameList = g_list_append(NULL,FileName_tmp); + ETFile_tmp->FileNameCur = ETFile_tmp->FileNameList; + // With empty tag... + ETFile_tmp->FileTagList = g_list_append(NULL,FileTag_tmp); + ETFile_tmp->FileTag = ETFile_tmp->FileTagList; + Ape_Tag_Write_File_Tag(ETFile_tmp); + ET_Free_File_List_Item(ETFile_tmp); + } + + /********************************* * Update id3v1.x and id3v2 tags * *********************************/ @@ -986,6 +1007,7 @@ /* Free allocated data */ ID3Tag_Delete(id3_tag); g_free(basename_utf8); + g_free(filename_utf8); if (error) return FALSE; else return TRUE; Index: easytag.spec =================================================================== RCS file: /cvs/extras/rpms/easytag/FC-6/easytag.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- easytag.spec 12 Dec 2006 12:53:21 -0000 1.15 +++ easytag.spec 19 Feb 2007 10:53:47 -0000 1.16 @@ -1,7 +1,7 @@ Summary: Tag editor for mp3, ogg, flac and other music files Name: easytag Version: 1.99.13 -Release: 1%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Multimedia URL: http://easytag.sourceforge.net/ @@ -12,11 +12,10 @@ # tar --numeric-owner -cjvf easytag-$VERSION-patched.tar.bz2 easytag-$VERSION Source: easytag-%{version}-patched.tar.bz2 Patch0: easytag-1.99.13-id3lib.patch +Patch1: easytag-1.99.13-noape.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gtk2-devel >= 2.4.0, id3lib-devel >= 3.7.12 -BuildRequires: libvorbis-devel >= 1.0, flac-devel, gettext -# Not in Extras (yet, #191036 - enable later!) -#Buildrequires: libmp4v2-devel +BuildRequires: libvorbis-devel >= 1.0, flac-devel, libmp4v2-devel, gettext %description EasyTAG is a utility for viewing, editing and writing the tags of MP3, @@ -25,7 +24,8 @@ %prep %setup -%patch -p1 -b .id3lib +%patch0 -p1 -b .id3lib +%patch1 -p1 -b .noape %build @@ -54,6 +54,13 @@ %changelog +* Mon Feb 19 2007 Matthias Saou 1.99.13-3 +- Include patch to remove APE tags when tagging MP3 files (#200507). + +* Thu Feb 15 2007 Matthias Saou 1.99.13-2 +- Rebuild against flac 1.1.4. +- Enable libmp4v2 since it's now part of Fedora. + * Tue Dec 12 2006 Matthias Saou 1.99.13-1 - Update to 1.99.13. - Update id3lib patch to still apply. From fedora-extras-commits at redhat.com Mon Feb 19 10:54:22 2007 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 19 Feb 2007 05:54:22 -0500 Subject: rpms/easytag/devel easytag-1.99.13-noape.patch, NONE, 1.1 easytag.spec, 1.16, 1.17 Message-ID: <200702191054.l1JAsM4K013012@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/easytag/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12969/devel Modified Files: easytag.spec Added Files: easytag-1.99.13-noape.patch Log Message: Include patch to remove APE tags when tagging MP3 files (#200507). easytag-1.99.13-noape.patch: --- NEW FILE easytag-1.99.13-noape.patch --- diff -ruN easytag-1.99.13.orig/src/id3_tag.c easytag-1.99.13/src/id3_tag.c --- easytag-1.99.13.orig/src/id3_tag.c 2006-12-06 22:08:38.000000000 +0100 +++ easytag-1.99.13/src/id3_tag.c 2007-02-17 00:50:37.603618408 +0100 @@ -30,6 +30,7 @@ #include "id3_tag.h" #include "id3lib/id3_bugfix.h" +#include "ape_tag.h" #include "picture.h" #include "easytag.h" #include "browser.h" @@ -493,6 +494,7 @@ { File_Tag *FileTag; gchar *filename; + gchar *filename_utf8; gchar *basename_utf8; gchar *temp; FILE *file; @@ -542,13 +544,12 @@ FileTag = (File_Tag *)ETFile->FileTag->data; filename = ((File_Name *)ETFile->FileNameCur->data)->value; + filename_utf8 = filename_to_display(filename); /* Test to know if we can write into the file */ if ( (file=fopen(filename,"r+"))==NULL ) { - gchar *filename_utf8 = filename_to_display(filename); g_print(_("ERROR while opening file: '%s' (%s).\n\a"),filename_utf8,g_strerror(errno)); - g_free(filename_utf8); return FALSE; } fclose(file); @@ -847,6 +848,26 @@ } + /****************************** + * Delete an APE tag if found * + ******************************/ + { + // Delete the APE tag (create a dummy ETFile for the Ape_Tag_... function) + ET_File *ETFile_tmp = ET_File_Item_New(); + File_Name *FileName_tmp = ET_File_Name_Item_New(); + File_Tag *FileTag_tmp = ET_File_Tag_Item_New(); + // Same file... + FileName_tmp->value = g_strdup(filename_utf8); + ETFile_tmp->FileNameList = g_list_append(NULL,FileName_tmp); + ETFile_tmp->FileNameCur = ETFile_tmp->FileNameList; + // With empty tag... + ETFile_tmp->FileTagList = g_list_append(NULL,FileTag_tmp); + ETFile_tmp->FileTag = ETFile_tmp->FileTagList; + Ape_Tag_Write_File_Tag(ETFile_tmp); + ET_Free_File_List_Item(ETFile_tmp); + } + + /********************************* * Update id3v1.x and id3v2 tags * *********************************/ @@ -986,6 +1007,7 @@ /* Free allocated data */ ID3Tag_Delete(id3_tag); g_free(basename_utf8); + g_free(filename_utf8); if (error) return FALSE; else return TRUE; Index: easytag.spec =================================================================== RCS file: /cvs/extras/rpms/easytag/devel/easytag.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- easytag.spec 15 Feb 2007 15:22:58 -0000 1.16 +++ easytag.spec 19 Feb 2007 10:53:50 -0000 1.17 @@ -1,7 +1,7 @@ Summary: Tag editor for mp3, ogg, flac and other music files Name: easytag Version: 1.99.13 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Multimedia URL: http://easytag.sourceforge.net/ @@ -12,6 +12,7 @@ # tar --numeric-owner -cjvf easytag-$VERSION-patched.tar.bz2 easytag-$VERSION Source: easytag-%{version}-patched.tar.bz2 Patch0: easytag-1.99.13-id3lib.patch +Patch1: easytag-1.99.13-noape.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gtk2-devel >= 2.4.0, id3lib-devel >= 3.7.12 BuildRequires: libvorbis-devel >= 1.0, flac-devel, libmp4v2-devel, gettext @@ -23,7 +24,8 @@ %prep %setup -%patch -p1 -b .id3lib +%patch0 -p1 -b .id3lib +%patch1 -p1 -b .noape %build @@ -52,6 +54,9 @@ %changelog +* Mon Feb 19 2007 Matthias Saou 1.99.13-3 +- Include patch to remove APE tags when tagging MP3 files (#200507). + * Thu Feb 15 2007 Matthias Saou 1.99.13-2 - Rebuild against flac 1.1.4. - Enable libmp4v2 since it's now part of Fedora. From fedora-extras-commits at redhat.com Mon Feb 19 10:56:58 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 19 Feb 2007 05:56:58 -0500 Subject: rpms/libmatroska/devel .cvsignore, 1.7, 1.8 libmatroska.spec, 1.15, 1.16 sources, 1.8, 1.9 Message-ID: <200702191056.l1JAuw4Z013132@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/libmatroska/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13108 Modified Files: .cvsignore libmatroska.spec sources Log Message: * Mon Feb 19 2007 Hans de Goede 0.8.1-1 - New upstream release 0.8.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libmatroska/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 29 Nov 2005 09:56:55 -0000 1.7 +++ .cvsignore 19 Feb 2007 10:56:25 -0000 1.8 @@ -1 +1 @@ -libmatroska-0.8.0.tar.bz2 +libmatroska-0.8.1.tar.bz2 Index: libmatroska.spec =================================================================== RCS file: /cvs/extras/rpms/libmatroska/devel/libmatroska.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- libmatroska.spec 28 Aug 2006 11:50:25 -0000 1.15 +++ libmatroska.spec 19 Feb 2007 10:56:26 -0000 1.16 @@ -1,7 +1,7 @@ Summary: Open audio/video container format library Name: libmatroska -Version: 0.8.0 -Release: 4%{?dist} +Version: 0.8.1 +Release: 1%{?dist} License: LGPL Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -72,6 +72,9 @@ %changelog +* Mon Feb 19 2007 Hans de Goede 0.8.1-1 +- New upstream release 0.8.1 + * Mon Aug 28 2006 Hans de Goede 0.8.0-4 - Drop static lib from -devel package - FE6 Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/libmatroska/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 29 Nov 2005 09:56:55 -0000 1.8 +++ sources 19 Feb 2007 10:56:26 -0000 1.9 @@ -1 +1 @@ -ee822ea811e5db25de87c3662c53953a libmatroska-0.8.0.tar.bz2 +20cf624ace0c58a54c7752eebfbc0b19 libmatroska-0.8.1.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 19 11:37:14 2007 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Mon, 19 Feb 2007 06:37:14 -0500 Subject: rpms/ufraw/devel ufraw.spec,1.11,1.12 Message-ID: <200702191137.l1JBbE86017058@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/ufraw/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17033 Modified Files: ufraw.spec Log Message: don't ship dcraw binary (#229044) Index: ufraw.spec =================================================================== RCS file: /cvs/extras/rpms/ufraw/devel/ufraw.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ufraw.spec 7 Feb 2007 17:12:51 -0000 1.11 +++ ufraw.spec 19 Feb 2007 11:36:41 -0000 1.12 @@ -14,7 +14,7 @@ Summary: Tool to retrieve raw image data from digital cameras Name: ufraw Version: 0.10 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Multimedia License: GPL URL: http://ufraw.sourceforge.net @@ -84,6 +84,8 @@ %install rm -rf %buildroot make DESTDIR=%buildroot schemasdir=%{_sysconfdir}/gconf/schemas install +# don't ship dcraw binary +rm -f %{buildroot}%{_bindir}/dcraw %find_lang %{name} @@ -133,6 +135,9 @@ %{gimpplugindir}/ufraw-gimp %changelog +* Mon Feb 19 2007 Nils Philippsen - 0.10-2 +- don't ship dcraw binary (#229044) + * Wed Feb 07 2007 Nils Philippsen - 0.10-1 - version 0.10 - add BR: perl, exiv2-devel, gettext From fedora-extras-commits at redhat.com Mon Feb 19 12:25:47 2007 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Mon, 19 Feb 2007 07:25:47 -0500 Subject: rpms/php-extras/devel .cvsignore, 1.5, 1.6 php-extras.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200702191225.l1JCPlZo020930@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/php-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20903 Modified Files: .cvsignore php-extras.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-extras/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 1 Feb 2007 16:41:08 -0000 1.5 +++ .cvsignore 19 Feb 2007 12:25:15 -0000 1.6 @@ -1 +1 @@ -php-5.2.0.tar.gz +php-5.2.1.tar.gz Index: php-extras.spec =================================================================== RCS file: /cvs/extras/rpms/php-extras/devel/php-extras.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- php-extras.spec 1 Feb 2007 16:41:08 -0000 1.9 +++ php-extras.spec 19 Feb 2007 12:25:15 -0000 1.10 @@ -20,7 +20,7 @@ Name: php-extras Summary: Additional PHP modules from the standard PHP distribution #Version: %(php-config --version 2>/dev/null || echo 0) -Version: 5.2.0 +Version: 5.2.1 Release: 1%{?dist} Group: Development/Languages License: The PHP License @@ -237,6 +237,9 @@ %changelog +* Mon Feb 19 2007 Dmitry Butskoy - 5.2.1-1 +- update to 5.2.1 + * Thu Feb 1 2007 Dmitry Butskoy - 5.2.0-1 - upgrade to 5.2.0 - drop readline support (now in the main php package) Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-extras/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 1 Feb 2007 16:41:08 -0000 1.5 +++ sources 19 Feb 2007 12:25:15 -0000 1.6 @@ -1 +1 @@ -52d7e8b3d8d7573e75c97340f131f988 php-5.2.0.tar.gz +604eaee2b834bb037d2c83e53e300d3f php-5.2.1.tar.gz From fedora-extras-commits at redhat.com Mon Feb 19 12:40:27 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 19 Feb 2007 07:40:27 -0500 Subject: rpms/glyph-keeper/devel glyph-keeper-0.32-so-compat.patch, NONE, 1.1 glyph-keeper-0.29.1-fixes.patch, 1.1, 1.2 glyph-keeper.spec, 1.4, 1.5 glyph-keeper-0.29.1-new-ft.patch, 1.1, NONE Message-ID: <200702191240.l1JCeREK021195@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/glyph-keeper/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21170 Modified Files: glyph-keeper-0.29.1-fixes.patch glyph-keeper.spec Added Files: glyph-keeper-0.32-so-compat.patch Removed Files: glyph-keeper-0.29.1-new-ft.patch Log Message: * Fri Feb 16 2007 Hans de Goede 0.32-1 - New upstream release 0.32 glyph-keeper-0.32-so-compat.patch: --- NEW FILE glyph-keeper-0.32-so-compat.patch --- --- glyph-keeper-0.32/src/glyph_rend.c.compat 2007-02-06 00:14:18.000000000 +0100 +++ glyph-keeper-0.32/src/glyph_rend.c 2007-02-19 13:32:35.000000000 +0100 @@ -789,5 +789,25 @@ #endif } +/* for binary compatiblity with glyph-keeper-0.29, these won't be used by + newly compiled apps as those will be made into using the new functions + through defines in glyph.h, which is also why we need the undef's */ +#undef gk_rend_set_angle +void gk_rend_set_angle(GLYPH_REND* const rend,const double new_text_angle) +{ + gk_rend_set_angle_in_radians(rend, new_text_angle); +} + +#undef gk_rend_set_italic +void gk_rend_set_italic(GLYPH_REND* const rend,const double new_italic_angle) +{ + gk_rend_set_italic_angle_in_degrees(rend, new_italic_angle); +} + +#undef gk_rend_set_bold +void gk_rend_set_bold(GLYPH_REND* const rend,const int new_bold_strength) +{ + gk_rend_set_bold_strength(rend, new_bold_strength); +} #endif /* included_from_glyph_c */ --- glyph-keeper-0.32/src/glyph_face.c.compat 2007-02-05 17:51:50.000000000 +0100 +++ glyph-keeper-0.32/src/glyph_face.c 2007-02-19 13:34:06.000000000 +0100 @@ -225,7 +225,7 @@ char buf[1000] = ""; funcname = "gk_load_face_from_file()"; - if (gk_header_version != GK_MAKE_VERSION(_gk_version_major,_gk_version_minor,_gk_version_patch)) + if (gk_header_version < GK_MAKE_VERSION(0, 29, 1) || gk_header_version > GK_MAKE_VERSION(_gk_version_major,_gk_version_minor,_gk_version_patch)) { _gk_msg("Error: Glyph Keeper library and header versions don't match\n"); return 0; @@ -340,7 +340,7 @@ GLYPH_FACE* f; funcname = "gk_load_face_from_memory()"; - if (gk_header_version != GK_MAKE_VERSION(_gk_version_major,_gk_version_minor,_gk_version_patch)) + if (gk_header_version < GK_MAKE_VERSION(0, 29, 1) || gk_header_version > GK_MAKE_VERSION(_gk_version_major,_gk_version_minor,_gk_version_patch)) { _gk_msg("Error: Glyph Keeper library and header versions don't match\n"); return 0; glyph-keeper-0.29.1-fixes.patch: Index: glyph-keeper-0.29.1-fixes.patch =================================================================== RCS file: /cvs/extras/rpms/glyph-keeper/devel/glyph-keeper-0.29.1-fixes.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glyph-keeper-0.29.1-fixes.patch 13 Mar 2006 22:46:44 -0000 1.1 +++ glyph-keeper-0.29.1-fixes.patch 19 Feb 2007 12:39:55 -0000 1.2 @@ -1,127 +1,22 @@ -diff -ur glyph-keeper-0.29.1.orig/Makefile.GNU.all glyph-keeper-0.29.1/Makefile.GNU.all ---- glyph-keeper-0.29.1.orig/Makefile.GNU.all 2005-07-09 16:26:56.000000000 +0200 -+++ glyph-keeper-0.29.1/Makefile.GNU.all 2006-03-11 17:11:10.000000000 +0100 -@@ -66,13 +66,9 @@ - - CC := gcc - --WFLAGS := -W -Wall -- --OFLAGS := -O3 -s -- - FT_CFLAGS := $(WFLAGS) -std=c89 $(OFLAGS) -Ifreetype/include $(ft_defines) - --GK_CFLAGS := $(WFLAGS) -std=c89 $(OFLAGS) -Iinclude $(gk_defines) $(if $(FT_LIB),,-Ifreetype/include) -+GK_CFLAGS := $(CFLAGS) -std=c89 -Iinclude $(gk_defines) $(if $(FT_LIB),,-Ifreetype/include) - - - -Only in glyph-keeper-0.29.1: Makefile.GNU.all~ -diff -ur glyph-keeper-0.29.1.orig/include/glyph.h glyph-keeper-0.29.1/include/glyph.h ---- glyph-keeper-0.29.1.orig/include/glyph.h 2005-07-09 15:02:50.000000000 +0200 -+++ glyph-keeper-0.29.1/include/glyph.h 2006-03-11 19:13:38.000000000 +0100 -@@ -149,7 +149,7 @@ - - #elif (GLYPH_TARGET == GLYPH_TARGET_SDL) - --#include -+#include - #define GLYPH_TARGET_STR "SDL" - #define GLYPH_TARGET_SURFACE SDL_Surface - #define GLYPH_TARGET_HAS_RECTFILL -Only in glyph-keeper-0.29.1/include: glyph.h~ -Only in glyph-keeper-0.29.1: log -Only in glyph-keeper-0.29.1/obj: glyph-alleg.o -Only in glyph-keeper-0.29.1/obj: glyph-sdl.o -Only in glyph-keeper-0.29.1/obj: libglyph-alleg.a -Only in glyph-keeper-0.29.1/obj: libglyph-sdl.a -diff -ur glyph-keeper-0.29.1.orig/src/glyph_index.c glyph-keeper-0.29.1/src/glyph_index.c ---- glyph-keeper-0.29.1.orig/src/glyph_index.c 2005-06-24 11:35:00.000000000 +0200 -+++ glyph-keeper-0.29.1/src/glyph_index.c 2006-03-11 19:11:04.000000000 +0100 -@@ -58,13 +58,13 @@ - if (!index->pages) return size; - - size += 69*sizeof(void*); -- if ((int)index->pages[68]) -+ if ((long)index->pages[68]) - { - for (a=0; a<68; a++) - { - if (!index->pages[a]) continue; - size += 129*sizeof(void*); -- if ((int)index->pages[a][128]) -+ if ((long)index->pages[a][128]) - { - for (b=0; b<128; b++) { if (index->pages[a][b]) size += 129*sizeof(void*); } - } -@@ -220,7 +220,7 @@ - - /* unlinking the glyph from index */ - page_c[c_index] = 0; -- (*(int*)(page_c+128))--; -+ (*(long*)(page_c+128))--; - - /* uninking the glyph from keeper's list */ - if (glyph == keeper->head) keeper->head = keeper->head->next; -@@ -235,19 +235,19 @@ - free(glyph); - - /* releasing unnecessary index pages, and index itself */ -- if (((int)page_c[128])<=0) -+ if (((long)page_c[128])<=0) - { - free(page_c); - page_b[b_index] = 0; - keeper->allocated -= 129*sizeof(void*); -- (*(int*)(page_b+128))--; -- if (((int)page_b[128])<=0) -+ (*(long*)(page_b+128))--; -+ if (((long)page_b[128])<=0) - { - free(page_b); - index->pages[a_index] = 0; - keeper->allocated -= 129*sizeof(void*); -- (*(int*)(index->pages+68))--; -- if (((int)index->pages[68])<=0) -+ (*(long*)(index->pages+68))--; -+ if (((long)index->pages[68])<=0) - { - free(index->pages); - index->pages = 0; -@@ -314,7 +314,7 @@ - { - index->pages[a_index] = (GLYPH***)_gk_malloc(129*sizeof(void*)); - if (!index->pages[a_index]) return 0; -- (*(int*)(index->pages+68))++; -+ (*(long*)(index->pages+68))++; - memset(index->pages[a_index],0,129*sizeof(void*)); - keeper->allocated += 129*sizeof(void*); - } -@@ -326,7 +326,7 @@ - { - page_b[b_index] = (GLYPH**)_gk_malloc(129*sizeof(void*)); - if (!page_b[b_index]) return 0; -- (*(int*)(page_b+128))++; -+ (*(long*)(page_b+128))++; - memset(page_b[b_index],0,129*sizeof(void*)); - keeper->allocated += 129*sizeof(void*); - } -@@ -338,7 +338,7 @@ - CARE(page_c[c_index]==0); - - page_c[c_index] = glyph; -- (*(int*)(page_c+128))++; -+ (*(long*)(page_c+128))++; - glyph->index = index; - - glyph->prev = 0; -@@ -512,7 +512,7 @@ - GLYPH_REND *rend; - int ni = 0, nr = 0; - -- _gk_msg("GLYPH_KEEP object (address:%d):\n",(int)keeper); -+ _gk_msg("GLYPH_KEEP object (address:%p):\n", keeper); - - if (!keeper) return; - _gk_msg(" can keep %d glyphs, currently keeping %d\n",keeper->max_glyphs,keeper->num_glyphs); -Only in glyph-keeper-0.29.1/src: glyph_index.c~ +--- glyph-keeper-0.32/src/glyph_index.c~ 2007-02-16 11:12:41.000000000 +0100 ++++ glyph-keeper-0.32/src/glyph_index.c 2007-02-16 11:12:41.000000000 +0100 +@@ -340,7 +340,7 @@ + CARE(page_c[c_index]==0); + + page_c[c_index] = glyph; +- (*(int*)(page_c+128))++; ++ (*(long*)(page_c+128))++; + glyph->index = index; + + glyph->prev = 0; +--- glyph-keeper-0.32/Makefile.GNU.all~ 2007-02-16 11:14:27.000000000 +0100 ++++ glyph-keeper-0.32/Makefile.GNU.all 2007-02-16 11:14:27.000000000 +0100 +@@ -90,7 +90,7 @@ + + WFLAGS := -W -Wall + +-OFLAGS := -O2 -s ++OFLAGS = -O2 -s + + FT_CFLAGS := $(WFLAGS) -std=c89 $(OFLAGS) -Ifreetype/include $(ft_defines) + GK_CFLAGS := $(WFLAGS) -std=c89 -pedantic $(OFLAGS) -Iinclude $(gk_defines) $(if $(FT_LIB),,-Ifreetype/include) Index: glyph-keeper.spec =================================================================== RCS file: /cvs/extras/rpms/glyph-keeper/devel/glyph-keeper.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- glyph-keeper.spec 28 Aug 2006 14:33:24 -0000 1.4 +++ glyph-keeper.spec 19 Feb 2007 12:39:55 -0000 1.5 @@ -1,13 +1,13 @@ Name: glyph-keeper -Version: 0.29.1 -Release: 4%{?dist} +Version: 0.32 +Release: 1%{?dist} Summary: Library for text rendering Group: System Environment/Libraries -License: zlib License +License: zlib/libpng License URL: http://kd.lab.nig.ac.jp/glyph-keeper/ -Source0: http://kd.lab.nig.ac.jp/%{name}/files/%{name}-%{version}-no-freetype.zip +Source0: http://kd.lab.nig.ac.jp/%{name}/files/%{name}-%{version}.zip Patch0: glyph-keeper-0.29.1-fixes.patch -Patch1: glyph-keeper-0.29.1-new-ft.patch +Patch1: glyph-keeper-0.32-so-compat.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: freetype-devel >= 2.1.10 BuildRequires: SDL-devel allegro-devel @@ -34,19 +34,19 @@ %prep %setup -q %patch0 -p1 -z .fix -%patch1 -p1 -z .new-ft -sed -i 's/\r//' docs/*.html +%patch1 -p1 -z .compat +sed -i 's/\r//' docs/*.html *.txt %build make %{?_smp_mflags} -f Makefile.GNU.all TARGET=ALLEGRO FT_LIB=-lfreetype \ - CFLAGS="$RPM_OPT_FLAGS -fpic -I/usr/include/freetype2" lib + OFLAGS="$RPM_OPT_FLAGS -fpic -I/usr/include/freetype2" lib gcc -shared -o libglyph-alleg.so.0 -Wl,-soname,libglyph-alleg.so.0 \ obj/glyph-alleg.o -lfreetype \ `allegro-config --libs | sed 's/-lalleg_unsharable//'` make %{?_smp_mflags} -f Makefile.GNU.all TARGET=SDL FT_LIB=-lfreetype \ - CFLAGS="$RPM_OPT_FLAGS -fpic -I/usr/include/freetype2" lib + OFLAGS="$RPM_OPT_FLAGS -fpic -I/usr/include/freetype2" lib gcc -shared -o libglyph-sdl.so.0 -Wl,-soname,libglyph-sdl.so.0 \ obj/glyph-sdl.o -lfreetype -lSDL @@ -82,6 +82,9 @@ %changelog +* Fri Feb 16 2007 Hans de Goede 0.32-1 +- New upstream release 0.32 + * Mon Aug 28 2006 Hans de Goede 0.29.1-4 - Fix building with newer freetype - Build .so files instead of a static lib --- glyph-keeper-0.29.1-new-ft.patch DELETED --- From fedora-extras-commits at redhat.com Mon Feb 19 12:47:50 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Mon, 19 Feb 2007 07:47:50 -0500 Subject: rpms/SoQt/devel SoQt.spec,1.21,1.22 Message-ID: <200702191247.l1JCloDr021316@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/SoQt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21299 Modified Files: SoQt.spec Log Message: * Mon Feb 19 2007 Ralf Cors??pius - 1.4.1-4 - Filter errant -L%_libdir from soqt-config.cfg. - Remove *.la. Index: SoQt.spec =================================================================== RCS file: /cvs/extras/rpms/SoQt/devel/SoQt.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- SoQt.spec 19 Jan 2007 09:58:34 -0000 1.21 +++ SoQt.spec 19 Feb 2007 12:47:18 -0000 1.22 @@ -4,7 +4,7 @@ Summary: High-level 3D visualization library Name: SoQt Version: 1.4.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: System Environment/Libraries @@ -65,9 +65,13 @@ htmldir=%{coin_htmldir}/SoQt make +# Strip the default libdir +sed -i -e "s,-L%{_libdir} ,," soqt-default.cfg + %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install +rm -f ${RPM_BUILD_ROOT}%{_libdir}/libSoQt.*a %clean rm -rf $RPM_BUILD_ROOT @@ -96,6 +100,10 @@ %{_mandir}/man?/*.?.gz %changelog +* Mon Feb 19 2007 Ralf Cors??pius - 1.4.1-4 +- Filter errant -L%%_libdir from soqt-config.cfg. +- Remove *.la. + * Fri Jan 19 2007 Ralf Cors??pius - 1.4.1-3 - BR: libXi-devel, R: libXi-devel (Work-around to XInput.h/libXi packaging issues). From fedora-extras-commits at redhat.com Mon Feb 19 12:57:45 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Mon, 19 Feb 2007 07:57:45 -0500 Subject: rpms/EL4/devel - New directory Message-ID: <200702191257.l1JCvjiV021479@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/EL4/devel In directory cvs-int.fedora.redhat.com:/home/fedora/ausil/tmpcvsr21442/rpms/EL4/devel Log Message: Directory /cvs/extras/rpms/EL4/devel added to the repository From fedora-extras-commits at redhat.com Mon Feb 19 12:57:42 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Mon, 19 Feb 2007 07:57:42 -0500 Subject: rpms/EL4 - New directory Message-ID: <200702191257.l1JCvgGO021468@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/EL4 In directory cvs-int.fedora.redhat.com:/home/fedora/ausil/tmpcvsr21442/rpms/EL4 Log Message: Directory /cvs/extras/rpms/EL4 added to the repository From fedora-extras-commits at redhat.com Mon Feb 19 12:57:52 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Mon, 19 Feb 2007 07:57:52 -0500 Subject: rpms/EL4 Makefile,NONE,1.1 import.log,NONE,1.1 pkg.acl,NONE,1.1 Message-ID: <200702191257.l1JCvqxG021506@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/EL4 In directory cvs-int.fedora.redhat.com:/home/fedora/ausil/tmpcvsr21442/rpms/EL4 Added Files: Makefile import.log pkg.acl Log Message: Setup of module EL4 --- NEW FILE Makefile --- # Top level Makefile for module EL4 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Mon Feb 19 12:58:00 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Mon, 19 Feb 2007 07:58:00 -0500 Subject: rpms/EL4/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702191258.l1JCw05c021525@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/EL4/devel In directory cvs-int.fedora.redhat.com:/home/fedora/ausil/tmpcvsr21442/rpms/EL4/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module EL4 --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: EL4 # $Id: Makefile,v 1.1 2007/02/19 12:57:57 ausil Exp $ NAME := EL4 SPECFILE = EL4.spec define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Feb 19 12:58:10 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Mon, 19 Feb 2007 07:58:10 -0500 Subject: rpms/EL5 - New directory Message-ID: <200702191258.l1JCwA1O021572@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/EL5 In directory cvs-int.fedora.redhat.com:/home/fedora/ausil/tmpcvse21543/rpms/EL5 Log Message: Directory /cvs/extras/rpms/EL5 added to the repository From fedora-extras-commits at redhat.com Mon Feb 19 12:58:17 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Mon, 19 Feb 2007 07:58:17 -0500 Subject: rpms/EL5/devel - New directory Message-ID: <200702191258.l1JCwHvM021585@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/EL5/devel In directory cvs-int.fedora.redhat.com:/home/fedora/ausil/tmpcvse21543/rpms/EL5/devel Log Message: Directory /cvs/extras/rpms/EL5/devel added to the repository From fedora-extras-commits at redhat.com Mon Feb 19 12:58:25 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Mon, 19 Feb 2007 07:58:25 -0500 Subject: rpms/EL5 Makefile,NONE,1.1 import.log,NONE,1.1 pkg.acl,NONE,1.1 Message-ID: <200702191258.l1JCwP1q021610@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/EL5 In directory cvs-int.fedora.redhat.com:/home/fedora/ausil/tmpcvse21543/rpms/EL5 Added Files: Makefile import.log pkg.acl Log Message: Setup of module EL5 --- NEW FILE Makefile --- # Top level Makefile for module EL5 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Mon Feb 19 12:58:32 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Mon, 19 Feb 2007 07:58:32 -0500 Subject: rpms/EL5/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702191258.l1JCwWR6021626@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/EL5/devel In directory cvs-int.fedora.redhat.com:/home/fedora/ausil/tmpcvse21543/rpms/EL5/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module EL5 --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: EL5 # $Id: Makefile,v 1.1 2007/02/19 12:58:30 ausil Exp $ NAME := EL5 SPECFILE = EL5.spec define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Feb 19 13:05:48 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 19 Feb 2007 08:05:48 -0500 Subject: rpms/glyph-keeper/devel .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200702191305.l1JD5m8H025188@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/glyph-keeper/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25146 Modified Files: .cvsignore sources Log Message: * Fri Feb 16 2007 Hans de Goede 0.32-1 - New upstream release 0.32 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glyph-keeper/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Mar 2006 22:46:44 -0000 1.2 +++ .cvsignore 19 Feb 2007 13:05:15 -0000 1.3 @@ -1 +1 @@ -glyph-keeper-0.29.1-no-freetype.zip +glyph-keeper-0.32.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/glyph-keeper/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Mar 2006 22:46:44 -0000 1.2 +++ sources 19 Feb 2007 13:05:15 -0000 1.3 @@ -1 +1 @@ -e90e5103dce7d89aba2180bb830de8d9 glyph-keeper-0.29.1-no-freetype.zip +d0ae12c5fd73b49b00abcfa21e23acc1 glyph-keeper-0.32.zip From fedora-extras-commits at redhat.com Mon Feb 19 13:05:59 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Mon, 19 Feb 2007 08:05:59 -0500 Subject: rpms/SoQt/devel SoQt.spec,1.22,1.23 Message-ID: <200702191305.l1JD5xQq025226@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/SoQt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25168 Modified Files: SoQt.spec Log Message: Remove libSoQt.*.a Index: SoQt.spec =================================================================== RCS file: /cvs/extras/rpms/SoQt/devel/SoQt.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- SoQt.spec 19 Feb 2007 12:47:18 -0000 1.22 +++ SoQt.spec 19 Feb 2007 13:05:27 -0000 1.23 @@ -94,7 +94,6 @@ %{_datadir}/Coin %doc %{coin_htmldir}/* %{coin_includedir}/* -%{_libdir}/libSoQt.*a %{_libdir}/libSoQt.so %{_mandir}/man?/*.?.gz From fedora-extras-commits at redhat.com Mon Feb 19 13:22:14 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 19 Feb 2007 08:22:14 -0500 Subject: rpms/glyph-keeper/devel glyph-keeper.spec,1.5,1.6 Message-ID: <200702191322.l1JDMEFH025421@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/glyph-keeper/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25404 Modified Files: glyph-keeper.spec Log Message: * Fri Feb 16 2007 Hans de Goede 0.32-1 - New upstream release 0.32 Index: glyph-keeper.spec =================================================================== RCS file: /cvs/extras/rpms/glyph-keeper/devel/glyph-keeper.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- glyph-keeper.spec 19 Feb 2007 12:39:55 -0000 1.5 +++ glyph-keeper.spec 19 Feb 2007 13:21:42 -0000 1.6 @@ -10,7 +10,7 @@ Patch1: glyph-keeper-0.32-so-compat.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: freetype-devel >= 2.1.10 -BuildRequires: SDL-devel allegro-devel +BuildRequires: SDL_gfx-devel allegro-devel %description Glyph Keeper is a library for text rendering. It is written in C and can be @@ -48,7 +48,7 @@ make %{?_smp_mflags} -f Makefile.GNU.all TARGET=SDL FT_LIB=-lfreetype \ OFLAGS="$RPM_OPT_FLAGS -fpic -I/usr/include/freetype2" lib gcc -shared -o libglyph-sdl.so.0 -Wl,-soname,libglyph-sdl.so.0 \ - obj/glyph-sdl.o -lfreetype -lSDL + obj/glyph-sdl.o -lfreetype -lSDL -lSDL_gfx %install From fedora-extras-commits at redhat.com Mon Feb 19 13:35:11 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Mon, 19 Feb 2007 08:35:11 -0500 Subject: rpms/SIMVoleon/devel SIMVoleon.spec,1.6,1.7 Message-ID: <200702191335.l1JDZBsf025781@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/SIMVoleon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25757 Modified Files: SIMVoleon.spec Log Message: * Mon Feb 19 2007 Ralf Cors??pius - 2.0.1-5 - Filter errant -L%_libdir from soqt-config.cfg. - Remove *.la. Index: SIMVoleon.spec =================================================================== RCS file: /cvs/extras/rpms/SIMVoleon/devel/SIMVoleon.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- SIMVoleon.spec 5 Sep 2006 09:54:31 -0000 1.6 +++ SIMVoleon.spec 19 Feb 2007 13:34:39 -0000 1.7 @@ -13,7 +13,7 @@ Summary: Volume rendering library for Coin Name: SIMVoleon Version: %{rpmvers} -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: System Environment/Libraries @@ -67,9 +67,13 @@ htmldir=%{coin_htmldir}/SIMVoleon make %{?_smp_mflags} +# Strip the default libdir +sed -i -e "s,\-L%{_libdir}\",\"," sovoleon-default.cfg + %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install +rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la %clean rm -rf $RPM_BUILD_ROOT @@ -89,14 +93,17 @@ %defattr(-,root,root,-) %{_bindir}/* %{coin_includedir}/* -%{_libdir}/libSimVoleon.*a %{_libdir}/libSimVoleon*.so %{_datadir}/aclocal/simvoleon.m4 %{_datadir}/Coin/conf %doc %{coin_htmldir}/* %changelog -* Tue Sep 05 2006 Ralf Cors??pius - %{rpmvers}-4 +* Mon Feb 19 2007 Ralf Cors??pius - 2.0.1-5 +- Filter errant -L%%_libdir from soqt-config.cfg. +- Remove *.la. + +* Tue Sep 05 2006 Ralf Cors??pius - 2.0.1-4 - Mass rebuild. * Tue Feb 28 2006 Ralf Cors??pius - 2.0.1-3 From fedora-extras-commits at redhat.com Mon Feb 19 14:03:40 2007 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 19 Feb 2007 09:03:40 -0500 Subject: rpms/bin2iso/devel bin2iso.spec,1.10,1.11 Message-ID: <200702191403.l1JE3ekB029412@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/bin2iso/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29392 Modified Files: bin2iso.spec Log Message: * Mon Feb 19 2007 Hans de Goede 1.9-5.b - Install the single c-file our sources consist of before compiling them, so that they end up in -debuginfo even when building under mock Index: bin2iso.spec =================================================================== RCS file: /cvs/extras/rpms/bin2iso/devel/bin2iso.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- bin2iso.spec 28 Aug 2006 05:11:49 -0000 1.10 +++ bin2iso.spec 19 Feb 2007 14:03:08 -0000 1.11 @@ -1,7 +1,7 @@ Summary: Convert ".bin" files into ISO or WAV Name: bin2iso Version: 1.9 -Release: 4.b%{?dist} +Release: 5.b%{?dist} License: Distributable (Unknown) Group: Applications/File URL: http://users.andara.com/~doiron/bin2iso/ @@ -14,10 +14,11 @@ %prep %setup -c -T +install -p -m 644 %{SOURCE0} bin2iso19b_linux.c %build -gcc $RPM_OPT_FLAGS -o %{name} %{SOURCE0} +gcc $RPM_OPT_FLAGS -o %{name} bin2iso19b_linux.c %install @@ -36,6 +37,10 @@ %changelog +* Mon Feb 19 2007 Hans de Goede 1.9-5.b +- Install the single c-file our sources consist of before compiling them, so + that they end up in -debuginfo even when building under mock + * Mon Aug 28 2006 Hans de Goede 1.9-4.b - Taking over as maintainer since Anvil has other priorities - FE6 Rebuild From fedora-extras-commits at redhat.com Mon Feb 19 14:22:14 2007 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 19 Feb 2007 09:22:14 -0500 Subject: rpms/python-telepathy/devel .cvsignore, 1.4, 1.5 python-telepathy.spec, 1.8, 1.9 sources, 1.4, 1.5 Message-ID: <200702191422.l1JEMEdD029648@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/python-telepathy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29624 Modified Files: .cvsignore python-telepathy.spec sources Log Message: * Mon Feb 19 2007 Brian Pepple - 0.13.8-1 - Update to 0.13.8. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-telepathy/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 24 Nov 2006 15:12:56 -0000 1.4 +++ .cvsignore 19 Feb 2007 14:21:42 -0000 1.5 @@ -1 +1 @@ -telepathy-python-0.13.7.tar.gz +telepathy-python-0.13.8.tar.gz Index: python-telepathy.spec =================================================================== RCS file: /cvs/extras/rpms/python-telepathy/devel/python-telepathy.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-telepathy.spec 7 Jan 2007 15:29:01 -0000 1.8 +++ python-telepathy.spec 19 Feb 2007 14:21:42 -0000 1.9 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-telepathy -Version: 0.13.7 -Release: 4%{?dist} +Version: 0.13.8 +Release: 1%{?dist} Summary: Python libraries for Telepathy Group: Development/Languages @@ -46,6 +46,9 @@ %changelog +* Mon Feb 19 2007 Brian Pepple - 0.13.8-1 +- Update to 0.13.8. + * Sun Jan 7 2007 Brian Pepple - 0.13.7-4 - Rebuild against the new python should actually work now. Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-telepathy/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 24 Nov 2006 15:12:56 -0000 1.4 +++ sources 19 Feb 2007 14:21:42 -0000 1.5 @@ -1 +1 @@ -2c565587e49e36a1c0cfb519d8888b53 telepathy-python-0.13.7.tar.gz +095100f616076b3315aaab03934f12b9 telepathy-python-0.13.8.tar.gz From fedora-extras-commits at redhat.com Mon Feb 19 15:08:50 2007 From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris)) Date: Mon, 19 Feb 2007 10:08:50 -0500 Subject: status-report-scripts parseBZbugList,1.67,1.68 Message-ID: <200702191508.l1JF8oaa005339@cvs-int.fedora.redhat.com> Author: c4chris Update of /cvs/fedora/status-report-scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5322 Modified Files: parseBZbugList Log Message: Use XMLRPC to grab Package Review tickets. Deal with new review flags. Index: parseBZbugList =================================================================== RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- parseBZbugList 31 Jan 2007 12:06:45 -0000 1.67 +++ parseBZbugList 19 Feb 2007 15:08:48 -0000 1.68 @@ -27,32 +27,29 @@ # - Maybe report a count of FE-DEADREVIEW. # - Track packages that do not build on all supported arches, and check they # have an arch dependent BZ tracking ticket. +# - Use RPC also for open bug reports and quit querying BZ through wget use strict; use Getopt::Long; use Date::Manip; use File::Temp qw/ tempfile /; +use XMLRPC::Lite; + +my $rpc = new XMLRPC::Lite ( + proxy => 'https://bugzilla.redhat.com/bugzilla/xmlrpc.cgi' +); # Cookies and BZ URLs to retrieve tickets my $BZ_cooky = "# HTTP Cookie File bugzilla.redhat.com FALSE /bugzilla FALSE 2145917104 COLUMNLIST opendate%20changeddate%20bug_severity%20assigned_to%20reporter%20bug_status%20resolution%20component%20blockedby%20short_desc\n"; my @BZ_URLs; -# FE-NEW blockers -push @BZ_URLs, - "https://bugzilla.redhat.com/bugzilla/buglist.cgi?query_format=advanced&chfieldto=Now&field0-0-0=blocked&type0-0-0=equals&value0-0-0=163776&ctype=csv"; -# FE-REVIEW blockers -push @BZ_URLs, - "https://bugzilla.redhat.com/bugzilla/buglist.cgi?query_format=advanced&chfieldto=Now&field0-0-0=blocked&type0-0-0=equals&value0-0-0=163778&ctype=csv"; -# FE-ACCEPT blockers -push @BZ_URLs, - "https://bugzilla.redhat.com/bugzilla/buglist.cgi?query_format=advanced&chfieldto=Now&field0-0-0=blocked&type0-0-0=equals&value0-0-0=163779&ctype=csv"; # All open FE bug reports push @BZ_URLs, "https://bugzilla.redhat.com/bugzilla/buglist.cgi?query_format=advanced&product=Fedora%20Extras&version=4&version=5&version=6&version=devel&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=MODIFIED&bug_severity=security&bug_severity=high&bug_severity=normal&bug_severity=low&bug_severity=translation&bug_severity=regression&chfieldto=Now&negate0=1&field0-0-0=component&type0-0-0=equals&value0-0-0=Package%20Review&ctype=csv"; my %opt; my @options = ( "help", "repourl=s", "o=s", "d=s", "cvs=s", - "comps=s", "currel=i", "firstrel=i", "u=s", "p=s" ); + "comps=s", "currel=i", "firstrel=i", "u=s", "bu=s", "p=s" ); $main::repourl = "http://mirrors.kernel.org/fedora"; $main::members @@ -61,6 +58,7 @@ $main::currel = 6; $main::firstrel = 1; $main::username = "c4chris"; +$main::BZusername = ""; $main::password = ""; if( ! GetOptions( \%opt, @options ) ) { &usage(); } @@ -72,6 +70,7 @@ $main::currel = $opt{"currel"} if defined $opt{"currel"}; $main::firstrel = $opt{"firstrel"} if defined $opt{"firstrel"}; $main::username = $opt{"u"} if defined $opt{"u"}; +$main::BZusername = $opt{"bu"} if defined $opt{"bu"}; $main::password = $opt{"p"} if defined $opt{"p"}; &usage() if defined $opt{'help'}; @@ -85,6 +84,7 @@ my $FE_GUIDELINES = 197974; my $FE_DEADREVIEW = 201449; my $extras_orphan = 'extras-orphan at fedoraproject.org'; +my %NAME2REVIEW; my %BZN; my %BZS; my %BZL; @@ -163,6 +163,89 @@ } close IN; } +# Grab all Package Review tickets +for my $flag ('+', '-', '?', ' ') { + my $bA = &runQuery($rpc, $flag); + foreach my $bug (@$bA) { + warn "assigned_to should be an email address: " . $bug->{'assigned_to'} + if index($bug->{'assigned_to'}, "@") < 0; + warn "reporter should be an email address: " . $bug->{'reporter'} + if index($bug->{'reporter'}, "@") < 0; + # Try to guess package name + my $name = $bug->{'short_desc'}; + next unless $name =~ /(review\s+request|merge\s+review)/i; + $name =~ s/^.*review\s+request:?\s+]?\s.*$//g; + $name =~ s/:.*$//g; + next if $name =~ /TESTING-BUGSPAM/; + $bug->{'pkg_name'} = $name; + $bug->{'opendate'} = ParseDate($bug->{'opendate'}); + $bug->{'changeddate'} = ParseDate($bug->{'changeddate'}); + $bug->{'blockedby'} =~ s/[{}]//g; + my @B = split /,/, $bug->{'blockedby'}; + my $block = 0; + my $sponsor = 0; + my $legal = 0; + my $gl = 0; + my $bzb; + foreach my $b (@B) { + if ($b == $FE_NEW) { + $block += 1; + $bzb = \%BZN; + } + if ($b == $FE_REVIEW) { + $block += 1; + $bzb = \%BZR; + } + if ($b == $FE_ACCEPT) { + $block += 1; + $bzb = \%BZA; + } + if ($b == $FE_NEEDSPONSOR) { + $sponsor = 1; + } + if ($b == $FE_LEGAL) { + $legal = 1; + } + if ($b == $FE_GUIDELINES) { + $gl = 1; + } + } + if ($block > 1) { + print "Warning: bug $bug->{'bug_id'} blocks several FE_ blockers.\n"; + next; + } + if ($block == 0) { + if ($flag eq "+") { + $bzb = \%BZA; + } elsif ($flag eq "-") { + $bzb = \%BZR; + } elsif ($flag eq "?") { + $bzb = \%BZR; + } else { + next if $bug->{'bug_status'} eq "CLOSED"; + $bzb = \%BZN; + } + } + if ($bug->{'pkg_name'} =~ /^([^(]+)\(-kmod\)$/) { + my $pkgName = $1; + $bug->{'pkg_name'} = $pkgName; + $NAME2REVIEW{"$pkgName-kmod"} = $bug->{'bug_id'}; + } + $NAME2REVIEW{$bug->{'pkg_name'}} = $bug->{'bug_id'}; + $bzb->{$bug->{'bug_id'}} = $bug; + if ($sponsor == 1 && $bzb == \%BZN) { + $BZS{$bug->{'bug_id'}} = $bug; + } + if ($legal == 1 && $bzb == \%BZN) { + $BZL{$bug->{'bug_id'}} = $bug; + } + if ($gl == 1 && $bzb == \%BZN) { + $BZG{$bug->{'bug_id'}} = $bug; + } + } +} &grabRepoList("$main::repourl/core/development/source/SRPMS/", \%CORE_D); &grabRepoList("$main::repourl/extras/development/SRPMS/", \%EXTRAS_D); $EXTRAS_R[$main::currel + 1] = \%EXTRAS_D; @@ -308,6 +391,8 @@ $F[9] =~ s/["{}]//g; $F[1] =~ s/["]//g; $F[2] =~ s/["]//g; + $F[4] =~ s/["]//g; + $F[5] =~ s/["]//g; $F[8] =~ s/["]//g; $F[1] = ParseDate($F[1]); $F[2] = ParseDate($F[2]); @@ -316,71 +401,17 @@ $F[11] = $F[10]; $F[11] =~ s/^["]+//; $F[11] =~ s/["]+$//; - if ($F[8] eq "Package Review") { - # Try to guess package name - $F[10] =~ s/["]//g; - $F[10] =~ s/^.*review\s+request:?\s+]?\s.*$//g; - $F[10] =~ s/:.*$//g; - } else { - $F[10] = $F[8]; - } - my $block = 0; - my $sponsor = 0; - my $legal = 0; - my $gl = 0; - my $bzb; - foreach my $b (@B) { - if ($b == $FE_NEW) { - $block += 1; - $bzb = \%BZN; - } - if ($b == $FE_REVIEW) { - $block += 1; - $bzb = \%BZR; - } - if ($b == $FE_ACCEPT) { - $block += 1; - $bzb = \%BZA; - } - if ($b == $FE_NEEDSPONSOR) { - $sponsor = 1; - } - if ($b == $FE_LEGAL) { - $legal = 1; - } - if ($b == $FE_GUIDELINES) { - $gl = 1; - } - } - if ($block > 1) { - print "Warning: bug $F[0] blocks several FE_ blockers.\n"; - next; - } - if ($block == 1) { - if ($F[8] eq "Package Review" - && $F[10] =~ /^([^(]+)\(-kmod\)$/) { - my $pkgName = $1; - my @F1 = @F; - $F[10] = $pkgName; - $F1[10] = "$pkgName-kmod"; - $bzb->{$F[0]} = \@F1; - } - $bzb->{$F[0]} = \@F; - if ($sponsor == 1 && $bzb == \%BZN) { - $BZS{$F[0]} = \@F; - } - if ($legal == 1 && $bzb == \%BZN) { - $BZL{$F[0]} = \@F; - } - if ($gl == 1 && $bzb == \%BZN) { - $BZG{$F[0]} = \@F; - } - next; - } if (defined $OWN{$F[8]}) { $COUNT_LIST{"openOPEN-BUGS"} += 1; - $BZB{$F[0]} = \@F; + $BZB{$F[0]} = { + 'bug_id' => $F[0], + 'opendate' => $F[1], + 'changeddate' => $F[2], + 'assigned_to' => $F[4], + 'reporter' => $F[5], + 'pkg_name' => $F[8], + 'short_desc' => $F[10] + }; next; } print STDERR "Not handled: ", join(" ", @F), "\n"; @@ -421,12 +452,12 @@ &displayOwnersWiki; &displayCommonWiki; &displayAcceptWiki(\%BZA); -&displayNewReviewWiki(\%BZR, "FE-REVIEW", 5); -&displayNewReviewWiki(\%BZN, "FE-NEW", 5); -&displayNewReviewWiki(\%BZS, "FE-NEEDSPONSOR", 5); -&displayNewReviewWiki(\%BZL, "FE-LEGAL", 5); -&displayNewReviewWiki(\%BZG, "FE-GUIDELINES", 5); -&displayNewReviewWiki(\%BZB, "OPEN-BUGS", 4); +&displayNewReviewWiki(\%BZR, "FE-REVIEW", 'reporter'); +&displayNewReviewWiki(\%BZN, "FE-NEW", 'reporter'); +&displayNewReviewWiki(\%BZS, "FE-NEEDSPONSOR", 'reporter'); +&displayNewReviewWiki(\%BZL, "FE-LEGAL", 'reporter'); +&displayNewReviewWiki(\%BZG, "FE-GUIDELINES", 'reporter'); +&displayNewReviewWiki(\%BZB, "OPEN-BUGS", 'assigned_to'); &displayCVSWiki(); &displayMaintainersWiki(); &displayDroppedWiki(); @@ -557,8 +588,8 @@ print "\n\n=== Packages that have not yet completed review ===\n"; print "\nWe have $COUNT_LIST{'openInOwners'} packages ", "which have not yet been FE-ACCEPT'd...\n"; - &displayBLWiki($BUG_LIST{"openInOwnersFE-REVIEW"}, \%BZR, 5); - &displayBLWiki($BUG_LIST{"openInOwnersFE-NEW"}, \%BZN, 5); + &displayBLWiki($BUG_LIST{"openInOwnersFE-REVIEW"}, \%BZR, 'reporter'); + &displayBLWiki($BUG_LIST{"openInOwnersFE-NEW"}, \%BZN, 'reporter'); } if ($COUNT_LIST{"extrasNoOwner"} > 0) { print "\n\n=== Packages missing in owners.list ===\n"; @@ -729,8 +760,8 @@ if ($COUNT_LIST{"openInOwners"} > 0) { print STDERR " - $COUNT_LIST{'openInOwners'} packages ", "which have not yet been FE-ACCEPT'd...\n"; - &displayBL($BUG_LIST{"openInOwnersFE-REVIEW"}, \%BZR, 5); - &displayBL($BUG_LIST{"openInOwnersFE-NEW"}, \%BZN, 5); + &displayBL($BUG_LIST{"openInOwnersFE-REVIEW"}, \%BZR, 'reporter'); + &displayBL($BUG_LIST{"openInOwnersFE-NEW"}, \%BZN, 'reporter'); } if ($COUNT_LIST{"extrasNoOwner"} > 0) { print STDERR " - $COUNT_LIST{'extrasNoOwner'} packages present in the ", @@ -784,36 +815,36 @@ my @BLO; foreach my $b (sort(keys %$BZ)) { my $a = $BZ->{$b}; - next unless $$a[6] eq "\"CLOSED\""; - my $pkg = $$a[10]; + next unless $a->{'bug_status'} eq "CLOSED"; + my $pkg = $a->{'pkg_name'}; unless ($SRPMS{$pkg} == 1 || defined($OWN{$pkg})) { $pkg =~ s/-[^-]+-[^-]+$//; } unless ($SRPMS{$pkg} == 1 || defined($OWN{$pkg})) { - $pkg = $$a[10]; + $pkg = $a->{'pkg_name'}; $pkg =~ s/-[^-]+$//; } unless ($SRPMS{$pkg} == 1 || defined($OWN{$pkg})) { - $pkg = lc $$a[10]; + $pkg = lc $a->{'pkg_name'}; unless ($SRPMS{$pkg} == 1 || defined($OWN{$pkg})) { $pkg =~ s/-[^-]+-[^-]+$//; } } unless ($SRPMS{$pkg} == 1 || defined($OWN{$pkg})) { - $pkg = lcfirst $$a[10]; + $pkg = lcfirst $a->{'pkg_name'}; } - unless (defined $BZREV_BUGS{$$a[4]}) { - $BZREV_BUGS{$$a[4]} = {}; + unless (defined $BZREV_BUGS{$a->{'assigned_to'}}) { + $BZREV_BUGS{$a->{'assigned_to'}} = {}; } - $BZREV_BUGS{$$a[4]}->{$b} = 1; - unless (defined $BZOWN_BUGS{$$a[5]}) { - $BZOWN_BUGS{$$a[5]} = {}; + $BZREV_BUGS{$a->{'assigned_to'}}->{$b} = 1; + unless (defined $BZOWN_BUGS{$a->{'reporter'}}) { + $BZOWN_BUGS{$a->{'reporter'}} = {}; } - $BZOWN_BUGS{$$a[5]}->{$b} = 1; + $BZOWN_BUGS{$a->{'reporter'}}->{$b} = 1; $COUNT_LIST{"acceptedClosed"} += 1; next if defined $DISCARD{$pkg}; - if (Date_Cmp($$a[2], $fourDaysAgo) < 0) { - #print STDERR "Date_Cmp $$a[2] < $fourDaysAgo\n"; + if (Date_Cmp($a->{'changeddate'}, $fourDaysAgo) < 0) { + #print STDERR "Date_Cmp $a->{'changeddate'} < $fourDaysAgo\n"; if ($SRPMS{$pkg} == 1) { if (!defined($CORE_D{$pkg}) && !defined($OWN{$pkg})) { push @BLO, $b; @@ -864,23 +895,23 @@ if ($COUNT_LIST{"missing"} > 0) { print "\nWe have $COUNT_LIST{'missing'} accepted, closed packages where I'm unable to ", "find the package in the development repo:\n"; - &displayBLWiki($BUG_LIST{"acceptedNoDevel"}, $BZ, 5); + &displayBLWiki($BUG_LIST{"acceptedNoDevel"}, $BZ, 'reporter'); } if ($COUNT_LIST{"missingOwner"} > 0) { print "\nWe have $COUNT_LIST{'missingOwner'} accepted, closed packages where I'm unable to ", "find the package in the owners file:\n"; - &displayBLWiki($BUG_LIST{"acceptedNoOwn"}, $BZ, 5); + &displayBLWiki($BUG_LIST{"acceptedNoOwn"}, $BZ, 'reporter'); } if ($COUNT_LIST{"acceptOpenInactive"} > 0) { print "\n\n=== Inactivity notice ===\n"; print "\nWe have $COUNT_LIST{'acceptOpenInactive'} accepted, open package reviews older than 4 weeks\n"; - &displayBLWiki($BUG_LIST{"acceptOpenInactive"}, $BZ, 5); + &displayBLWiki($BUG_LIST{"acceptOpenInactive"}, $BZ, 'reporter'); } if ($COUNT_LIST{"acceptOpenInDevel"} > 0) { print "\n\n=== Some cleanup needed ===\n"; print "\nWe have $COUNT_LIST{'acceptOpenInDevel'} accepted, open package reviews where the package ", "appears to already be in the repo...\n"; - &displayBLWiki($BUG_LIST{"acceptOpenInDevel"}, $BZ, 5); + &displayBLWiki($BUG_LIST{"acceptOpenInDevel"}, $BZ, 'reporter'); } } @@ -913,19 +944,19 @@ my @LATE; foreach my $b (sort(keys %$BZ)) { my $a = $BZ->{$b}; - next if $$a[6] eq "\"CLOSED\""; - my $pkg = $$a[10]; + next if $a->{'bug_status'} eq "CLOSED"; + my $pkg = $a->{'pkg_name'}; unless ($SRPMS{$pkg} == 1) { - $pkg = lc $$a[10]; + $pkg = lc $a->{'pkg_name'}; } unless ($SRPMS{$pkg} == 1) { - $pkg = lcfirst $$a[10]; + $pkg = lcfirst $a->{'pkg_name'}; } if ($SRPMS{$pkg} == 1) { $COUNT_LIST{"acceptOpenInDevel"} += 1; push @BL, $b; } - if (Date_Cmp($$a[2], $fourWeeksAgo) < 0) { + if (Date_Cmp($a->{'changeddate'}, $fourWeeksAgo) < 0) { push @LATE, $b; } } @@ -938,7 +969,7 @@ my ($BZ, $cur) = @_; foreach my $b (keys %$BZ) { my $a = $BZ->{$b}; - next if $$a[6] eq "\"CLOSED\""; + next if $a->{'bug_status'} eq "CLOSED"; $COUNT_LIST{"open$cur"} += 1; } } @@ -948,7 +979,7 @@ my @BL; foreach my $b (sort(keys %$BZ)) { my $a = $BZ->{$b}; - next unless $$a[6] eq "\"CLOSED\""; + next unless $a->{'bug_status'} eq "CLOSED"; push @BL, $b; } $COUNT_LIST{"closed$cur"} = $#BL + 1; @@ -961,10 +992,10 @@ my @LATE; foreach my $b (sort(keys %$BZ)) { my $a = $BZ->{$b}; - next if $$a[6] eq "\"CLOSED\""; - next if $$a[11] =~ /Tracker/; - if (Date_Cmp($$a[2], $fourWeeksAgo) < 0) { - if (Date_Cmp($$a[2], $eightWeeksAgo) < 0) { + next if $a->{'bug_status'} eq "CLOSED"; + next if $a->{'short_desc'} =~ /Tracker/; + if (Date_Cmp($a->{'changeddate'}, $fourWeeksAgo) < 0) { + if (Date_Cmp($a->{'changeddate'}, $eightWeeksAgo) < 0) { push @LATE, $b; } else { push @BL, $b; @@ -982,16 +1013,16 @@ # my @BL; # foreach my $b (sort(keys %$BZ)) { # my $a = $BZ->{$b}; -# next if $$a[6] eq "\"CLOSED\""; -# next if $$a[1] ne $$a[2]; -# if (Date_Cmp($$a[2], $eightWeeksAgo) < 0) { +# next if $a->{'bug_status'} eq "CLOSED"; +# next if $a->{'opendate'} ne $a->{'changeddate'}; +# if (Date_Cmp($a->{'changeddate'}, $eightWeeksAgo) < 0) { # push @BL, $b; # } # } # if ($#BL >= 0) { # my $cnt = $#BL + 1; # print "\nWe have $cnt $cur tickets 8 weeks old with no comments\n"; -# &displayBL(\@BL, $BZ, 5); +# &displayBL(\@BL, $BZ, 'reporter'); # } #} @@ -999,6 +1030,7 @@ print STDERR "Usage: $0 [options] where options are: -help this help note + -bu Bugzilla username -comps extras comps directory [$main::compsDir] -currel current Fedora release number [$main::currel] -cvs extras CVS directory [$main::cvsDir] @@ -1060,10 +1092,10 @@ join(",", @$BL), "\n"; foreach my $b (sort @$BL) { my $a = $BZ->{$b}; - my $owner = $$a[$field]; + my $owner = $a->{$field}; $owner =~ s/["]//g; $owner =~ s/\@/ at /; - printf STDERR " %-40s %s\n", $$a[10], $owner; + printf STDERR " %-40s %s\n", $a->{'pkg_name'}, $owner; } } @@ -1073,11 +1105,11 @@ my %O; foreach my $b (@$BL) { my $a = $BZ->{$b}; - my $e = $O{$$a[$field]}; + my $e = $O{$a->{$field}}; if (defined $e) { push @$e, $a; } else { - $O{$$a[$field]} = [ $a ]; + $O{$a->{$field}} = [ $a ]; } } foreach my $n (sort(keys %O)) { @@ -1086,9 +1118,10 @@ $n =~ s/\@/ at /; $n =~ s/\./ dot /g; foreach my $a (@$e) { - print "||$n||`$$a[10]`||["; - print "https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=$$a[0] $$a[0]"; - print "]||$$a[11]||\n"; + print "||$n||`$a->{'pkg_name'}`||[", + "https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=", + $a->{'bug_id'}, " ", $a->{'bug_id'}, + "]||$a->{'short_desc'}||\n"; } } } @@ -1149,10 +1182,10 @@ } foreach my $b (sort(keys %$BZ)) { my $a = $BZ->{$b}; - next if $$a[6] eq "\"CLOSED\""; - next if defined $DISCARD{$$a[10]}; - next unless defined $OL{lc $$a[10]}; -# delete $OWN{$OL{lc $$a[10]}}; + next if $a->{'bug_status'} eq "CLOSED"; + next if defined $DISCARD{$a->{'pkg_name'}}; + next unless defined $OL{lc $a->{'pkg_name'}}; +# delete $OWN{$OL{lc $a->{'pkg_name'}}}; push @BL, $b; } $COUNT_LIST{"openInOwners"} += $#BL + 1; @@ -1236,18 +1269,17 @@ my ($BZ) = @_; foreach my $b (keys %$BZ) { my $a = $BZ->{$b}; - next if $$a[11] =~ /Tracker/; - my $assignee = $$a[4]; - $assignee =~ s/["]//g; + next if $a->{'short_desc'} =~ /Tracker/; + my $assignee = $a->{'assigned_to'}; my $s = $OWNER_STAT{$assignee}; unless (defined $s) { - my $o = $OWN{$$a[10]}; + my $o = $OWN{$a->{'pkg_name'}}; print STDERR "Change $assignee to $$o[3]\n"; $s = $OWNER_STAT{$$o[3]}; } - die "Couldn't find OWNER_STAT for $assignee $$a[10]" unless defined $s; + die "Couldn't find OWNER_STAT for $assignee $a->{'pkg_name'}" unless defined $s; $$s[1] += 1; - if (Date_Cmp($$a[2], $eightWeeksAgo) >= 0) { + if (Date_Cmp($a->{'changeddate'}, $eightWeeksAgo) >= 0) { $$s[3] = 1; } $$s[4]->{$b} = $a; @@ -1275,7 +1307,7 @@ my $e = $OWNER_STAT{$k}; my $bugs = $$e[4]; my @K = keys %$bugs; - &displayBLWiki(\@K, $bugs, 4); + &displayBLWiki(\@K, $bugs, 'assigned_to'); } } if ($COUNT_LIST{'maintpkg'} > 0) { @@ -1431,3 +1463,35 @@ $COUNT_LIST{"CompsOver$tag"} = $#B + 1; $PKG_LIST{"CompsOver$tag"} = \@B; } + +sub runQuery { + my ($rpc, $flag) = @_; + my $querydata = { + 'column_list' => ['opendate', 'changeddate', 'bug_severity', 'alias', + 'assigned_to', 'reporter', 'bug_status', + 'resolution', 'component', 'blockedby', 'short_desc'], + 'product' => ['Fedora Extras'], + 'component' => ['Package Review'], + 'field0-0-0' => 'flagtypes.name', + 'bug_status' => ["NEW", "VERIFIED", "ASSIGNED", "REOPENED", "CLOSED", + "NEEDINFO_ENG", "NEEDINFO", "INVESTIGATE", "MODIFIED", + "ON_DEV", "UNCONFIRMED", "QA_READY", "ON_QA", + "FAILS_QA", "NEEDINFO_REPORTER", "RELEASE_PENDING", + "POST"] + }; + if ($flag eq " ") { + $querydata->{'type0-0-0'} = 'notregexp'; + $querydata->{'value0-0-0'} = 'fedora-review[-+?]' + } else { + $querydata->{'type0-0-0'} = 'equals'; + $querydata->{'value0-0-0'} = "fedora-review$flag"; + } + my $call = $rpc->call('bugzilla.runQuery', $querydata, + $main::BZusername, $main::password); + if ($call->faultstring) { + print STDERR $call->faultstring . "\n"; + exit 1; + } + my $result = $call->result; + return $result->{'bugs'}; +} From fedora-extras-commits at redhat.com Mon Feb 19 15:28:24 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Mon, 19 Feb 2007 10:28:24 -0500 Subject: rpms/SIMVoleon/devel SIMVoleon.spec,1.7,1.8 Message-ID: <200702191528.l1JFSOcY005515@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/SIMVoleon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5496 Modified Files: SIMVoleon.spec Log Message: Fix typo in previous change. Index: SIMVoleon.spec =================================================================== RCS file: /cvs/extras/rpms/SIMVoleon/devel/SIMVoleon.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- SIMVoleon.spec 19 Feb 2007 13:34:39 -0000 1.7 +++ SIMVoleon.spec 19 Feb 2007 15:27:52 -0000 1.8 @@ -68,7 +68,7 @@ make %{?_smp_mflags} # Strip the default libdir -sed -i -e "s,\-L%{_libdir}\",\"," sovoleon-default.cfg +sed -i -e "s,\-L%{_libdir}\",\"," simvoleon-default.cfg %install rm -rf $RPM_BUILD_ROOT From fedora-extras-commits at redhat.com Mon Feb 19 15:50:21 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Mon, 19 Feb 2007 10:50:21 -0500 Subject: rpms/rrdtool/EL-4 rrdtool-1.2.13-php.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 rrdtool.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200702191550.l1JFoLQY007237@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/rrdtool/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7210 Modified Files: .cvsignore rrdtool.spec sources Added Files: rrdtool-1.2.13-php.patch Log Message: rrdtool 1.2.18 for EL4 rrdtool-1.2.13-php.patch: --- NEW FILE rrdtool-1.2.13-php.patch --- diff -Naur php4-orig/config.m4 php4/config.m4 --- php4-orig/config.m4 2006-06-05 15:56:46.000000000 -0400 +++ php4/config.m4 2006-06-07 15:59:40.000000000 -0400 @@ -1,24 +1,96 @@ -dnl $Id: config.m4 9 2001-02-25 22:30:32Z oetiker $ +dnl $Id$ +dnl config.m4 for extension rrdtool -PHP_ARG_WITH(rrdtool, for RRDTool support, -[ --with-rrdtool[=DIR] Include RRDTool support. DIR is the rrdtool - install directory.]) +dnl Comments in this file start with the string 'dnl'. +dnl Remove where necessary. This file will not work +dnl without editing. + +dnl +dnl Checks for the configure options +dnl + +PHP_ARG_WITH(rrdtool, for rrdtool support, +[ --with-rrdtool[=DIR] Include rrdtool support (requires rrdtool >= 1.0.49).]) if test "$PHP_RRDTOOL" != "no"; then - for i in /usr/local /usr /opt/rrdtool /usr/local/rrdtool $PHP_RRDTOOL; do - if test -f $i/include/rrd.h; then - RRDTOOL_DIR=$i - fi - done - if test -z "$RRDTOOL_DIR"; then - AC_MSG_ERROR(Please reinstall rrdtool, or specify a directory - I cannot find rrd.h) + if test "$PHP_RRDTOOL" != "yes"; then + AC_MSG_CHECKING(if rrdtool specified path is valid) + if test -r $PHP_RRDTOOL/include/rrd.h && test -f $PHP_RRDTOOL/lib/librrd.$SHLIB_SUFFIX_NAME -o -f $PHP_RRDTOOL/lib/librrd.a; then # path given as parameter + RRDTOOL_DIR=$PHP_RRDTOOL + RRDTOOL_INCDIR=$PHP_RRDTOOL/include + RRDTOOL_LIBDIR=$PHP_RRDTOOL/lib + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + AC_MSG_ERROR([The specified RRDTool path is Invalid or the installation is incomplete + Please specify another path or reinstall the rrdtool distribution]) + fi + else + dnl Header path + AC_MSG_CHECKING([for rrdtool header files in default path]) + for i in /usr/local/rrdtool /usr/local /usr /opt ""; do + test -r $i/include/rrd.h && RRDTOOL_DIR=$i && RRDTOOL_INCDIR=$i/include + done + if test -z "$RRDTOOL_INCDIR"; then + AC_MSG_RESULT([not found]) + AC_MSG_ERROR([Please reinstall the rrdtool distribution]) + else + AC_MSG_RESULT(found in $RRDTOOL_INCDIR) + fi + dnl Library path + AC_MSG_CHECKING([for rrdtool library files in default path]) + for i in librrd.$SHLIB_SUFFIX_NAME librrd.a; do + test -f $RRDTOOL_DIR/lib/$i && RRDTOOL_LIBDIR=$RRDTOOL_DIR/lib + done + if test -z "$RRDTOOL_LIBDIR"; then + AC_MSG_RESULT([not found]) + AC_MSG_ERROR([Please reinstall the rrdtool distribution]) + else + AC_MSG_RESULT(found in $RRDTOOL_LIBDIR) + fi fi - AC_ADD_INCLUDE($RRDTOOL_DIR/include) - AC_ADD_LIBRARY_WITH_PATH(rrd, $RRDTOOL_DIR/lib, RRDTOOL_SHARED_LIBADD) - PHP_SUBST(RRDTOOL_SHARED_LIBADD) - AC_DEFINE(HAVE_RRDTOOL,1,[ ]) +dnl Finish the setup - PHP_EXTENSION(rrdtool, $ext_shared) + RRD_H_PATH="$RRDTOOL_INCDIR/rrd.h" + PHP_RRDTOOL_DIR=$RRDTOOL_DIR + PHP_ADD_INCLUDE($RRDTOOL_INCDIR) + + PHP_CHECK_LIBRARY(rrd, rrd_create, + [],[ + PHP_CHECK_LIBRARY(rrd, rrd_create, + [],[ + AC_MSG_ERROR([wrong rrd lib version or lib not found]) + ],[ + -L$RRDTOOL_LIBDIR -ldl + ]) + ],[ + -L$RRDTOOL_LIBDIR -ldl + ]) + + AC_MSG_CHECKING([rrdtool version]) + AC_TRY_COMPILE([ +#include <$RRD_H_PATH> + ], [int main() { + double some_variable; + some_variable = rrd_version(); + } + ], [ + AC_MSG_RESULT([1.2.x]) + ac_cv_rrdversion=yes + ], [ + AC_MSG_RESULT([1.0.x]) + ac_cv_rrdversion=no + ]) + + if test "$ac_cv_rrdversion" = yes; then + AC_DEFINE(HAVE_RRD_12X, 1, [Whether you have rrd_verion]) + fi + + PHP_ADD_LIBRARY_WITH_PATH(rrd, $RRDTOOL_LIBDIR, RRDTOOL_SHARED_LIBADD) + + PHP_NEW_EXTENSION(rrdtool, rrdtool.c, $ext_shared) + PHP_SUBST(RRDTOOL_SHARED_LIBADD) + AC_DEFINE(HAVE_RRDTOOL, 1, [ ]) fi diff -Naur php4-orig/configure php4/configure --- php4-orig/configure 2006-06-06 09:31:42.000000000 -0400 +++ php4/configure 2006-06-07 15:56:06.000000000 -0400 @@ -1159,6 +1159,7 @@ cat >> confdefs.h <<\EOF #define HAVE_RRDTOOL 1 +#define HAVE_RRD_12X 1 EOF diff -Naur php4-orig/ltconfig php4/ltconfig --- php4-orig/ltconfig 2006-06-05 15:56:46.000000000 -0400 +++ php4/ltconfig 2006-06-07 17:16:50.000000000 -0400 @@ -1247,7 +1247,8 @@ if test "$ld_shlibs" = yes; then runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' + #hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' + hardcode_libdir_flag_spec='' export_dynamic_flag_spec='${wl}--export-dynamic' case $host_os in cygwin* | mingw*) diff -Naur php4-orig/php_rrdtool.h php4/php_rrdtool.h --- php4-orig/php_rrdtool.h 2006-06-05 15:56:46.000000000 -0400 +++ php4/php_rrdtool.h 2006-06-07 17:26:07.000000000 -0400 @@ -5,42 +5,60 @@ * * Joe Miller, ,, 7/19/2000 * - * $Id: php_rrdtool.h 9 2001-02-25 22:30:32Z oetiker $ + * $Id: php_rrdtool.h,v 1.1.1.1 2002/02/26 10:21:20 oetiker Exp $ * */ -#ifndef _PHP4_RRDTOOL_H -#define _PHP4_RRDTOOL_H +#ifndef PHP_RRDTOOL_H +#define PHP_RRDTOOL_H -#if COMPILE_DL -#undef HAVE_RRDTOOL -#define HAVE_RRDTOOL 1 +#ifdef PHP_WIN32 +#ifdef PHP_RRDTOOL_EXPORTS +#define PHP_RRDTOOL_API __declspec(dllexport) +#else +#define PHP_RRDTOOL_API __declspec(dllimport) #endif -#ifndef DLEXPORT -#define DLEXPORT +#else +#define PHP_RRDTOOL_API #endif #if HAVE_RRDTOOL -PHP_MINFO_FUNCTION(rrdtool); - extern zend_module_entry rrdtool_module_entry; #define rrdtool_module_ptr &rrdtool_module_entry -#define phpext_rrdtool_ptr rrdtool_module_ptr +#ifdef ZTS +#include "TSRM.h" +#endif + +#define RRDTOOL_LOGO_GUID "PHP25B1F7E8-916B-11D9-9A54-000A95AE92DA" + +/* If you declare any globals in php_rrdtool.h uncomment this: +ZEND_BEGIN_MODULE_GLOBALS(rrdtool) + +ZEND_END_MODULE_GLOBALS(rrdtool) + */ + +PHP_MINIT_FUNCTION(rrdtool); +PHP_MSHUTDOWN_FUNCTION(rrdtool); +PHP_MINFO_FUNCTION(rrdtool); + +PHP_FUNCTION(rrd_graph); +PHP_FUNCTION(rrd_fetch); PHP_FUNCTION(rrd_error); PHP_FUNCTION(rrd_clear_error); PHP_FUNCTION(rrd_update); PHP_FUNCTION(rrd_last); PHP_FUNCTION(rrd_create); -PHP_FUNCTION(rrd_graph); -PHP_FUNCTION(rrd_fetch); +PHP_FUNCTION(rrdtool_info); +PHP_FUNCTION(rrdtool_logo_guid); #else -#define phpext_rrdtool_ptr NULL - +#define rrdtool_module_ptr NULL #endif /* HAVE_RRDTOOL */ -#endif /* _PHP4_RRDTOOL_H */ +#define phpext_rrdtool_ptr rrdtool_module_ptr + +#endif /* PHP_RRDTOOL_H */ diff -Naur php4-orig/rrdtool.c php4/rrdtool.c --- php4-orig/rrdtool.c 2006-06-05 15:56:46.000000000 -0400 +++ php4/rrdtool.c 2006-06-07 15:59:18.000000000 -0400 @@ -1,6 +1,6 @@ /* * - * php4_rrdtool.c + * php_rrdtool.c * * PHP interface to RRD Tool. (for php4/zend) * @@ -9,38 +9,59 @@ * iBIZ Technology Corp, SkyLynx / Inficad Communications * 2/12/2000 & 7/18/2000 * + * Jeffrey Wheat - 10/01/2002 + * - Fixed to build with php-4.2.3 * * See README, INSTALL, and USAGE files for more details. * - * $Id: rrdtool.c 9 2001-02-25 22:30:32Z oetiker $ + * $Id: rrdtool.c,v 1.1.1.1 2002/02/26 10:21:20 oetiker Exp $ * */ +/* PHP Includes */ #include "php.h" -#include "rrd.h" +#include "php_logos.h" +#include "ext/standard/info.h" +#include "SAPI.h" + +/* rrdtool includes */ #include "php_rrdtool.h" +#include "rrdtool_logo.h" +#include + +#ifdef HAVE_CONFIG_H +#include "../config.h" +#endif #if HAVE_RRDTOOL +/* If you declare any globals in php_rrdtool.h uncomment this: +ZEND_DECLARE_MODULE_GLOBALS(rrdtool) + */ + function_entry rrdtool_functions[] = { - PHP_FE(rrd_error, NULL) - PHP_FE(rrd_clear_error, NULL) - PHP_FE(rrd_graph, NULL) - PHP_FE(rrd_last, NULL) - PHP_FE(rrd_fetch, NULL) - PHP_FE(rrd_update, NULL) - PHP_FE(rrd_create, NULL) + PHP_FE(rrd_graph, NULL) + PHP_FE(rrd_fetch, NULL) + PHP_FE(rrd_error, NULL) + PHP_FE(rrd_clear_error, NULL) + PHP_FE(rrd_update, NULL) + PHP_FE(rrd_last, NULL) + PHP_FE(rrd_create, NULL) + PHP_FE(rrdtool_info, NULL) + PHP_FE(rrdtool_logo_guid, NULL) {NULL, NULL, NULL} }; zend_module_entry rrdtool_module_entry = { - "RRDTool", + STANDARD_MODULE_HEADER, + "rrdtool", rrdtool_functions, - NULL, - NULL, + PHP_MINIT(rrdtool), + PHP_MSHUTDOWN(rrdtool), NULL, NULL, PHP_MINFO(rrdtool), + NO_VERSION_YET, STANDARD_MODULE_PROPERTIES, }; @@ -48,220 +69,49 @@ ZEND_GET_MODULE(rrdtool) #endif -PHP_MINFO_FUNCTION(rrdtool) -{ - php_info_print_table_start(); - php_info_print_table_header(2, "rrdtool support", "enabled"); - php_info_print_table_end(); -} - -//PHP_MINIT_FUNCTION(rrdtool) -//{ -// return SUCCESS; -//} - - -/* {{{ proto string rrd_error(void) - Get the error message set by the last rrd tool function call */ - -PHP_FUNCTION(rrd_error) -{ - char *msg; - - if ( rrd_test_error() ) - { - msg = rrd_get_error(); - - RETVAL_STRING(msg, 1); - rrd_clear_error(); - } - else - return; -} -/* }}} */ - - - -/* {{{ proto void rrd_clear_error(void) - Clear the error set by the last rrd tool function call */ +#ifdef COMPILE_DL_RRDTOOL +#define PHP_RRD_VERSION_STRING "1.2.x extension" +#else +#define PHP_RRD_VERSION_STRING "1.2.x bundled" +#endif -PHP_FUNCTION(rrd_clear_error) +/* {{{ PHP_MINIT_FUNCTION */ +PHP_MINIT_FUNCTION(rrdtool) { - if ( rrd_test_error() ) - rrd_clear_error(); - - return; + php_register_info_logo(RRDTOOL_LOGO_GUID , "image/gif", rrdtool_logo , sizeof(rrdtool_logo)); + + return SUCCESS; } /* }}} */ - - -/* {{{ proto int rrd_update(string file, string opt) - Update an RRD file with values specified */ - -PHP_FUNCTION(rrd_update) +/* {{{ PHP_MSHUTDOWN_FUNCTION */ +PHP_MSHUTDOWN_FUNCTION(rrdtool) { - pval *file, *opt; - char **argv; - - if ( rrd_test_error() ) - rrd_clear_error(); - - if ( ZEND_NUM_ARGS() == 2 && - zend_get_parameters(ht, 2, &file, &opt) == SUCCESS ) - { - convert_to_string(file); - convert_to_string(opt); - - argv = (char **) emalloc(4 * sizeof(char *)); - - argv[0] = "dummy"; - argv[1] = estrdup("update"); - argv[2] = estrdup(file->value.str.val); - argv[3] = estrdup(opt->value.str.val); - - optind = 0; opterr = 0; - if ( rrd_update(3, &argv[1]) != -1 ) - { - RETVAL_TRUE; - } - else - { - RETVAL_FALSE; - } - efree(argv[1]); efree(argv[2]); efree(argv[3]); - efree(argv); - } - else - { - WRONG_PARAM_COUNT; - } - return; + php_unregister_info_logo(RRDTOOL_LOGO_GUID); + + return SUCCESS; } /* }}} */ - - -/* {{{ proto int rrd_last(string file) - Gets last update time of an RRD file */ - -PHP_FUNCTION(rrd_last) -{ - pval *file; - unsigned long retval; - - char **argv = (char **) emalloc(3 * sizeof(char *)); - - if ( rrd_test_error() ) - rrd_clear_error(); - - if (zend_get_parameters(ht, 1, &file) == SUCCESS) - { - convert_to_string(file); - - argv[0] = "dummy"; - argv[1] = estrdup("last"); - argv[2] = estrdup(file->value.str.val); - - optind = 0; opterr = 0; - retval = rrd_last(2, &argv[1]); - - efree(argv[1]); efree(argv[2]); - efree(argv); - RETVAL_LONG(retval); - } - else - { - WRONG_PARAM_COUNT; - } - return; -} -/* }}} */ - - -/* {{{ proto int rrd_create(string file, array args_arr, int argc) - Create an RRD file with the options passed (passed via array) */ - -PHP_FUNCTION(rrd_create) +/* {{{ PHP_MINFO_FUNCTION */ +PHP_MINFO_FUNCTION(rrdtool) { - pval *file, *args, *p_argc; - pval *entry; - char **argv; - HashTable *args_arr; - int argc, i; - - if ( rrd_test_error() ) - rrd_clear_error(); - - if ( ZEND_NUM_ARGS() == 3 && - getParameters(ht, 3, &file, &args, &p_argc) == SUCCESS ) - { - if ( args->type != IS_ARRAY ) - { - php_error(E_WARNING, "2nd Variable passed to rrd_create is not an array!\n"); - RETURN_FALSE; - } - - convert_to_long(p_argc); - convert_to_string(file); - - convert_to_array(args); - args_arr = args->value.ht; - zend_hash_internal_pointer_reset(args_arr); - - argc = p_argc->value.lval + 3; - argv = (char **) emalloc(argc * sizeof(char *)); - - argv[0] = "dummy"; - argv[1] = estrdup("create"); - argv[2] = estrdup(file->value.str.val); - - for (i = 3; i < argc; i++) - { - pval **dataptr; - - if ( zend_hash_get_current_data(args_arr, (void *) &dataptr) == FAILURE ) - continue; - - entry = *dataptr; - - if ( entry->type != IS_STRING ) - convert_to_string(entry); - - argv[i] = estrdup(entry->value.str.val); - - if ( i < argc ) - zend_hash_move_forward(args_arr); - } - - optind = 0; opterr = 0; - - if ( rrd_create(argc-1, &argv[1]) != -1 ) - { - RETVAL_TRUE; - } - else - { - RETVAL_FALSE; - } - for (i = 1; i < argc; i++) - efree(argv[i]); - - efree(argv); - } - else - { - WRONG_PARAM_COUNT; - } - return; + php_info_print_box_start(1); + PUTS("\"ClamAV\n"); + php_printf("

rrdtool Version %s

\n", PHP_RRD_VERSION_STRING); + php_info_print_box_end(); + php_info_print_table_start(); + php_info_print_table_row(2, "rrdtool support", "enabled"); + php_info_print_table_end(); } /* }}} */ - - /* {{{ proto mixed rrd_graph(string file, array args_arr, int argc) Creates a graph based on options passed via an array */ - PHP_FUNCTION(rrd_graph) { pval *file, *args, *p_argc; @@ -269,14 +119,14 @@ zval *p_calcpr; HashTable *args_arr; int i, xsize, ysize, argc; + double ymin,ymax; char **argv, **calcpr; if ( rrd_test_error() ) rrd_clear_error(); - if ( ZEND_NUM_ARGS() == 3 && - zend_get_parameters(ht, 3, &file, &args, &p_argc) == SUCCESS) + if ( (ZEND_NUM_ARGS() >= 3 && ZEND_NUM_ARGS() <= 6) && zend_get_parameters(ht, 3, &file, &args, &p_argc) == SUCCESS) { if ( args->type != IS_ARRAY ) { @@ -316,7 +166,7 @@ } optind = 0; opterr = 0; - if ( rrd_graph(argc-1, &argv[1], &calcpr, &xsize, &ysize) != -1 ) + if ( rrd_graph(argc-1, &argv[1], &calcpr, &xsize, &ysize, NULL, &ymin, &ymax) != -1 ) { array_init(return_value); add_assoc_long(return_value, "xsize", xsize); @@ -354,11 +204,8 @@ } /* }}} */ - - /* {{{ proto mixed rrd_fetch(string file, array args_arr, int p_argc) Fetch info from an RRD file */ - PHP_FUNCTION(rrd_fetch) { pval *file, *args, *p_argc; @@ -366,7 +213,7 @@ pval *p_start, *p_end, *p_step, *p_ds_cnt; HashTable *args_arr; zval *p_ds_namv, *p_data; - int i, argc; + int i, j, argc; time_t start, end; unsigned long step, ds_cnt; char **argv, **ds_namv; @@ -445,7 +292,8 @@ datap = data; for (i = start; i <= end; i += step) - add_next_index_double(p_data, *(datap++)); + for (j = 0; j < ds_cnt; j++) + add_next_index_double(p_data, *(datap++)); free(data); } @@ -472,4 +320,286 @@ } /* }}} */ +/* {{{ proto string rrd_error(void) + Get the error message set by the last rrd tool function call */ +PHP_FUNCTION(rrd_error) +{ + char *msg; + + if ( rrd_test_error() ) + { + msg = rrd_get_error(); + + RETVAL_STRING(msg, 1); + rrd_clear_error(); + } + else + return; +} +/* }}} */ + +/* {{{ proto void rrd_clear_error(void) + Clear the error set by the last rrd tool function call */ +PHP_FUNCTION(rrd_clear_error) +{ + if ( rrd_test_error() ) + rrd_clear_error(); + + return; +} +/* }}} */ + +/* {{{ proto int rrd_update(string file, string opt) + Update an RRD file with values specified */ +PHP_FUNCTION(rrd_update) +{ + pval *file, *opt; + char **argv; + + if ( rrd_test_error() ) + rrd_clear_error(); + + if ( ZEND_NUM_ARGS() == 2 && + zend_get_parameters(ht, 2, &file, &opt) == SUCCESS ) + { + convert_to_string(file); + convert_to_string(opt); + + argv = (char **) emalloc(4 * sizeof(char *)); + + argv[0] = "dummy"; + argv[1] = estrdup("update"); + argv[2] = estrdup(file->value.str.val); + argv[3] = estrdup(opt->value.str.val); + + optind = 0; opterr = 0; + if ( rrd_update(3, &argv[1]) != -1 ) + { + RETVAL_TRUE; + } + else + { + RETVAL_FALSE; + } + efree(argv[1]); efree(argv[2]); efree(argv[3]); + efree(argv); + } + else + { + WRONG_PARAM_COUNT; + } + return; +} +/* }}} */ + +/* {{{ proto int rrd_last(string file) + Gets last update time of an RRD file */ +PHP_FUNCTION(rrd_last) +{ + pval *file; + unsigned long retval; + + char **argv = (char **) emalloc(3 * sizeof(char *)); + + if ( rrd_test_error() ) + rrd_clear_error(); + + if (zend_get_parameters(ht, 1, &file) == SUCCESS) + { + convert_to_string(file); + + argv[0] = "dummy"; + argv[1] = estrdup("last"); + argv[2] = estrdup(file->value.str.val); + + optind = 0; opterr = 0; + retval = rrd_last(2, &argv[1]); + + efree(argv[1]); efree(argv[2]); + efree(argv); + RETVAL_LONG(retval); + } + else + { + WRONG_PARAM_COUNT; + } + return; +} +/* }}} */ + +/* {{{ proto int rrd_create(string file, array args_arr, int argc) + Create an RRD file with the options passed (passed via array) */ +PHP_FUNCTION(rrd_create) +{ + pval *file, *args, *p_argc; + pval *entry; + char **argv; + HashTable *args_arr; + int argc, i; + + if ( rrd_test_error() ) + rrd_clear_error(); + + if ( ZEND_NUM_ARGS() == 3 && + getParameters(ht, 3, &file, &args, &p_argc) == SUCCESS ) + { + if ( args->type != IS_ARRAY ) + { + php_error(E_WARNING, "2nd Variable passed to rrd_create is not an array!\n"); + RETURN_FALSE; + } + + convert_to_long(p_argc); + convert_to_string(file); + + convert_to_array(args); + args_arr = args->value.ht; + zend_hash_internal_pointer_reset(args_arr); + + argc = p_argc->value.lval + 3; + argv = (char **) emalloc(argc * sizeof(char *)); + + argv[0] = "dummy"; + argv[1] = estrdup("create"); + argv[2] = estrdup(file->value.str.val); + + for (i = 3; i < argc; i++) + { + pval **dataptr; + + if ( zend_hash_get_current_data(args_arr, (void *) &dataptr) == FAILURE ) + continue; + + entry = *dataptr; + + if ( entry->type != IS_STRING ) + convert_to_string(entry); + + argv[i] = estrdup(entry->value.str.val); + + if ( i < argc ) + zend_hash_move_forward(args_arr); + } + + optind = 0; opterr = 0; + + if ( rrd_create(argc-1, &argv[1]) != -1 ) + { + RETVAL_TRUE; + } + else + { + RETVAL_FALSE; + } + for (i = 1; i < argc; i++) + efree(argv[i]); + + efree(argv); + } + else + { + WRONG_PARAM_COUNT; + } + return; +} +/* }}} */ + +PHP_FUNCTION(rrdtool_info) +{ + + if (ZEND_NUM_ARGS()!=0) { + ZEND_WRONG_PARAM_COUNT(); + RETURN_FALSE; + } + + PUTS("\n"); + PUTS(""); + PUTS("\n"); + PUTS(""); + PUTS("rrdtool_info()"); + PUTS("\n"); + PUTS("
\n"); + + php_info_print_box_start(1); + PUTS("\"ClamAV\n"); + php_printf("

rrdtool Version %s

\n", PHP_RRD_VERSION_STRING); + php_info_print_box_end(); + php_info_print_table_start(); + php_info_print_table_row(2, "System", PHP_UNAME ); + php_info_print_table_row(2, "Build Date", __DATE__ " " __TIME__ ); + php_info_print_table_row(2, "rrdtool Support","Enabled"); + php_info_print_table_end(); + + PUTS("

RRDTOOL Copyright

\n"); + php_info_print_box_start(0); + PUTS("COPYRIGHT STATEMENT FOLLOWS THIS LINE

\n
\n"); + PUTS("

Portions copyright 2005 by Dale Walsh (buildsmart at daleenterprise.com).

\n"); + PUTS("

Portions relating to rrdtool 1999, 2000, 2001, 2002, 2003, 2004, 2005 by Tobias Oetiker.

\n"); + php_info_print_box_end(); + PUTS("

RRDTOOL License

\n"); + php_info_print_box_start(0); + PUTS("

Permission has been granted to copy, distribute and modify rrd in any context without fee, including a commercial application, provided that this notice is present in user-accessible supporting documentation.

"); + PUTS("

This does not affect your ownership of the derived work itself, and the intent is to assure proper credit for the authors of rrdtool, not to interfere with your productive use of rrdtool. If you have questions, ask. \"Derived works\" "); + PUTS("includes all programs that utilize the library. Credit must be given in user-accessible documentation.

\n"); + PUTS("

This software is provided \"AS IS.\" The copyright holders disclaim all warranties, either express or implied, including but not limited to implied warranties of merchantability and fitness for a particular purpose, "); + PUTS("with respect to this code and accompanying documentation.

\n"); + php_info_print_box_end(); + PUTS("

Special Thanks

\n"); + php_info_print_box_start(0); + PUTS("

Perl by Larry Wall"); + PUTS("

gd library by Thomas Boutell"); + PUTS("

gifcode from David Koblas"); + PUTS("

libpng by Glenn Randers-Pehrson / Andreas Eric Dilger / Guy Eric Schalnat"); + PUTS("

cgilib by Martin Schulze"); + PUTS("

zlib by Jean-loup Gailly and Mark Adler"); + PUTS("

Portions relating to php4 and php5 bindings, Dale Walsh (buildsmart at daleenterprise.com)"); + php_info_print_box_end(); + + PUTS("

"); +} +/* }}} */ + +PHP_FUNCTION(rrdtool_logo_guid) +{ + if (ZEND_NUM_ARGS() != 0) { + WRONG_PARAM_COUNT; + } + + RETURN_STRINGL(RRDTOOL_LOGO_GUID, sizeof(RRDTOOL_LOGO_GUID)-1, 1); +} +/* }}} */ + #endif /* HAVE_RRDTOOL */ + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ diff -Naur php4-orig/rrdtool_logo.h php4/rrdtool_logo.h --- php4-orig/rrdtool_logo.h 1969-12-31 19:00:00.000000000 -0500 +++ php4/rrdtool_logo.h 2006-06-07 15:50:24.000000000 -0400 @@ -0,0 +1,195 @@ +unsigned char rrdtool_logo[] = { + 71, 73, 70, 56, 57, 97, 120, 0, 34, 0, + 243, 14, 0, 20, 25, 93, 16, 56, 139, 32, + 72, 150, 46, 88, 160, 56, 102, 172, 73, 116, + 178, 113, 143, 188, 87, 134, 192, 153, 169, 181, + 147, 174, 207, 179, 201, 222, 253, 251, 204, 255, + 255, 255, 235, 249, 252, 214, 226, 229, 0, 0, + 0, 33, 249, 4, 0, 0, 0, 15, 0, 44, + 0, 0, 0, 0, 120, 0, 34, 0, 0, 4, + 254, 208, 201, 73, 171, 189, 56, 235, 217, 54, + 191, 93, 231, 136, 226, 104, 118, 11, 234, 164, + 235, 57, 54, 41, 108, 56, 196, 113, 20, 118, + 174, 223, 54, 238, 243, 191, 130, 16, 71, 16, + 22, 143, 198, 194, 17, 73, 104, 58, 159, 206, + 1, 65, 74, 173, 14, 174, 130, 65, 86, 203, + 229, 10, 190, 218, 175, 120, 76, 254, 6, 4, + 129, 192, 0, 224, 192, 237, 222, 240, 56, 220, + 189, 11, 222, 132, 119, 95, 112, 200, 239, 23, + 147, 127, 3, 70, 77, 74, 75, 83, 5, 130, + 130, 69, 137, 83, 87, 142, 87, 4, 108, 57, + 67, 114, 149, 111, 63, 147, 64, 61, 80, 127, + 121, 133, 126, 132, 75, 142, 127, 139, 159, 139, + 143, 82, 81, 136, 144, 84, 141, 168, 82, 146, + 54, 11, 179, 14, 114, 11, 6, 7, 13, 152, + 61, 60, 151, 154, 66, 8, 179, 194, 11, 125, + 66, 11, 132, 67, 199, 74, 133, 193, 11, 52, + 82, 203, 81, 172, 196, 5, 11, 91, 174, 175, + 87, 214, 175, 108, 110, 14, 184, 11, 9, 115, + 226, 213, 53, 9, 199, 151, 74, 121, 127, 120, + 110, 213, 184, 6, 167, 203, 214, 80, 8, 138, + 77, 193, 66, 43, 143, 91, 2, 14, 8, 106, + 4, 32, 16, 80, 77, 77, 151, 51, 253, 190, + 0, 88, 144, 38, 141, 163, 88, 7, 142, 17, + 144, 80, 64, 1, 174, 3, 181, 20, 212, 42, + 135, 209, 153, 1, 119, 254, 4, 16, 56, 80, + 160, 4, 1, 198, 111, 197, 4, 16, 43, 37, + 193, 128, 148, 5, 34, 237, 13, 24, 153, 10, + 17, 49, 44, 196, 8, 198, 36, 72, 107, 128, + 200, 151, 106, 158, 205, 108, 243, 197, 193, 204, + 2, 0, 103, 24, 205, 210, 237, 70, 184, 21, + 74, 194, 41, 209, 101, 96, 193, 1, 2, 13, + 138, 156, 235, 49, 100, 69, 199, 153, 183, 206, + 177, 91, 68, 173, 200, 173, 170, 46, 207, 46, + 80, 32, 112, 65, 42, 65, 244, 8, 168, 28, + 8, 179, 26, 192, 127, 5, 4, 84, 229, 25, + 0, 38, 79, 3, 85, 243, 122, 4, 67, 204, + 30, 211, 54, 78, 19, 36, 24, 73, 32, 220, + 213, 149, 86, 27, 55, 17, 171, 71, 242, 148, + 99, 255, 46, 35, 19, 50, 96, 229, 208, 43, + 63, 27, 100, 105, 204, 83, 64, 147, 1, 123, + 155, 248, 67, 240, 19, 53, 195, 127, 89, 250, + 242, 20, 153, 230, 159, 22, 218, 12, 199, 28, + 3, 16, 176, 105, 129, 172, 78, 39, 34, 136, + 26, 245, 113, 17, 145, 53, 218, 185, 181, 89, + 0, 111, 103, 64, 130, 57, 103, 246, 233, 64, + 165, 105, 149, 47, 77, 79, 105, 108, 176, 239, + 12, 103, 18, 238, 2, 28, 208, 87, 219, 138, + 52, 224, 195, 247, 61, 163, 37, 64, 53, 107, + 135, 125, 72, 44, 231, 32, 193, 229, 226, 150, + 171, 66, 227, 44, 177, 243, 76, 4, 154, 133, + 254, 18, 157, 20, 63, 5, 160, 81, 103, 95, + 144, 70, 26, 21, 42, 25, 112, 70, 99, 212, + 53, 84, 27, 64, 104, 108, 195, 144, 72, 108, + 32, 192, 27, 111, 235, 137, 17, 0, 0, 25, + 158, 209, 141, 49, 139, 173, 69, 128, 2, 48, + 121, 213, 216, 99, 52, 68, 196, 26, 41, 43, + 84, 85, 221, 116, 43, 137, 226, 89, 99, 172, + 29, 211, 89, 142, 246, 84, 179, 197, 21, 85, + 241, 168, 6, 76, 193, 220, 86, 151, 108, 5, + 245, 117, 89, 142, 103, 48, 68, 222, 23, 183, + 192, 4, 192, 26, 52, 224, 160, 152, 56, 71, + 32, 160, 192, 1, 9, 148, 180, 12, 13, 4, + 204, 96, 223, 50, 168, 217, 134, 90, 60, 33, + 41, 130, 8, 34, 195, 81, 129, 84, 155, 33, + 177, 118, 192, 22, 50, 57, 226, 30, 69, 89, + 124, 33, 146, 1, 102, 176, 86, 64, 0, 3, + 9, 196, 158, 131, 62, 33, 224, 160, 64, 188, + 137, 177, 39, 66, 108, 140, 229, 71, 52, 87, + 13, 18, 77, 40, 156, 60, 145, 10, 20, 142, + 172, 130, 13, 22, 168, 252, 248, 8, 66, 156, + 34, 148, 167, 135, 164, 182, 135, 134, 132, 105, + 152, 129, 6, 135, 98, 52, 170, 135, 39, 143, + 242, 65, 233, 39, 131, 84, 26, 197, 105, 107, + 38, 130, 202, 166, 217, 244, 227, 133, 23, 96, + 136, 17, 6, 26, 196, 146, 74, 6, 66, 160, + 2, 160, 80, 149, 181, 254, 222, 138, 204, 34, + 219, 141, 194, 10, 166, 216, 252, 24, 237, 43, + 163, 230, 57, 44, 24, 93, 156, 218, 208, 24, + 219, 154, 129, 234, 183, 170, 142, 171, 234, 24, + 141, 18, 32, 206, 149, 139, 41, 160, 152, 75, + 161, 28, 176, 229, 149, 10, 184, 155, 64, 60, + 163, 77, 209, 165, 1, 247, 242, 123, 239, 156, + 158, 98, 129, 64, 191, 128, 21, 108, 48, 159, + 121, 166, 33, 111, 3, 12, 88, 148, 234, 177, + 14, 45, 214, 112, 2, 223, 158, 17, 128, 75, + 31, 125, 244, 112, 177, 0, 52, 32, 197, 72, + 7, 48, 192, 192, 55, 9, 48, 44, 50, 188, + 69, 48, 224, 143, 200, 138, 41, 32, 242, 200, + 90, 200, 197, 0, 46, 34, 55, 96, 128, 203, + 12, 216, 204, 45, 22, 56, 143, 192, 214, 203, + 61, 35, 187, 165, 200, 108, 178, 252, 112, 67, + 55, 59, 48, 51, 106, 34, 43, 144, 106, 26, + 12, 32, 37, 50, 133, 160, 46, 107, 154, 189, + 4, 48, 144, 128, 35, 9, 228, 220, 192, 85, + 82, 48, 80, 131, 203, 160, 122, 237, 64, 0, + 4, 4, 96, 179, 125, 90, 91, 108, 114, 2, + 190, 6, 208, 245, 159, 55, 195, 221, 176, 178, + 35, 187, 173, 0, 0, 42, 35, 221, 244, 211, + 1, 72, 208, 177, 131, 105, 100, 157, 119, 67, + 54, 199, 51, 179, 168, 107, 44, 123, 133, 189, + 117, 191, 213, 0, 195, 70, 165, 29, 245, 207, + 254, 166, 105, 209, 53, 195, 87, 4, 126, 111, + 69, 112, 107, 97, 64, 206, 81, 115, 27, 184, + 211, 114, 127, 126, 115, 26, 6, 52, 48, 161, + 81, 12, 160, 58, 249, 226, 104, 180, 27, 178, + 132, 108, 48, 140, 186, 218, 252, 22, 32, 182, + 178, 197, 58, 62, 0, 228, 90, 167, 34, 192, + 236, 108, 89, 94, 166, 202, 82, 232, 69, 122, + 231, 36, 135, 76, 113, 123, 102, 27, 84, 148, + 25, 252, 126, 212, 176, 197, 14, 224, 125, 103, + 247, 166, 213, 70, 122, 67, 177, 87, 212, 128, + 178, 114, 201, 61, 123, 218, 124, 235, 133, 0, + 237, 101, 176, 241, 56, 219, 197, 79, 17, 0, + 233, 240, 222, 31, 184, 200, 214, 143, 206, 176, + 26, 129, 83, 92, 219, 98, 243, 2, 6, 0, + 203, 67, 3, 187, 223, 246, 28, 98, 32, 187, + 45, 238, 5, 114, 195, 223, 197, 206, 166, 59, + 3, 229, 172, 0, 254, 107, 0, 197, 238, 71, + 16, 162, 33, 139, 99, 162, 17, 128, 187, 134, + 87, 191, 43, 136, 172, 58, 157, 43, 223, 255, + 58, 135, 179, 188, 144, 199, 34, 43, 155, 30, + 121, 10, 120, 40, 110, 161, 225, 102, 0, 24, + 221, 222, 196, 149, 21, 17, 70, 237, 67, 32, + 186, 24, 233, 40, 6, 195, 174, 37, 96, 67, + 32, 26, 128, 217, 120, 147, 21, 181, 253, 48, + 120, 194, 187, 82, 46, 224, 246, 5, 151, 133, + 46, 133, 188, 139, 93, 254, 26, 124, 215, 6, + 246, 4, 240, 94, 26, 68, 86, 1, 41, 6, + 134, 41, 177, 142, 36, 3, 67, 157, 66, 24, + 192, 37, 37, 74, 77, 100, 41, 155, 92, 247, + 50, 114, 191, 46, 189, 140, 79, 94, 211, 98, + 86, 126, 102, 0, 224, 5, 175, 99, 85, 172, + 151, 63, 238, 165, 0, 134, 17, 202, 78, 90, + 67, 68, 236, 52, 146, 179, 84, 65, 79, 49, + 254, 168, 97, 224, 102, 39, 73, 15, 241, 75, + 1, 97, 58, 155, 184, 98, 71, 131, 31, 118, + 46, 135, 213, 171, 197, 189, 234, 131, 62, 52, + 40, 113, 118, 76, 76, 0, 64, 158, 8, 69, + 54, 124, 65, 49, 21, 153, 153, 0, 106, 22, + 66, 68, 94, 236, 127, 155, 99, 0, 133, 204, + 240, 141, 1, 24, 81, 140, 148, 4, 222, 147, + 206, 232, 188, 179, 49, 74, 108, 252, 90, 92, + 2, 220, 21, 65, 134, 105, 200, 34, 7, 208, + 225, 197, 220, 213, 193, 201, 185, 174, 99, 103, + 80, 218, 147, 202, 37, 0, 108, 138, 208, 129, + 20, 243, 223, 246, 18, 182, 72, 254, 221, 111, + 118, 197, 10, 224, 44, 219, 38, 162, 60, 18, + 171, 113, 216, 219, 219, 223, 196, 149, 64, 163, + 45, 147, 136, 235, 187, 83, 199, 182, 183, 76, + 167, 137, 147, 112, 186, 80, 226, 15, 45, 134, + 54, 17, 185, 238, 155, 5, 248, 165, 19, 25, + 230, 66, 242, 48, 0, 0, 24, 121, 104, 0, + 254, 66, 70, 57, 161, 101, 140, 118, 80, 99, + 24, 67, 68, 133, 172, 155, 165, 204, 105, 164, + 138, 93, 235, 140, 153, 6, 0, 184, 236, 127, + 80, 67, 141, 203, 56, 148, 134, 92, 146, 71, + 109, 90, 97, 229, 25, 98, 215, 77, 77, 218, + 107, 120, 100, 244, 221, 236, 68, 21, 53, 60, + 114, 143, 146, 13, 249, 6, 159, 20, 0, 16, + 214, 61, 239, 104, 30, 146, 151, 61, 102, 160, + 44, 130, 150, 108, 149, 168, 34, 221, 1, 252, + 102, 143, 190, 145, 143, 97, 27, 228, 27, 96, + 238, 247, 39, 196, 105, 18, 155, 95, 148, 30, + 247, 170, 55, 211, 212, 209, 84, 13, 238, 172, + 77, 66, 125, 183, 193, 253, 13, 116, 12, 140, + 90, 38, 96, 242, 6, 87, 147, 198, 110, 160, + 22, 212, 26, 240, 62, 52, 186, 58, 150, 116, + 116, 135, 67, 131, 202, 76, 18, 53, 14, 41, + 13, 164, 96, 213, 218, 251, 70, 22, 27, 129, + 78, 77, 136, 10, 180, 42, 27, 94, 102, 192, + 142, 177, 102, 106, 190, 172, 217, 75, 185, 121, + 170, 150, 188, 44, 81, 196, 98, 29, 96, 45, + 162, 180, 111, 60, 237, 84, 24, 60, 225, 12, + 78, 246, 48, 173, 226, 172, 3, 148, 253, 234, + 65, 17, 225, 144, 180, 153, 129, 83, 127, 34, + 8, 135, 134, 229, 144, 79, 165, 13, 72, 108, + 226, 19, 104, 203, 112, 219, 46, 108, 19, 174, + 14, 209, 210, 8, 89, 66, 5, 49, 189, 212, + 107, 56, 204, 53, 37, 218, 178, 209, 185, 154, + 6, 36, 91, 193, 130, 43, 113, 203, 96, 177, + 99, 121, 75, 84, 219, 245, 46, 120, 137, 107, + 174, 240, 126, 119, 99, 228, 13, 109, 43, 251, + 8, 162, 246, 186, 247, 189, 240, 141, 175, 124, + 231, 75, 223, 250, 218, 247, 190, 248, 197, 111, + 4, 0, 0, 59 }; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rrdtool/EL-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Nov 2004 02:50:26 -0000 1.4 +++ .cvsignore 19 Feb 2007 15:49:48 -0000 1.5 @@ -1 +1,6 @@ -rrdtool-1.0.49.tar.gz +rrdtool-1.2.12.tar.gz +rrdtool-1.2.13.tar.gz +php4-svn839.tar.gz +rrdtool-1.2.15.tar.gz +rrdtool-1.2.17.tar.gz +rrdtool-1.2.18.tar.gz Index: rrdtool.spec =================================================================== RCS file: /cvs/extras/rpms/rrdtool/EL-4/rrdtool.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- rrdtool.spec 20 May 2005 11:19:24 -0000 1.7 +++ rrdtool.spec 19 Feb 2007 15:49:48 -0000 1.8 @@ -1,17 +1,22 @@ +%define with_python %{?_without_python: 0} %{?!_without_python: 1} +%define with_php %{?_without_php: 0} %{?!_without_php: 1} +%define with_tcl %{?_without_tcl: 0} %{?!_without_tcl: 1} +%define php_rrd_svn 839 %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4) Summary: Round Robin Database Tool to store and display time-series data Name: rrdtool -Version: 1.0.49 -Release: 4%{?dist} +Version: 1.2.18 +Release: 1%{?dist} License: GPL Group: Applications/Databases -URL: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/ -Source: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-1.0.x/rrdtool-%{version}.tar.gz -Patch: rrdtool-1.0.49-php_config.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: gcc-c++, php-devel >= 4.0, openssl-devel -BuildRequires: libpng-devel, zlib-devel +URL: http://people.ee.ethz.ch/~oetiker/webtools/%{name}/ +Source0: http://people.ee.ethz.ch/~oetiker/webtools/%{name}/pub/%{name}-%{version}.tar.gz +Source1: php4-svn%{php_rrd_svn}.tar.gz +Patch0: rrdtool-1.2.13-php.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: gcc-c++, openssl-devel, freetype-devel +BuildRequires: libpng-devel, zlib-devel, libart_lgpl-devel >= 2.0 %description RRD is the Acronym for Round Robin Database. RRD is a system to store and @@ -22,55 +27,142 @@ scripts (from shell or Perl) or via frontends that poll network devices and put a friendly user interface on it. - %package devel -Summary: RRDtool static libraries and header files +Summary: RRDtool libraries and header files Group: Development/Libraries -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} %description devel RRD is the Acronym for Round Robin Database. RRD is a system to store and display time-series data (i.e. network bandwidth, machine-room temperature, server load average). This package allow you to use directly this library. +%package doc +Summary: RRDtool documentation +Group: Documentation -%package -n php-rrdtool -Summary: RRDtool module for PHP +%description doc +RRD is the Acronym for Round Robin Database. RRD is a system to store and +display time-series data (i.e. network bandwidth, machine-room temperature, +server load average). This package contains documentation on using RRD. + +%package perl +Summary: Perl RRDtool bindings +Group: Development/Languages +Requires: %{name} = %{version}-%{release} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Obsoletes: perl-%{name} < %{version}-%{release} +Provides: perl-%{name} = %{version}-%{release} + +%description perl +The Perl RRDtool bindings + +%if %{with_python} +%package python +Summary: Python RRDtool bindings Group: Development/Languages -Requires: %{name} = %{version}, php >= 4.0 +BuildRequires: python-devel >= 2.3 +Requires: python >= %{python_version} +Requires: %{name} = %{version}-%{release} +Obsoletes: python-%{name} < %{version}-%{release} +Provides: python-%{name} = %{version}-%{release} +%{!?python_sitearch: %define python_sitearch %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1)')} +# eval to 2.3 if python isn't yet present, workaround for no python in fc4 minimal buildroot +%{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]' || echo "2.3")} + +%description python +Python RRDtool bindings. +%endif + +%if %{with_php} +%package php +Summary: PHP RRDtool bindings +Group: Development/Languages +BuildRequires: php-devel >= 4.0 +Requires: php >= 4.0 +Requires: %{name} = %{version}-%{release} +Obsoletes: php-%{name} < %{version}-%{release} +Provides: php-%{name} = %{version}-%{release} -%description -n php-rrdtool -The php-%{name} package includes a dynamic shared object (DSO) that adds +%description php +The %{name}-php package includes a dynamic shared object (DSO) that adds RRDtool bindings to the PHP HTML-embedded scripting language. +%endif +%if %{with_tcl} +%package tcl +Summary: Tcl RRDtool bindings +Group: Development/Languages +BuildRequires: tcl-devel >= 8.0 +Requires: tcl >= 8.0 +Requires: %{name} = %{version}-%{release} +Obsoletes: tcl-%{name} < %{version}-%{release} +Provides: tcl-%{name} = %{version}-%{release} + +%description tcl +The %{name}-tcl package includes RRDtool bindings for Tcl. +%endif %prep -%setup -%patch -b .phpfix +%setup -q +%setup -q -T -D -a 1 +# Patch based on http://oss.oetiker.ch/rrdtool/pub/contrib/php_rrdtool.tgz +%if %{with_php} +%patch0 -p0 -b .php +%{__perl} -pi -e 's|../config.h|../rrd_config.h|g' php4/rrdtool.c +%endif + +# Fix to find correct python dir on lib64 +%{__perl} -pi -e 's|get_python_lib\(0,0,prefix|get_python_lib\(1,0,prefix|g' \ + configure -# Fixes to /usr/lib(64) for x86_64 +# Most edits shouldn't be necessary when using --libdir, but +# w/o, some introduce hardcoded rpaths where they shouldn't, %{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g' \ - configure contrib/php4/configure Makefile.in - + configure Makefile.in php4/configure php4/ltconfig* %build %configure \ - --program-prefix="%{?_program_prefix}" \ - --enable-shared \ - --enable-local-libpng \ - --enable-local-zlib \ + --with-perl-options='INSTALLDIRS="vendor"' \ +%if %{with_tcl} + --enable-tcl-site \ + --with-tcllib=%{_libdir} \ +%else + --disable-tcl \ +%endif +%if %{with_python} + --enable-python \ +%else + --disable-python \ +%endif + --disable-static \ --with-pic + +# Fix another rpath issue +%{__perl} -pi.orig -e 's|-Wl,--rpath -Wl,\$rp||g' \ + bindings/perl-shared/Makefile.PL + +# Force RRDp bits where we want 'em, not sure yet why the +# --with-perl-options and --libdir don't take +pushd bindings/perl-piped/ +%{__perl} Makefile.PL INSTALLDIRS=vendor +%{__perl} -pi.orig -e 's|/lib/perl|/%{_lib}/perl|g' Makefile +popd + %{__make} %{?_smp_mflags} -# Build the php4 module, the tmp install is required -%define rrdtmpdir %{_tmppath}/%{buildsubdir}-tmpinstall -%{__make} install DESTDIR="%{rrdtmpdir}" -pushd contrib/php4 - ./configure \ - --with-rrdtool="%{rrdtmpdir}%{_prefix}" - %{__make} %{?_smp_mflags} +# Build the php module, the tmp install is required +%if %{with_php} +%define rrdtmp %{_tmppath}/%{name}-%{version}-tmpinstall +%{__make} install DESTDIR="%{rrdtmp}" +pushd php4/ +%configure \ + --with-rrdtool="%{rrdtmp}%{_prefix}" \ + --disable-static +%{__make} %{?_smp_mflags} popd -%{__rm} -rf %{rrdtmpdir} +%{__rm} -rf %{rrdtmp} +%endif # Fix @perl@ and @PERL@ find examples/ -type f \ @@ -78,75 +170,179 @@ find examples/ -name "*.pl" \ -exec %{__perl} -pi -e 's|\015||gi' {} \; - %install -%{__rm} -rf %{buildroot} -%makeinstall +rm -rf $RPM_BUILD_ROOT +make DESTDIR="$RPM_BUILD_ROOT" install -# Install the php4 module -%{__install} -D -m0755 contrib/php4/modules/rrdtool.so \ +# Install the php module +%if %{with_php} +%{__install} -D -m0755 php4/modules/rrdtool.so \ %{buildroot}%{php_extdir}/rrdtool.so # Clean up the examples for inclusion as docs -%{__rm} -rf contrib/php4/examples/CVS +%{__rm} -rf php4/examples/.svn # Put the php config bit into place %{__mkdir_p} %{buildroot}%{_sysconfdir}/php.d -%{__cat} > %{buildroot}%{_sysconfdir}/php.d/rrdtool.ini << EOF +%{__cat} << __EOF__ > %{buildroot}%{_sysconfdir}/php.d/rrdtool.ini ; Enable rrdtool extension module extension=rrdtool.so -EOF +__EOF__ +%endif -# Put perl files back where they belong -%{__mkdir_p} %{buildroot}%{perl_vendorarch}/ -%{__mv} %{buildroot}%{_libdir}/perl/* %{buildroot}%{perl_vendorarch}/ +# Pesky RRDp.pm... +%{__mv} $RPM_BUILD_ROOT%{perl_vendorarch}/../RRDp.pm $RPM_BUILD_ROOT%{perl_vendorarch}/ # We only want .txt and .html files for the main documentation -%{__mkdir_p} doc2/doc -%{__cp} -a doc/*.txt doc/*.html doc2/doc/ +%{__mkdir_p} doc2/html doc2/txt +%{__cp} -a doc/*.txt doc2/txt/ +%{__cp} -a doc/*.html doc2/html/ + +# Put perl docs in perl package +%{__mkdir_p} doc3/html +%{__mv} doc2/html/RRD*.html doc3/html/ + +# Clean up the examples +%{__rm} -f examples/Makefile* examples/*.in -# Clean up the examples and contrib -%{__rm} -f examples/Makefile* -%{__rm} -f contrib/Makefile* # This is so rpm doesn't pick up perl module dependencies automatically -find examples/ contrib/ -type f -exec chmod 0644 {} \; +find examples/ -type f -exec chmod 0644 {} \; # Clean up the buildroot -%{__rm} -rf %{buildroot}%{_prefix}/{contrib,doc,examples,html}/ - +%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}/{txt,html}/ \ + $RPM_BUILD_ROOT%{perl_vendorarch}/ntmake.pl \ + $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/examples \ + $RPM_BUILD_ROOT%{perl_vendorarch}/auto/*/{.packlist,*.bs} %clean -%{__rm} -rf %{buildroot} +%{__rm} -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig %files -%defattr(-, root, root, 0755) -%doc CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO doc2/doc +%defattr(-,root,root,-) %{_bindir}/* %{_libdir}/*.so.* -%{perl_vendorarch}/*.pm -%{perl_vendorarch}/auto/* +%{_datadir}/%{name} %{_mandir}/man1/* - %files devel -%defattr(-, root, root, 0755) -%doc examples/ -%doc contrib/add_ds contrib/killspike contrib/log2rrd contrib/rrdexplorer -%doc contrib/rrdfetchnames contrib/rrd-file-icon contrib/rrdlastds -%doc contrib/rrdproc contrib/rrdview contrib/snmpstats contrib/trytime +%defattr(-,root,root,-) %{_includedir}/*.h -%{_libdir}/*.a %exclude %{_libdir}/*.la %{_libdir}/*.so +%files doc +%defattr(-,root,root,-) +%doc CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO NEWS THREADS +%doc examples doc2/html doc2/txt + +%files perl +%defattr(-,root,root,-) +%doc doc3/html +%{_mandir}/man3/* +%{perl_vendorarch}/*.pm +%attr(0755,root,root) %{perl_vendorarch}/auto/RRDs/ -%files -n php-rrdtool -%defattr(-, root, root) -%doc contrib/php4/examples contrib/php4/README +%if %{with_python} +%files python +%defattr(-,root,root,-) +%doc bindings/python/AUTHORS bindings/python/COPYING bindings/python/README +%{python_sitearch}/rrdtoolmodule.so +%endif + +%if %{with_php} +%files php +%defattr(-,root,root,0755) +%doc php4/examples php4/README %config(noreplace) %{_sysconfdir}/php.d/rrdtool.ini %{php_extdir}/rrdtool.so +%endif +%if %{with_tcl} +%files tcl +%defattr(-,root,root,-) +%doc bindings/tcl/README +%{_libdir}/tclrrd*.so +%{_libdir}/rrdtool/*.tcl +%endif %changelog +* Tue Jan 23 2007 Jarod Wilson 1.2.18-1 +- New upstream release + +* Mon Jan 22 2007 Jarod Wilson 1.2.17-1 +- New upstream release + +* Tue Jan 02 2007 Jarod Wilson 1.2.15-9 +- Fix crash with long error strings (upstream + changesets 929 and 935) + +* Thu Dec 14 2006 Jarod Wilson 1.2.15-8 +- Fix for log grid memory leak (#201241) + +* Tue Dec 12 2006 Jarod Wilson 1.2.15-7 +- Rebuild for python 2.5 + +* Tue Nov 14 2006 Jarod Wilson 1.2.15-6 +- Conditionalize python, php and tcl bits (Resolves #203275) + +* Wed Oct 25 2006 Jarod Wilson 1.2.15-5 +- Add tcl sub-package (#203275) + +* Tue Sep 05 2006 Jarod Wilson 1.2.15-4 +- Rebuild for new glibc + +* Wed Aug 02 2006 Jarod Wilson 1.2.15-3 +- One more addition to initrrdtool patch, to fully revert + and correct upstream changeset 839 +- Fix for no python in minimal fc4 buildroots + +* Tue Aug 1 2006 Mihai Ibanescu 1.2.15-2 +- Fixed rrdtool-python to import the module properly (patch + rrdtool-1.2.15-initrrdtool.patch) + +* Mon Jul 17 2006 Jarod Wilson 1.2.15-1 +- Update to 1.2.15 +- Minor spec cleanups + +* Sat Jun 24 2006 Jarod Wilson 1.2.13-7 +- Fix up Obsoletes + +* Mon Jun 19 2006 Jarod Wilson 1.2.13-6 +- Flip perl, php and python sub-package names around to + conform with general practices + +* Sat Jun 10 2006 Jarod Wilson 1.2.13-5 +- Minor fixes to make package own created directories + +* Wed Jun 07 2006 Jarod Wilson 1.2.13-4 +- Add php bits back into the mix + +* Mon Jun 05 2006 Jarod Wilson 1.2.13-3 +- Merge spec fixes from bz 185909 + +* Sun Jun 04 2006 Jarod Wilson 1.2.13-2 +- Remove explicit perl dep, version grabbing using rpm during + rpmbuild not guaranteed to work (fails on ppc in plague), + and auto-gen perl deps are sufficient + +* Sat Jun 03 2006 Jarod Wilson 1.2.13-1 +- Update to release 1.2.13 +- Merge spec changes from dag, atrpms and mdk builds +- Additional hacktastic contortions for lib64 & rpath messiness +- Add missing post/postun ldconfig +- Fix a bunch of rpmlint errors +- Disable static libs, per FE guidelines +- Split off docs + +* Wed Apr 19 2006 Chris Ricker 1.2.12-1 +- Rev to 1.2 + +* Fri May 20 2005 Matthias Saou 1.0.49-5 +- Include patch from Michael to fix perl module compilation on FC4 (#156242). + * Fri May 20 2005 Matthias Saou 1.0.49-4 - Fix for the php module patch (Joe Pruett, Dag Wieers), #156716. - Update source URL to new location since 1.2 is now the default stable. Index: sources =================================================================== RCS file: /cvs/extras/rpms/rrdtool/EL-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Nov 2004 02:50:26 -0000 1.4 +++ sources 19 Feb 2007 15:49:48 -0000 1.5 @@ -1 +1,2 @@ -fbe492dbf3d68abb1d86c2322e7ed44a rrdtool-1.0.49.tar.gz +20f70c46a3643ebc51d7b8562d8af9b2 php4-svn839.tar.gz +0c116d031275b7e0da1f8326d52d097d rrdtool-1.2.18.tar.gz From fedora-extras-commits at redhat.com Mon Feb 19 15:52:54 2007 From: fedora-extras-commits at redhat.com (Bernard Johnson (bjohnson)) Date: Mon, 19 Feb 2007 10:52:54 -0500 Subject: rpms/gdome2/devel gdome2.spec,1.9,1.10 Message-ID: <200702191552.l1JFqsPS007336@cvs-int.fedora.redhat.com> Author: bjohnson Update of /cvs/extras/rpms/gdome2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7318 Modified Files: gdome2.spec Log Message: re-enable build Index: gdome2.spec =================================================================== RCS file: /cvs/extras/rpms/gdome2/devel/gdome2.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gdome2.spec 2 Feb 2007 13:56:03 -0000 1.9 +++ gdome2.spec 19 Feb 2007 15:52:22 -0000 1.10 @@ -1,6 +1,6 @@ Name: gdome2 Version: 0.8.1 -Release: 5%{?dist} +Release: 5.1%{?dist} Summary: DOM level 2 library for accessing XML files Group: System Environment/Libraries @@ -38,20 +38,6 @@ %prep -cat< - 0.8.1-5.1 +- Re-enable building + * Mon Aug 28 2006 Ville Skytt?? - 0.8.1-5 - Rebuild. From fedora-extras-commits at redhat.com Mon Feb 19 16:02:57 2007 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Mon, 19 Feb 2007 11:02:57 -0500 Subject: rpms/Coin2/devel Coin2.spec,1.32,1.33 Message-ID: <200702191602.l1JG2vRs010961@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10939 Modified Files: Coin2.spec Log Message: * Mon Feb 19 2007 Ralf Cors??pius - 2.4.5-4 - Filter errant -L%_libdir from coin-config.cfg. - Remove *.la. Index: Coin2.spec =================================================================== RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- Coin2.spec 16 Sep 2006 03:24:20 -0000 1.32 +++ Coin2.spec 19 Feb 2007 16:02:24 -0000 1.33 @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, 2005, 2006 Ralf Corsepius, Ulm, Germany. +# Copyright (c) 2004, 2005, 2006, 2007 Ralf Corsepius, Ulm, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -13,7 +13,7 @@ Summary: High-level 3D visualization library Name: Coin2 Version: 2.4.5 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: System Environment/Libraries @@ -91,10 +91,14 @@ CPPFLAGS=$(pkg-config --cflags freetype2) make %{?_smp_mflags} +# Strip the default libdir +sed -i -e "s,\-L%{_libdir} ,," coin-default.cfg + %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install /usr/bin/rename .3 .3sim $RPM_BUILD_ROOT%{_mandir}/man3/* +rm -f ${RPM_BUILD_ROOT}%{_libdir}/lib*.la %clean rm -rf $RPM_BUILD_ROOT @@ -114,7 +118,6 @@ %defattr(-,root,root,-) %{_bindir}/* %{coin_includedir} -%{_libdir}/libCoin.*a %{_libdir}/libCoin.so %{_datadir}/aclocal/coin.m4 %dir %{_datadir}/Coin @@ -124,6 +127,10 @@ %doc %{coin_htmldir} %changelog +* Mon Feb 19 2007 Ralf Cors??pius - 2.4.5-4 +- Filter errant -L%%_libdir from coin-config.cfg. +- Remove *.la. + * Fri Sep 15 2006 Ralf Cors??pius - 2.4.5-3 - Add doxygen hack. From fedora-extras-commits at redhat.com Mon Feb 19 16:05:16 2007 From: fedora-extras-commits at redhat.com (Bernard Johnson (bjohnson)) Date: Mon, 19 Feb 2007 11:05:16 -0500 Subject: rpms/gdome2/devel gdome2.spec,1.10,1.11 Message-ID: <200702191605.l1JG5GB6011079@cvs-int.fedora.redhat.com> Author: bjohnson Update of /cvs/extras/rpms/gdome2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11020 Modified Files: gdome2.spec Log Message: bump rel Index: gdome2.spec =================================================================== RCS file: /cvs/extras/rpms/gdome2/devel/gdome2.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gdome2.spec 19 Feb 2007 15:52:22 -0000 1.10 +++ gdome2.spec 19 Feb 2007 16:04:44 -0000 1.11 @@ -1,6 +1,6 @@ Name: gdome2 Version: 0.8.1 -Release: 5.1%{?dist} +Release: 5.2%{?dist} Summary: DOM level 2 library for accessing XML files Group: System Environment/Libraries @@ -91,8 +91,8 @@ %changelog -* Thu Feb 15 2007 Bernard Johnson - 0.8.1-5.1 -- Re-enable building +* Thu Feb 15 2007 Bernard Johnson - 0.8.1-5.2 +- Re-enable building, retag, rebuild * Mon Aug 28 2006 Ville Skytt?? - 0.8.1-5 - Rebuild. From fedora-extras-commits at redhat.com Mon Feb 19 16:06:03 2007 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Mon, 19 Feb 2007 11:06:03 -0500 Subject: rpms/jd/devel .cvsignore, 1.73, 1.74 jd.spec, 1.84, 1.85 sources, 1.73, 1.74 Message-ID: <200702191606.l1JG63YJ011110@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11085 Modified Files: .cvsignore jd.spec sources Log Message: * Mon Feb 19 2007 Mamoru Tasaka - 1.8.8-0.1.cvs070219 - cvs 070219 (24:30 JST) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- .cvsignore 18 Feb 2007 13:06:05 -0000 1.73 +++ .cvsignore 19 Feb 2007 16:05:31 -0000 1.74 @@ -1 +1 @@ -jd-1.8.8-beta070218.tgz +jd-1.8.8-cvs070219.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- jd.spec 18 Feb 2007 13:06:05 -0000 1.84 +++ jd.spec 19 Feb 2007 16:05:31 -0000 1.85 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 1.8.8 -%define strtag beta070218 +%define strtag cvs070219 %define repoid 24034 @@ -106,7 +106,10 @@ %{icondir}/%{name}.png %changelog -* Sun Feb 18 2007 Mamoru Tasaka - 1.8.8.0.1.beta070218 +* Mon Feb 19 2007 Mamoru Tasaka - 1.8.8-0.1.cvs070219 +- cvs 070219 (24:30 JST) + +* Sun Feb 18 2007 Mamoru Tasaka - 1.8.8-0.1.beta070218 - 1.8.8 beta070218 * Fri Feb 2 2007 Mamoru Tasaka - 1.8.5-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- sources 18 Feb 2007 13:06:05 -0000 1.73 +++ sources 19 Feb 2007 16:05:31 -0000 1.74 @@ -1 +1 @@ -a79c0e8a8316800b37ab73fdffe4b6a4 jd-1.8.8-beta070218.tgz +2f5c42f25958fcbd971e012ea4b6c18c jd-1.8.8-cvs070219.tgz From fedora-extras-commits at redhat.com Mon Feb 19 16:15:01 2007 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Mon, 19 Feb 2007 11:15:01 -0500 Subject: rpms/vkeybd/devel vkeybd.spec,1.2,1.3 Message-ID: <200702191615.l1JGF1he011273@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/vkeybd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11246 Modified Files: vkeybd.spec Log Message: Release -3. Track tcl/tk changes in rawhide. Index: vkeybd.spec =================================================================== RCS file: /cvs/extras/rpms/vkeybd/devel/vkeybd.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- vkeybd.spec 1 Feb 2007 16:24:41 -0000 1.2 +++ vkeybd.spec 19 Feb 2007 16:14:28 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Virtual MIDI keyboard Name: vkeybd Version: 0.1.17a -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Multimedia URL: http://www.alsa-project.org/~iwai/alsa.html @@ -13,12 +13,12 @@ Patch2: vkeybd-lash-2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: tk-devel >= 8.5, tk-devel < 8.6 +BuildRequires: tk-devel >= 1:8.4, tk-devel < 1:8.5 BuildRequires: lash-devel BuildRequires: desktop-file-utils -Requires: tk >= 8.5, tk < 8.6, lash +Requires: tk >= 1:8.4, tk < 1:8.5, lash Requires: hicolor-icon-theme %description @@ -33,7 +33,7 @@ %patch2 -p0 %build -make %{?_smp_mflags} USE_LADCCA=1 TCL_VERSION=8.5 PREFIX=%{_prefix} +make %{?_smp_mflags} USE_LADCCA=1 TCL_VERSION=8.4 PREFIX=%{_prefix} %install rm -rf $RPM_BUILD_ROOT @@ -75,6 +75,9 @@ %{_datadir}/icons/hicolor/64x64/apps/vkeybd.png %changelog +* Mon Feb 19 2007 Anthony Green 0.1.17a-3 +- Track tcl/tk in rawhide. Now using 1:8.4. + * Thu Feb 01 2007 Anthony Green 0.1.17a-2 - Update tcl/tk dependency to 8.5. From fedora-extras-commits at redhat.com Mon Feb 19 16:28:08 2007 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Mon, 19 Feb 2007 11:28:08 -0500 Subject: rpms/mock/devel .cvsignore, 1.14, 1.15 mock.spec, 1.30, 1.31 sources, 1.17, 1.18 Message-ID: <200702191628.l1JGS8QR011480@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/extras/rpms/mock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11459 Modified Files: .cvsignore mock.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mock/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 8 Feb 2007 00:02:35 -0000 1.14 +++ .cvsignore 19 Feb 2007 16:27:36 -0000 1.15 @@ -1 +1 @@ -mock-0.6.11.tar.gz +mock-0.6.12.tar.gz Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/devel/mock.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- mock.spec 8 Feb 2007 00:02:35 -0000 1.30 +++ mock.spec 19 Feb 2007 16:27:36 -0000 1.31 @@ -1,6 +1,6 @@ Summary: Builds packages inside chroots Name: mock -Version: 0.6.11 +Version: 0.6.12 Release: 1%{?dist} License: GPL Group: Development/Tools @@ -67,6 +67,9 @@ %{_libdir}/libselinux-mock.so %changelog +* Fri Feb 16 2007 Clark Williams - 0.6.12-1 +- added safety symlink for yum.conf + * Tue Feb 6 2007 Clark Williams - 0.6.11-1 - added error() calls to print command output on failed commands - added installdeps command for long-term chroot management Index: sources =================================================================== RCS file: /cvs/extras/rpms/mock/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 8 Feb 2007 00:02:35 -0000 1.17 +++ sources 19 Feb 2007 16:27:36 -0000 1.18 @@ -1 +1 @@ -d62f66fde1442df2dcffd72a3978ef03 mock-0.6.11.tar.gz +8e63c0452a58d4d0578b3ddb1631d0f2 mock-0.6.12.tar.gz From fedora-extras-commits at redhat.com Mon Feb 19 16:29:29 2007 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 19 Feb 2007 11:29:29 -0500 Subject: kmodtool kmodtool,1.8,1.9 Message-ID: <200702191629.l1JGTTfS011543@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/kmodtool In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11526 Modified Files: kmodtool Log Message: Add PAE-debug to known variants. Index: kmodtool =================================================================== RCS file: /cvs/fedora/kmodtool/kmodtool,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- kmodtool 10 Aug 2006 15:12:21 -0000 1.8 +++ kmodtool 19 Feb 2007 16:29:27 -0000 1.9 @@ -1,7 +1,7 @@ #!/bin/bash # kmodtool - Helper script for building kernel module RPMs -# Copyright (c) 2003-2006 Ville Skytt?? , +# Copyright (c) 2003-2007 Ville Skytt?? , # Thorsten Leemhuis # # Permission is hereby granted, free of charge, to any person obtaining @@ -26,8 +26,8 @@ shopt -s extglob myprog="kmodtool" -myver="0.10.11" -knownvariants=@(BOOT|PAE|@(big|huge)mem|debug|enterprise|kdump|?(large)smp|uml|xen?([0U])?(-PAE)) +myver="0.10.12" +knownvariants=@(BOOT|PAE?(-debug)|@(big|huge)mem|debug|enterprise|kdump|?(large)smp|uml|xen?([0U])?(-PAE)) kmod_name= kver= verrel= From fedora-extras-commits at redhat.com Mon Feb 19 16:32:16 2007 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Mon, 19 Feb 2007 11:32:16 -0500 Subject: rpms/kvm/devel kvm.spec,1.4,1.5 Message-ID: <200702191632.l1JGWGtp011658@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/kvm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11637 Modified Files: kvm.spec Log Message: * Mon Feb 19 2007 Jeremy Katz - 12-2 - include bios and keymaps in the kvm package since we need a slightly different version for kvm now - include man page Index: kvm.spec =================================================================== RCS file: /cvs/extras/rpms/kvm/devel/kvm.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- kvm.spec 26 Jan 2007 20:54:30 -0000 1.4 +++ kvm.spec 19 Feb 2007 16:31:44 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Kernel-based Virtual Machine Name: kvm Version: 12 -Release: 1 +Release: 2 License: GPL Group: Development/Tools URL: http://kvm.sf.net @@ -15,7 +15,6 @@ BuildRequires: e2fsprogs-devel # kvm kernel side is only x86/x86_64 as that's where the hardware is ExclusiveArch: %{ix86} x86_64 -Requires: qemu %description KVM (for Kernel-based Virtual Machine) is a full virtualization solution @@ -31,15 +30,19 @@ %build ./configure --with-patched-kernel --qemu-cc=gcc34 --kerneldir=$(pwd)/kernel --prefix=%{_prefix} +# we need to install the data bits in a different path +sed -i 's/CONFIG_QEMU_SHAREDIR \"\/usr\/share\/qemu\"/CONFIG_QEMU_SHAREDIR \"\/usr\/share\/kvm\"/' qemu/config-host.h +sed -i 's/datadir=\/usr\/share\/qemu/datadir=\/usr\/share\/kvm/' qemu/config-host.mak make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -# we require qemu, so we can just use its keymaps, etc and not package them -# ourself -rm -rf $RPM_BUILD_ROOT/%{_datadir}/qemu $RPM_BUILD_ROOT/%{_mandir} $RPM_BUILD_ROOT/%{_docdir} +# we have to have our own copies of the bios/keymaps due to incompat with +# qemu 0.9. include the man page +mv $RPM_BUILD_ROOT/%{_mandir}/man1/qemu.1* $RPM_BUILD_ROOT/%{_mandir}/man1/qemu-kvm.1 +rm -rf $RPM_BUILD_ROOT/%{_mandir}/man*/qemu-img* $RPM_BUILD_ROOT/%{_docdir} rm -f $RPM_BUILD_ROOT/%{_bindir}/qemu-img # no shared lib, static libs rm -fr $RPM_BUILD_ROOT/%{_includedir} $RPM_BUILD_ROOT/%{_libdir} @@ -53,8 +56,15 @@ %files %defattr(-,root,root,-) %{_bindir}/qemu-kvm +%{_mandir}/man*/* +%{_datadir}/kvm %changelog +* Mon Feb 19 2007 Jeremy Katz - 12-2 +- include bios and keymaps in the kvm package since we need a slightly + different version for kvm now +- include man page + * Fri Jan 26 2007 Jeremy Katz - 12-1 - update to kvm-12 - add qemu patch for better ATAPI DMA support (which works with ata_piix) From fedora-extras-commits at redhat.com Mon Feb 19 16:36:23 2007 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 19 Feb 2007 11:36:23 -0500 Subject: rpms/python-basemap-data/devel python-basemap-data.spec,1.5,1.6 Message-ID: <200702191636.l1JGaNwJ011742@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-basemap-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11720 Modified Files: python-basemap-data.spec Log Message: Add BR python-devel Index: python-basemap-data.spec =================================================================== RCS file: /cvs/extras/rpms/python-basemap-data/devel/python-basemap-data.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-basemap-data.spec 3 Jul 2006 21:28:37 -0000 1.5 +++ python-basemap-data.spec 19 Feb 2007 16:35:50 -0000 1.6 @@ -2,7 +2,7 @@ Name: python-basemap-data Version: 0.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Data for python-basemap Group: Development/Libraries License: GPL @@ -11,6 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +BuildRequires: python-devel Requires: %{_datadir}/basemap %description @@ -39,6 +40,9 @@ %changelog +* Mon Feb 19 2007 Orion Poplawski 0.9-2 +- Add BR: python-devel + * Mon Jul 3 2006 Orion Poplawski 0.9-1 - Update to 0.9 From fedora-extras-commits at redhat.com Mon Feb 19 17:03:54 2007 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Mon, 19 Feb 2007 12:03:54 -0500 Subject: rpms/kvm/devel kvm.spec,1.5,1.6 Message-ID: <200702191703.l1JH3sLT015488@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/kvm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15469 Modified Files: kvm.spec Log Message: * Mon Feb 19 2007 Jeremy Katz - 12-3 - add the buildrequires for the docs to build Index: kvm.spec =================================================================== RCS file: /cvs/extras/rpms/kvm/devel/kvm.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- kvm.spec 19 Feb 2007 16:31:44 -0000 1.5 +++ kvm.spec 19 Feb 2007 17:03:21 -0000 1.6 @@ -1,7 +1,7 @@ Summary: Kernel-based Virtual Machine Name: kvm Version: 12 -Release: 2 +Release: 3 License: GPL Group: Development/Tools URL: http://kvm.sf.net @@ -13,6 +13,8 @@ BuildRequires: compat-gcc-34 BuildRequires: zlib-devel BuildRequires: e2fsprogs-devel +# for the docs +BuildRequires: texi2html # kvm kernel side is only x86/x86_64 as that's where the hardware is ExclusiveArch: %{ix86} x86_64 @@ -60,6 +62,9 @@ %{_datadir}/kvm %changelog +* Mon Feb 19 2007 Jeremy Katz - 12-3 +- add the buildrequires for the docs to build + * Mon Feb 19 2007 Jeremy Katz - 12-2 - include bios and keymaps in the kvm package since we need a slightly different version for kvm now From fedora-extras-commits at redhat.com Mon Feb 19 17:38:32 2007 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Mon, 19 Feb 2007 12:38:32 -0500 Subject: fedora-security/audit fc5,1.453,1.454 fc6,1.207,1.208 Message-ID: <200702191738.l1JHcWjM015855@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15835 Modified Files: fc5 fc6 Log Message: Note a gnucash flaw Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.453 retrieving revision 1.454 diff -u -r1.453 -r1.454 --- fc5 19 Feb 2007 10:34:13 -0000 1.453 +++ fc5 19 Feb 2007 17:38:30 -0000 1.454 @@ -16,6 +16,7 @@ CVE-2007-0104 ignore (poppler) only client DoS CVE-2007-0104 ignore (kdegraphics) only client DoS CVE-2007-0086 ignore (apache) not a security issue +CVE-2007-0007 ignore (gnucsh) doesn't affect this version CVE-2007-0006 backport (kernel, fixed in -mm) [since FEDORA-2007-225] CVE-2006-6939 VULNERABLE (ed, fixed 0.3) #223075 CVE-2006-6870 backport (avahi, fixed 0.6.16) #221726 [since FEDORA-2007-018] Index: fc6 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc6,v retrieving revision 1.207 retrieving revision 1.208 diff -u -r1.207 -r1.208 --- fc6 19 Feb 2007 10:34:13 -0000 1.207 +++ fc6 19 Feb 2007 17:38:30 -0000 1.208 @@ -23,6 +23,7 @@ CVE-2007-0104 ignore (poppler) only client DoS CVE-2007-0104 ignore (kdegraphics) only client DoS CVE-2007-0086 ignore (apache) not a security issue +CVE-2007-0007 version (gnucash, fixed 2.0.5) #223233 CVE-2007-0006 backport (kernel, fixed in -mm) [since FEDORA-2007-226] CVE-2006-6939 VULNERABLE (ed, fixed 0.3) #223075 CVE-2006-6899 version (bluez-utils, fixed 2.23) From fedora-extras-commits at redhat.com Mon Feb 19 18:04:49 2007 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Mon, 19 Feb 2007 13:04:49 -0500 Subject: rpms/python-cherrypy/devel python-cherrypy.spec,1.12,1.13 Message-ID: <200702191804.l1JI4nMx019445@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/python-cherrypy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19420 Modified Files: python-cherrypy.spec Log Message: * Mon Feb 19 2007 Luke Macken 2.2.1-6 - Disable regression tests until we can figure out why they are dying in mock. Index: python-cherrypy.spec =================================================================== RCS file: /cvs/extras/rpms/python-cherrypy/devel/python-cherrypy.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- python-cherrypy.spec 10 Dec 2006 06:25:42 -0000 1.12 +++ python-cherrypy.spec 19 Feb 2007 18:04:16 -0000 1.13 @@ -2,7 +2,7 @@ Name: python-cherrypy Version: 2.2.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A pythonic, object-oriented web development framework Group: Development/Libraries License: BSD @@ -34,9 +34,9 @@ rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT --prefix=%{_prefix} -%check -cd cherrypy/test -%{__python} test.py +#%check +#cd cherrypy/test +#%{__python} test.py %clean rm -rf $RPM_BUILD_ROOT @@ -55,6 +55,10 @@ %{python_sitelib}/cherrypy/filters/*.py* %changelog +* Mon Feb 19 2007 Luke Macken 2.2.1-6 +- Disable regression tests until we can figure out why they + are dying in mock. + * Sun Dec 10 2006 Luke Macken 2.2.1-5 - Add python-devel to BuildRequires From fedora-extras-commits at redhat.com Mon Feb 19 18:21:39 2007 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Mon, 19 Feb 2007 13:21:39 -0500 Subject: rpms/915resolution/devel/915resolution-0.5.2 - New directory Message-ID: <200702191821.l1JILdhO019609@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/915resolution/devel/915resolution-0.5.2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19604/915resolution-0.5.2 Log Message: Directory /cvs/extras/rpms/915resolution/devel/915resolution-0.5.2 added to the repository From fedora-extras-commits at redhat.com Mon Feb 19 18:27:16 2007 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Mon, 19 Feb 2007 13:27:16 -0500 Subject: rpms/915resolution/devel 915resolution-config, NONE, 1.1 915resolution-init, NONE, 1.1 915resolution-pm-hook, NONE, 1.1 915resolution.spec, 1.5, 1.6 README.fedora, 1.3, 1.4 Message-ID: <200702191827.l1JIRGeM019675@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/915resolution/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19653 Modified Files: 915resolution.spec README.fedora Added Files: 915resolution-config 915resolution-init 915resolution-pm-hook Log Message: update for BZ#219236 --- NEW FILE 915resolution-config --- # Mode to overwrite # RESOLUTION="58 1680 1050" --- NEW FILE 915resolution-init --- #!/bin/bash # # /etc/rc.d/init.d/915resolution # # Starts the 915resulution helper # # chkconfig: - 65 35 # description: 915resolution tool # processname: 915resolution # Source function library. . /etc/init.d/functions test -x /usr/sbin/915resolution || exit 0 RETVAL=0 prog="915resolution" start() { if [ -r /etc/sysconfig/915resolution ]; then . /etc/sysconfig/915resolution fi if [ -n "$RESOLUTION" ]; then echo -n $"Starting $prog: " /usr/sbin/915resolution $RESOLUTION >/dev/null 2>&1 RETVAL=$? [ $RETVAL -eq 0 ] && touch /var/lock/subsys/915resolution echo fi } stop() { rm -f /var/lock/subsys/915resolution } # # See how we were called. # case "$1" in start) start ;; stop) stop ;; reload|restart) stop start RETVAL=$? ;; condrestart) if [ -f /var/lock/subsys/915resolution ]; then stop start fi ;; status) [ -f /var/lock/subsys/915resolution ] RETVAL=$? ;; *) echo $"Usage: $0 {condrestart|start|stop|restart|reload|status}" exit 1 esac exit $RETVAL --- NEW FILE 915resolution-pm-hook --- #!/bin/sh case "$1" in thaw|resume) { /sbin/service 915resolution start ; } 2>/dev/null ;; *) ;; esac exit $? Index: 915resolution.spec =================================================================== RCS file: /cvs/extras/rpms/915resolution/devel/915resolution.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- 915resolution.spec 7 Dec 2006 02:52:13 -0000 1.5 +++ 915resolution.spec 19 Feb 2007 18:26:43 -0000 1.6 @@ -1,20 +1,29 @@ Name: 915resolution Version: 0.5.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Intel video BIOS hack to support certain resolutions Group: User Interface/X Hardware Support License: Public Domain URL: http://www.geocities.com/stomljen/ Source0: http://www.geocities.com/stomljen/%{name}-%{version}.tar.gz +Source1: %{name}-init +Source2: %{name}-config +Source3: %{name}-pm-hook BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# this doesn't make much sense on ppc. That, and it fails in build... +# this doesn't make much sense on ppc. That, and it fails to build :) ExcludeArch: ppc # simple "get it going" instructions Source100: README.fedora +# for the add/remove/condrestart service stuff. +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/chkconfig +Requires(preun): /sbin/service + + %description 915resolution is a tool to modify the video BIOS of the 800 and 900 series Intel graphics chipsets. This includes the 845G, 855G, and 865G chipsets, as @@ -48,18 +57,51 @@ mkdir -p %{buildroot}%{_sbindir} cp %{name} %{buildroot}%{_sbindir} +# ...and the associated support bits +mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d +install -m 0755 -T %{SOURCE1} \ + %{buildroot}%{_sysconfdir}/rc.d/init.d/915resolution +mkdir -p %{buildroot}%{_sysconfdir}/sysconfig +install -m 0644 -T %{SOURCE2} \ + %{buildroot}%{_sysconfdir}/sysconfig/915resolution +mkdir -p %{buildroot}%{_sysconfdir}/pm/hooks +install -m 0755 -T %{SOURCE3} \ + %{buildroot}%{_sysconfdir}/pm/hooks/99resolution + %clean rm -rf %{buildroot} +%post +# This adds the proper /etc/rc*.d links for the script +/sbin/chkconfig --add 915resolution + + +%preun +if [ $1 = 0 ]; then + /sbin/service 915resolution stop >/dev/null 2>&1 || : + /sbin/chkconfig --del 915resolution +fi + +# no postun scriptlet is provided to "restart" the service on upgrade as this +# doesn't seem entirely appropriate. explanations as to why this is wrong are +# welcome :) + %files %defattr(-,root,root,-) %doc LICENSE.txt README* changes.log chipset_info.txt dump_bios %{_sbindir}/* +%{_sysconfdir}/rc.d/init.d/* +%{_sysconfdir}/pm/hooks/* +%config(noreplace) %{_sysconfdir}/sysconfig/* %changelog +* Mon Feb 19 2007 Chris Weyl 0.5.2-4 +- add initscript infrastructure from Bojan Smojver, who kindly did most of the + work to implement it. Thanks Bojan! :) + * Tue Aug 01 2006 Chris Weyl 0.5.2-3 - excludearch ppc Index: README.fedora =================================================================== RCS file: /cvs/extras/rpms/915resolution/devel/README.fedora,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- README.fedora 7 Dec 2006 02:52:13 -0000 1.3 +++ README.fedora 19 Feb 2007 18:26:43 -0000 1.4 @@ -7,12 +7,12 @@ Note that the intel xorg drivers are supposed to deal with displaying to non-bios modes "real soon now"; hence this setup technique. +Note also the prior method used has changed (but should still work), thanks to +an actual initscript framework :) + 1. Read README.txt, in this directory... Figure out the proper invocation of the binary for your hardware. -2. Edit /etc/rc.local. Include as a line in that file a call to - 915resolution; a la: - - /usr/sbin/915resolution .... - - Where .... is the proper parameters to pass 915resolution. +2. Edit /etc/sysconfig/915resolution. Modify "RESOLUTION" to be the proper + modestring to pass 915resolution for your hardware. +3. Enjoy widescreen :) From fedora-extras-commits at redhat.com Mon Feb 19 18:42:22 2007 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Mon, 19 Feb 2007 13:42:22 -0500 Subject: rpms/libvisual-plugins/devel libvisual-plugins.spec,1.12,1.13 Message-ID: <200702191842.l1JIgMiE020091@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/libvisual-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20054/devel Modified Files: libvisual-plugins.spec Log Message: rebuild Index: libvisual-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/libvisual-plugins/devel/libvisual-plugins.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libvisual-plugins.spec 11 Dec 2006 16:36:39 -0000 1.12 +++ libvisual-plugins.spec 19 Feb 2007 18:41:50 -0000 1.13 @@ -1,6 +1,6 @@ Name: libvisual-plugins Version: 0.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Plugins for use with libvisual Group: Applications/Multimedia @@ -28,13 +28,6 @@ libvisual aware applications. %prep -cat< 0.4.0-2 +- rebuild + * Sat Sep 09 2006 Thomas Vander Stichele - 0.4.0-1 - updated to new upstream version From fedora-extras-commits at redhat.com Mon Feb 19 18:42:19 2007 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Mon, 19 Feb 2007 13:42:19 -0500 Subject: rpms/libvisual-plugins/FC-6 libvisual-plugins.spec,1.11,1.12 Message-ID: <200702191842.l1JIgJaU020088@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/libvisual-plugins/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20054/FC-6 Modified Files: libvisual-plugins.spec Log Message: rebuild Index: libvisual-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/libvisual-plugins/FC-6/libvisual-plugins.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libvisual-plugins.spec 21 Sep 2006 15:57:11 -0000 1.11 +++ libvisual-plugins.spec 19 Feb 2007 18:41:47 -0000 1.12 @@ -1,6 +1,6 @@ Name: libvisual-plugins Version: 0.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Plugins for use with libvisual Group: Applications/Multimedia @@ -63,6 +63,7 @@ [ ! -d %buildroot%_libdir/libvisual/transform ] && install -d -m755 %buildroot%_libdir/libvisual/transform %find_lang libvisual-plugins-0.4 + %clean rm -rf %buildroot @@ -76,6 +77,9 @@ %_datadir/%{name}-0.4/ %changelog +* Mon Feb 19 2007 Aurelien Bompard 0.4.0-2 +- rebuild + * Sat Sep 09 2006 Thomas Vander Stichele - 0.4.0-1 - updated to new upstream version From fedora-extras-commits at redhat.com Mon Feb 19 18:43:06 2007 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Mon, 19 Feb 2007 13:43:06 -0500 Subject: rpms/perl-Data-Alias/FC-5 perl-Data-Alias.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200702191843.l1JIh6ie020167@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Data-Alias/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20094/FC-5 Modified Files: perl-Data-Alias.spec sources Log Message: update to 1.02 Index: perl-Data-Alias.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Data-Alias/FC-5/perl-Data-Alias.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Data-Alias.spec 4 Oct 2006 03:39:05 -0000 1.3 +++ perl-Data-Alias.spec 19 Feb 2007 18:42:33 -0000 1.4 @@ -1,5 +1,5 @@ Name: perl-Data-Alias -Version: 1.01 +Version: 1.02 Release: 1%{?dist} Summary: Comprehensive set of aliasing operations License: GPL or Artistic @@ -62,6 +62,9 @@ %changelog +* Mon Feb 19 2007 Chris Weyl 1.02-1 +- update to 1.02 + * Tue Oct 03 2006 Chris Weyl 1.01-1 - update to 1.01 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Data-Alias/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 4 Oct 2006 03:39:05 -0000 1.3 +++ sources 19 Feb 2007 18:42:33 -0000 1.4 @@ -1 +1 @@ -5247906ae963ba3e3e4292b497d0d354 Data-Alias-1.01.tar.gz +db126d231579558090e8617e57843907 Data-Alias-1.02.tar.gz From fedora-extras-commits at redhat.com Mon Feb 19 18:43:08 2007 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Mon, 19 Feb 2007 13:43:08 -0500 Subject: rpms/perl-Data-Alias/FC-6 perl-Data-Alias.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200702191843.l1JIh8Jr020197@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Data-Alias/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20094/FC-6 Modified Files: perl-Data-Alias.spec sources Log Message: update to 1.02 Index: perl-Data-Alias.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Data-Alias/FC-6/perl-Data-Alias.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Data-Alias.spec 4 Oct 2006 03:39:06 -0000 1.4 +++ perl-Data-Alias.spec 19 Feb 2007 18:42:36 -0000 1.5 @@ -1,5 +1,5 @@ Name: perl-Data-Alias -Version: 1.01 +Version: 1.02 Release: 1%{?dist} Summary: Comprehensive set of aliasing operations License: GPL or Artistic @@ -62,6 +62,9 @@ %changelog +* Mon Feb 19 2007 Chris Weyl 1.02-1 +- update to 1.02 + * Tue Oct 03 2006 Chris Weyl 1.01-1 - update to 1.01 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Data-Alias/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 4 Oct 2006 03:39:06 -0000 1.3 +++ sources 19 Feb 2007 18:42:36 -0000 1.4 @@ -1 +1 @@ -5247906ae963ba3e3e4292b497d0d354 Data-Alias-1.01.tar.gz +db126d231579558090e8617e57843907 Data-Alias-1.02.tar.gz From fedora-extras-commits at redhat.com Mon Feb 19 18:43:03 2007 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Mon, 19 Feb 2007 13:43:03 -0500 Subject: rpms/perl-Data-Alias Makefile,1.2,1.3 Message-ID: <200702191843.l1JIh3Jj020160@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Data-Alias In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20094 Modified Files: Makefile Log Message: update to 1.02 Index: Makefile =================================================================== RCS file: /cvs/extras/rpms/perl-Data-Alias/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 4 Oct 2006 03:39:04 -0000 1.2 +++ Makefile 19 Feb 2007 18:42:31 -0000 1.3 @@ -4,9 +4,10 @@ # tag & build all non-legacy branches... build-all : - @echo WARNING: building for devel and FC-5 + @echo WARNING: building for devel, FC-5, FC-6 @sleep 5s @cd FC-5 && test -f dead.package || ( make tag && make plague ) + @cd FC-6 && test -f dead.package || ( make tag && make plague ) @cd devel && test -f dead.package || ( make tag && make plague ) common-update : common From fedora-extras-commits at redhat.com Mon Feb 19 18:43:11 2007 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Mon, 19 Feb 2007 13:43:11 -0500 Subject: rpms/perl-Data-Alias/devel .cvsignore, 1.3, 1.4 perl-Data-Alias.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200702191843.l1JIhBI4020205@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Data-Alias/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20094/devel Modified Files: .cvsignore perl-Data-Alias.spec sources Log Message: update to 1.02 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Data-Alias/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 4 Oct 2006 03:39:06 -0000 1.3 +++ .cvsignore 19 Feb 2007 18:42:38 -0000 1.4 @@ -1 +1 @@ -Data-Alias-1.01.tar.gz +Data-Alias-1.02.tar.gz Index: perl-Data-Alias.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Data-Alias/devel/perl-Data-Alias.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Data-Alias.spec 4 Oct 2006 03:39:06 -0000 1.4 +++ perl-Data-Alias.spec 19 Feb 2007 18:42:38 -0000 1.5 @@ -1,5 +1,5 @@ Name: perl-Data-Alias -Version: 1.01 +Version: 1.02 Release: 1%{?dist} Summary: Comprehensive set of aliasing operations License: GPL or Artistic @@ -62,6 +62,9 @@ %changelog +* Mon Feb 19 2007 Chris Weyl 1.02-1 +- update to 1.02 + * Tue Oct 03 2006 Chris Weyl 1.01-1 - update to 1.01 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Data-Alias/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 4 Oct 2006 03:39:06 -0000 1.3 +++ sources 19 Feb 2007 18:42:38 -0000 1.4 @@ -1 +1 @@ -5247906ae963ba3e3e4292b497d0d354 Data-Alias-1.01.tar.gz +db126d231579558090e8617e57843907 Data-Alias-1.02.tar.gz From fedora-extras-commits at redhat.com Mon Feb 19 18:51:47 2007 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Mon, 19 Feb 2007 13:51:47 -0500 Subject: rpms/perl-Class-InsideOut/FC-5 perl-Class-InsideOut.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200702191851.l1JIplRm020454@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Class-InsideOut/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20399/FC-5 Modified Files: perl-Class-InsideOut.spec sources Log Message: update to 1.06 Index: perl-Class-InsideOut.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-InsideOut/FC-5/perl-Class-InsideOut.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Class-InsideOut.spec 7 Nov 2006 16:38:28 -0000 1.5 +++ perl-Class-InsideOut.spec 19 Feb 2007 18:51:14 -0000 1.6 @@ -1,5 +1,5 @@ Name: perl-Class-InsideOut -Version: 1.03 +Version: 1.06 Release: 1%{?dist} Summary: A safe, simple inside-out object construction kit @@ -10,8 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl -BuildRequires: perl(Test::Pod::Coverage), perl(Test::Pod), dos2unix +BuildRequires: perl, dos2unix Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -71,6 +70,10 @@ %changelog +* Mon Feb 19 2007 Chris Weyl 1.06-1 +- update to 1.06 +- drop br's on modules required for skipped "author tests" + * Tue Nov 07 2006 Chris Weyl 1.03-1 - update to 1.03 - minor spec tweaks Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-InsideOut/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 7 Nov 2006 16:38:28 -0000 1.5 +++ sources 19 Feb 2007 18:51:14 -0000 1.6 @@ -1 +1 @@ -ac3c30b555ecedb1c0da1f7380b99652 Class-InsideOut-1.03.tar.gz +505acfc9983265e9ca7e2b950dc6f6eb Class-InsideOut-1.06.tar.gz From fedora-extras-commits at redhat.com Mon Feb 19 18:51:53 2007 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Mon, 19 Feb 2007 13:51:53 -0500 Subject: rpms/perl-Class-InsideOut/devel .cvsignore, 1.5, 1.6 perl-Class-InsideOut.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <200702191851.l1JIprlu020463@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Class-InsideOut/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20399/devel Modified Files: .cvsignore perl-Class-InsideOut.spec sources Log Message: update to 1.06 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-InsideOut/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 7 Nov 2006 16:38:30 -0000 1.5 +++ .cvsignore 19 Feb 2007 18:51:20 -0000 1.6 @@ -1 +1 @@ -Class-InsideOut-1.03.tar.gz +Class-InsideOut-1.06.tar.gz Index: perl-Class-InsideOut.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-InsideOut/devel/perl-Class-InsideOut.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Class-InsideOut.spec 7 Nov 2006 16:38:30 -0000 1.7 +++ perl-Class-InsideOut.spec 19 Feb 2007 18:51:20 -0000 1.8 @@ -1,5 +1,5 @@ Name: perl-Class-InsideOut -Version: 1.03 +Version: 1.06 Release: 1%{?dist} Summary: A safe, simple inside-out object construction kit @@ -10,8 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl -BuildRequires: perl(Test::Pod::Coverage), perl(Test::Pod), dos2unix +BuildRequires: perl, dos2unix Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -71,6 +70,10 @@ %changelog +* Mon Feb 19 2007 Chris Weyl 1.06-1 +- update to 1.06 +- drop br's on modules required for skipped "author tests" + * Tue Nov 07 2006 Chris Weyl 1.03-1 - update to 1.03 - minor spec tweaks Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-InsideOut/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 7 Nov 2006 16:38:30 -0000 1.5 +++ sources 19 Feb 2007 18:51:20 -0000 1.6 @@ -1 +1 @@ -ac3c30b555ecedb1c0da1f7380b99652 Class-InsideOut-1.03.tar.gz +505acfc9983265e9ca7e2b950dc6f6eb Class-InsideOut-1.06.tar.gz From fedora-extras-commits at redhat.com Mon Feb 19 18:51:50 2007 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Mon, 19 Feb 2007 13:51:50 -0500 Subject: rpms/perl-Class-InsideOut/FC-6 perl-Class-InsideOut.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <200702191851.l1JIpoiM020458@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Class-InsideOut/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20399/FC-6 Modified Files: perl-Class-InsideOut.spec sources Log Message: update to 1.06 Index: perl-Class-InsideOut.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-InsideOut/FC-6/perl-Class-InsideOut.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Class-InsideOut.spec 7 Nov 2006 16:38:29 -0000 1.7 +++ perl-Class-InsideOut.spec 19 Feb 2007 18:51:17 -0000 1.8 @@ -1,5 +1,5 @@ Name: perl-Class-InsideOut -Version: 1.03 +Version: 1.06 Release: 1%{?dist} Summary: A safe, simple inside-out object construction kit @@ -10,8 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl -BuildRequires: perl(Test::Pod::Coverage), perl(Test::Pod), dos2unix +BuildRequires: perl, dos2unix Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -71,6 +70,10 @@ %changelog +* Mon Feb 19 2007 Chris Weyl 1.06-1 +- update to 1.06 +- drop br's on modules required for skipped "author tests" + * Tue Nov 07 2006 Chris Weyl 1.03-1 - update to 1.03 - minor spec tweaks Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-InsideOut/FC-6/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 7 Nov 2006 16:38:29 -0000 1.5 +++ sources 19 Feb 2007 18:51:17 -0000 1.6 @@ -1 +1 @@ -ac3c30b555ecedb1c0da1f7380b99652 Class-InsideOut-1.03.tar.gz +505acfc9983265e9ca7e2b950dc6f6eb Class-InsideOut-1.06.tar.gz From fedora-extras-commits at redhat.com Mon Feb 19 19:16:30 2007 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Mon, 19 Feb 2007 14:16:30 -0500 Subject: rpms/cobbler/devel .cvsignore, 1.15, 1.16 cobbler.spec, 1.18, 1.19 sources, 1.17, 1.18 Message-ID: <200702191916.l1JJGUZA024195@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24174 Modified Files: .cvsignore cobbler.spec sources Log Message: Upstream to 0.4.0 -- see CHANGELOG Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cobbler/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 29 Jan 2007 18:41:33 -0000 1.15 +++ .cvsignore 19 Feb 2007 19:15:58 -0000 1.16 @@ -12,3 +12,4 @@ cobbler-0.3.7.tar.gz cobbler-0.3.8.tar.gz cobbler-0.3.9.tar.gz +cobbler-0.4.0.tar.gz Index: cobbler.spec =================================================================== RCS file: /cvs/extras/rpms/cobbler/devel/cobbler.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- cobbler.spec 29 Jan 2007 19:01:29 -0000 1.18 +++ cobbler.spec 19 Feb 2007 19:15:58 -0000 1.19 @@ -2,8 +2,8 @@ Summary: Boot server configurator Name: cobbler -Version: 0.3.9 -Release: 2%{?dist} +Version: 0.4.0 +Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPL Group: Applications/System @@ -47,6 +47,7 @@ %post /sbin/chkconfig --add cobblersyslogd + %preun if [ $1 = 0 ]; then /sbin/service cobblersyslogd stop >/dev/null 2>&1 || : @@ -65,7 +66,19 @@ %defattr(-,apache,apache) %dir /var/log/cobbler %dir /var/log/cobbler/kicklog +%dir /var/www/cobbler/ +%dir /var/www/cobbler/localmirror +%dir /var/www/cobbler/kickstarts +%dir /var/www/cobbler/kickstarts_sys +%dir /var/www/cobbler/repo_mirror +%dir /var/www/cobbler/ks_mirror +%dir /var/www/cobbler/images +%dir /var/www/cobbler/distros +%dir /var/www/cobbler/profiles +%dir /var/www/cobbler/systems %defattr(-,root,root) +%dir /tftpboot/pxelinux.cfg +%dir /tftpboot/images %{_bindir}/cobbler %{_bindir}/cobbler_syslogd %dir /etc/cobbler @@ -74,12 +87,18 @@ %config(noreplace) /etc/cobbler/kickstart_fc6.ks %config(noreplace) /etc/cobbler/kickstart_fc6_domU.ks %config(noreplace) /etc/cobbler/dhcp.template -%config(noreplace) /etc/cobbler/default.pxe %config(noreplace) /etc/cobbler/rsync.exclude %dir %{python_sitelib}/cobbler %dir %{python_sitelib}/cobbler/yaml +%dir %{python_sitelib}/cobbler/Cheetah %{python_sitelib}/cobbler/*.py* %{python_sitelib}/cobbler/yaml/*.py* +%{python_sitelib}/cobbler/Cheetah/*.py* +%{python_sitelib}/cobbler/Cheetah/Macros/*.py* +%{python_sitelib}/cobbler/Cheetah/Templates/*.py* +%{python_sitelib}/cobbler/Cheetah/Tests/*.py* +%{python_sitelib}/cobbler/Cheetah/Tools/*.py* +%{python_sitelib}/cobbler/Cheetah/Utils/*.py* %{_mandir}/man1/cobbler.1.gz %dir /var/lib/cobbler /var/lib/cobbler/elilo-3.6-ia64.efi @@ -91,6 +110,11 @@ %changelog +* Mon Feb 19 2007 Michael DeHaan - 0.4.0-1 +- Upstream changes (see CHANGELOG) +- Cobbler RPM now owns various directories it uses versus creating them using commands. +- Bundling a copy of Cheetah for older distros + * Mon Jan 28 2007 Michael DeHaan - 0.3.9-1 - Changed init script pre/post code to match FC-E guidelines/example - Shortened RPM description Index: sources =================================================================== RCS file: /cvs/extras/rpms/cobbler/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 29 Jan 2007 18:41:33 -0000 1.17 +++ sources 19 Feb 2007 19:15:58 -0000 1.18 @@ -1 +1 @@ -5c168ec21f853b422190eca65de0432f cobbler-0.3.9.tar.gz +2f3773f5572237647a17bfec45e2d22d cobbler-0.4.0.tar.gz From fedora-extras-commits at redhat.com Mon Feb 19 19:18:11 2007 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Mon, 19 Feb 2007 14:18:11 -0500 Subject: rpms/cobbler/FC-6 .cvsignore, 1.19, 1.20 cobbler.spec, 1.20, 1.21 sources, 1.20, 1.21 Message-ID: <200702191918.l1JJIBAL024300@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24273 Modified Files: .cvsignore cobbler.spec sources Log Message: Upstream to 0.4.0 (see CHANGELOG) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cobbler/FC-6/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 29 Jan 2007 18:45:05 -0000 1.19 +++ .cvsignore 19 Feb 2007 19:17:38 -0000 1.20 @@ -16,3 +16,4 @@ cobbler-0.3.7.tar.gz cobbler-0.3.8.tar.gz cobbler-0.3.9.tar.gz +cobbler-0.4.0.tar.gz Index: cobbler.spec =================================================================== RCS file: /cvs/extras/rpms/cobbler/FC-6/cobbler.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- cobbler.spec 29 Jan 2007 19:03:39 -0000 1.20 +++ cobbler.spec 19 Feb 2007 19:17:38 -0000 1.21 @@ -2,8 +2,8 @@ Summary: Boot server configurator Name: cobbler -Version: 0.3.9 -Release: 2%{?dist} +Version: 0.4.0 +Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPL Group: Applications/System @@ -47,6 +47,7 @@ %post /sbin/chkconfig --add cobblersyslogd + %preun if [ $1 = 0 ]; then /sbin/service cobblersyslogd stop >/dev/null 2>&1 || : @@ -65,7 +66,19 @@ %defattr(-,apache,apache) %dir /var/log/cobbler %dir /var/log/cobbler/kicklog +%dir /var/www/cobbler/ +%dir /var/www/cobbler/localmirror +%dir /var/www/cobbler/kickstarts +%dir /var/www/cobbler/kickstarts_sys +%dir /var/www/cobbler/repo_mirror +%dir /var/www/cobbler/ks_mirror +%dir /var/www/cobbler/images +%dir /var/www/cobbler/distros +%dir /var/www/cobbler/profiles +%dir /var/www/cobbler/systems %defattr(-,root,root) +%dir /tftpboot/pxelinux.cfg +%dir /tftpboot/images %{_bindir}/cobbler %{_bindir}/cobbler_syslogd %dir /etc/cobbler @@ -74,12 +87,18 @@ %config(noreplace) /etc/cobbler/kickstart_fc6.ks %config(noreplace) /etc/cobbler/kickstart_fc6_domU.ks %config(noreplace) /etc/cobbler/dhcp.template -%config(noreplace) /etc/cobbler/default.pxe %config(noreplace) /etc/cobbler/rsync.exclude %dir %{python_sitelib}/cobbler %dir %{python_sitelib}/cobbler/yaml +%dir %{python_sitelib}/cobbler/Cheetah %{python_sitelib}/cobbler/*.py* %{python_sitelib}/cobbler/yaml/*.py* +%{python_sitelib}/cobbler/Cheetah/*.py* +%{python_sitelib}/cobbler/Cheetah/Macros/*.py* +%{python_sitelib}/cobbler/Cheetah/Templates/*.py* +%{python_sitelib}/cobbler/Cheetah/Tests/*.py* +%{python_sitelib}/cobbler/Cheetah/Tools/*.py* +%{python_sitelib}/cobbler/Cheetah/Utils/*.py* %{_mandir}/man1/cobbler.1.gz %dir /var/lib/cobbler /var/lib/cobbler/elilo-3.6-ia64.efi @@ -91,6 +110,11 @@ %changelog +* Mon Feb 19 2007 Michael DeHaan - 0.4.0-1 +- Upstream changes (see CHANGELOG) +- Cobbler RPM now owns various directories it uses versus creating them using commands. +- Bundling a copy of Cheetah for older distros + * Mon Jan 28 2007 Michael DeHaan - 0.3.9-1 - Changed init script pre/post code to match FC-E guidelines/example - Shortened RPM description Index: sources =================================================================== RCS file: /cvs/extras/rpms/cobbler/FC-6/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 29 Jan 2007 18:45:05 -0000 1.20 +++ sources 19 Feb 2007 19:17:38 -0000 1.21 @@ -1 +1 @@ -5c168ec21f853b422190eca65de0432f cobbler-0.3.9.tar.gz +2f3773f5572237647a17bfec45e2d22d cobbler-0.4.0.tar.gz From fedora-extras-commits at redhat.com Mon Feb 19 19:22:17 2007 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Mon, 19 Feb 2007 14:22:17 -0500 Subject: rpms/cobbler/devel cobbler.spec,1.19,1.20 Message-ID: <200702191922.l1JJMHkp024456@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24426 Modified Files: cobbler.spec Log Message: Release bump for CVS error to keep versions happy. No changes. Index: cobbler.spec =================================================================== RCS file: /cvs/extras/rpms/cobbler/devel/cobbler.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- cobbler.spec 19 Feb 2007 19:15:58 -0000 1.19 +++ cobbler.spec 19 Feb 2007 19:21:45 -0000 1.20 @@ -3,7 +3,7 @@ Summary: Boot server configurator Name: cobbler Version: 0.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Source0: %{name}-%{version}.tar.gz License: GPL Group: Applications/System From fedora-extras-commits at redhat.com Mon Feb 19 19:25:04 2007 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Mon, 19 Feb 2007 14:25:04 -0500 Subject: rpms/cobbler/FC-6 cobbler.spec,1.21,1.22 Message-ID: <200702191925.l1JJP4HF024645@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24626 Modified Files: cobbler.spec Log Message: Keep version numbers happy. Index: cobbler.spec =================================================================== RCS file: /cvs/extras/rpms/cobbler/FC-6/cobbler.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- cobbler.spec 19 Feb 2007 19:17:38 -0000 1.21 +++ cobbler.spec 19 Feb 2007 19:24:32 -0000 1.22 @@ -3,7 +3,7 @@ Summary: Boot server configurator Name: cobbler Version: 0.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Source0: %{name}-%{version}.tar.gz License: GPL Group: Applications/System From fedora-extras-commits at redhat.com Mon Feb 19 19:26:56 2007 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 19 Feb 2007 14:26:56 -0500 Subject: fedora-security/audit fe5,1.158,1.159 fe6,1.72,1.73 Message-ID: <200702191926.l1JJQud2024732@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24713 Modified Files: fe5 fe6 Log Message: Note new clamav, seamonkey issues. Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.158 retrieving revision 1.159 diff -u -r1.158 -r1.159 --- fe5 14 Feb 2007 21:54:02 -0000 1.158 +++ fe5 19 Feb 2007 19:26:53 -0000 1.159 @@ -5,6 +5,8 @@ CVE-2007-0903 version (ejabberd, fixed 1.1.3) CVE-2007-0902 ** (moin) #228764 CVE-2007-0901 ** (moin) #228764 +CVE-2007-0898 VULNERABLE (clamav, fixed 0.90) #229205 +CVE-2007-0897 VULNERABLE (clamav, fixed 0.90) #229205 CVE-2007-0894 ** (mediawiki, fixed 1.9.2) #228763 CVE-2007-0884 ignore (mimedefang 2.59/2.60 not shipped) #228757 CVE-2007-0857 version (moin, fixed 1.5.7) #228139 Index: fe6 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe6,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- fe6 14 Feb 2007 21:54:02 -0000 1.72 +++ fe6 19 Feb 2007 19:26:53 -0000 1.73 @@ -2,9 +2,12 @@ ** are items that need attention +CVE-2007-0981 VULNERABLE (seamonkey) #229253 CVE-2007-0903 version (ejabberd, fixed 1.1.3) CVE-2007-0902 ** (moin) #228764 CVE-2007-0901 ** (moin) #228764 +CVE-2007-0898 VULNERABLE (clamav, fixed 0.90) #229202 +CVE-2007-0897 VULNERABLE (clamav, fixed 0.90) #229202 CVE-2007-0894 ** (mediawiki, fixed 1.9.2) #228763 CVE-2007-0884 ignore (mimedefang 2.59/2.60 not shipped) #228757 CVE-2007-0857 version (moin, fixed 1.5.7) #228139 From fedora-extras-commits at redhat.com Mon Feb 19 19:27:37 2007 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Mon, 19 Feb 2007 14:27:37 -0500 Subject: rpms/cobbler/FC-5 .cvsignore, 1.14, 1.15 cobbler.spec, 1.14, 1.15 sources, 1.14, 1.15 Message-ID: <200702191927.l1JJRbVe024758@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24709 Modified Files: .cvsignore cobbler.spec sources Log Message: Upstream to 0.4.0 (see CHANGELOG) Go-go-gadget-build-system. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cobbler/FC-5/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 29 Jan 2007 18:47:06 -0000 1.14 +++ .cvsignore 19 Feb 2007 19:27:05 -0000 1.15 @@ -11,3 +11,4 @@ cobbler-0.3.7.tar.gz cobbler-0.3.8.tar.gz cobbler-0.3.9.tar.gz +cobbler-0.4.0.tar.gz Index: cobbler.spec =================================================================== RCS file: /cvs/extras/rpms/cobbler/FC-5/cobbler.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- cobbler.spec 29 Jan 2007 19:06:57 -0000 1.14 +++ cobbler.spec 19 Feb 2007 19:27:05 -0000 1.15 @@ -2,7 +2,7 @@ Summary: Boot server configurator Name: cobbler -Version: 0.3.9 +Version: 0.4.0 Release: 2%{?dist} Source0: %{name}-%{version}.tar.gz License: GPL @@ -47,6 +47,7 @@ %post /sbin/chkconfig --add cobblersyslogd + %preun if [ $1 = 0 ]; then /sbin/service cobblersyslogd stop >/dev/null 2>&1 || : @@ -65,7 +66,19 @@ %defattr(-,apache,apache) %dir /var/log/cobbler %dir /var/log/cobbler/kicklog +%dir /var/www/cobbler/ +%dir /var/www/cobbler/localmirror +%dir /var/www/cobbler/kickstarts +%dir /var/www/cobbler/kickstarts_sys +%dir /var/www/cobbler/repo_mirror +%dir /var/www/cobbler/ks_mirror +%dir /var/www/cobbler/images +%dir /var/www/cobbler/distros +%dir /var/www/cobbler/profiles +%dir /var/www/cobbler/systems %defattr(-,root,root) +%dir /tftpboot/pxelinux.cfg +%dir /tftpboot/images %{_bindir}/cobbler %{_bindir}/cobbler_syslogd %dir /etc/cobbler @@ -74,12 +87,18 @@ %config(noreplace) /etc/cobbler/kickstart_fc6.ks %config(noreplace) /etc/cobbler/kickstart_fc6_domU.ks %config(noreplace) /etc/cobbler/dhcp.template -%config(noreplace) /etc/cobbler/default.pxe %config(noreplace) /etc/cobbler/rsync.exclude %dir %{python_sitelib}/cobbler %dir %{python_sitelib}/cobbler/yaml +%dir %{python_sitelib}/cobbler/Cheetah %{python_sitelib}/cobbler/*.py* %{python_sitelib}/cobbler/yaml/*.py* +%{python_sitelib}/cobbler/Cheetah/*.py* +%{python_sitelib}/cobbler/Cheetah/Macros/*.py* +%{python_sitelib}/cobbler/Cheetah/Templates/*.py* +%{python_sitelib}/cobbler/Cheetah/Tests/*.py* +%{python_sitelib}/cobbler/Cheetah/Tools/*.py* +%{python_sitelib}/cobbler/Cheetah/Utils/*.py* %{_mandir}/man1/cobbler.1.gz %dir /var/lib/cobbler /var/lib/cobbler/elilo-3.6-ia64.efi @@ -91,6 +110,11 @@ %changelog +* Mon Feb 19 2007 Michael DeHaan - 0.4.0-1 +- Upstream changes (see CHANGELOG) +- Cobbler RPM now owns various directories it uses versus creating them using commands. +- Bundling a copy of Cheetah for older distros + * Mon Jan 28 2007 Michael DeHaan - 0.3.9-1 - Changed init script pre/post code to match FC-E guidelines/example - Shortened RPM description Index: sources =================================================================== RCS file: /cvs/extras/rpms/cobbler/FC-5/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 29 Jan 2007 18:47:06 -0000 1.14 +++ sources 19 Feb 2007 19:27:05 -0000 1.15 @@ -1 +1 @@ -5c168ec21f853b422190eca65de0432f cobbler-0.3.9.tar.gz +2f3773f5572237647a17bfec45e2d22d cobbler-0.4.0.tar.gz From fedora-extras-commits at redhat.com Mon Feb 19 19:52:10 2007 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Mon, 19 Feb 2007 14:52:10 -0500 Subject: comps comps-fe7.xml.in,1.103,1.104 Message-ID: <200702191952.l1JJqApX025133@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25110 Modified Files: comps-fe7.xml.in Log Message: added smolt Index: comps-fe7.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe7.xml.in,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- comps-fe7.xml.in 17 Feb 2007 07:43:57 -0000 1.103 +++ comps-fe7.xml.in 19 Feb 2007 19:51:40 -0000 1.104 @@ -913,6 +913,16 @@ + smolt + <_name>Hardware Reporting Tools + <_description>This group is a collection of tools that may be used to send hardware and operating system info to The Fedora Project for analysis. + true + true + + smolt-firstboot + + + sound-and-video <_name>Sound and Video <_description>From CD recording to playing audio CDs and multimedia files, this package group allows you to work with sound and video on the system. From fedora-extras-commits at redhat.com Mon Feb 19 19:58:01 2007 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Mon, 19 Feb 2007 14:58:01 -0500 Subject: rpms/amarok/FC-6 amarok.spec,1.73,1.74 Message-ID: <200702191958.l1JJw1vT025213@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25181/FC-6 Modified Files: amarok.spec Log Message: bug 229131 Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-6/amarok.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- amarok.spec 15 Feb 2007 06:21:26 -0000 1.73 +++ amarok.spec 19 Feb 2007 19:57:29 -0000 1.74 @@ -4,7 +4,7 @@ Name: amarok Summary: Media player for KDE Version: 1.4.5 -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/Multimedia License: GPL @@ -69,8 +69,8 @@ Summary: Visualisation plugins for Amarok Group: Applications/Multimedia Requires: %{name} = %{version} -# RPM CVS supports "Suggests": -#Requires(hint): libvisual-plugins +# No plugins by default, we need libvisual-plugins +Requires: libvisual-plugins %description visualisation Amarok can use visualisation plugins from different origins. @@ -235,6 +235,9 @@ %changelog +* Mon Feb 19 2007 Aurelien Bompard 1.4.5-4 +- have the visualisation subpackage require libvisual-plugins (bug 229131) + * Thu Feb 15 2007 Aurelien Bompard 1.4.5-3 - fix patch (provided by upstream) From fedora-extras-commits at redhat.com Mon Feb 19 19:58:04 2007 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Mon, 19 Feb 2007 14:58:04 -0500 Subject: rpms/amarok/devel amarok.spec,1.75,1.76 Message-ID: <200702191958.l1JJw4qK025218@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25181/devel Modified Files: amarok.spec Log Message: bug 229131 Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- amarok.spec 15 Feb 2007 06:21:29 -0000 1.75 +++ amarok.spec 19 Feb 2007 19:57:31 -0000 1.76 @@ -4,7 +4,7 @@ Name: amarok Summary: Media player for KDE Version: 1.4.5 -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/Multimedia License: GPL @@ -69,8 +69,8 @@ Summary: Visualisation plugins for Amarok Group: Applications/Multimedia Requires: %{name} = %{version} -# RPM CVS supports "Suggests": -#Requires(hint): libvisual-plugins +# No plugins by default, we need libvisual-plugins +Requires: libvisual-plugins %description visualisation Amarok can use visualisation plugins from different origins. @@ -235,6 +235,9 @@ %changelog +* Mon Feb 19 2007 Aurelien Bompard 1.4.5-4 +- have the visualisation subpackage require libvisual-plugins (bug 229131) + * Thu Feb 15 2007 Aurelien Bompard 1.4.5-3 - fix patch (provided by upstream) From fedora-extras-commits at redhat.com Mon Feb 19 19:58:36 2007 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Mon, 19 Feb 2007 14:58:36 -0500 Subject: comps comps-fe7.xml.in,1.104,1.105 Message-ID: <200702191958.l1JJwaMY025314@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25222 Modified Files: comps-fe7.xml.in Log Message: Moved smolt to some place more appropriate. Index: comps-fe7.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe7.xml.in,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- comps-fe7.xml.in 19 Feb 2007 19:51:40 -0000 1.104 +++ comps-fe7.xml.in 19 Feb 2007 19:58:06 -0000 1.105 @@ -91,6 +91,7 @@ rss-glx rss-glx-xscreensaver rxvt + smolt workrave xdaliclock xkeycaps @@ -913,16 +914,6 @@ - smolt - <_name>Hardware Reporting Tools - <_description>This group is a collection of tools that may be used to send hardware and operating system info to The Fedora Project for analysis. - true - true - - smolt-firstboot - - - sound-and-video <_name>Sound and Video <_description>From CD recording to playing audio CDs and multimedia files, this package group allows you to work with sound and video on the system. From fedora-extras-commits at redhat.com Mon Feb 19 20:15:15 2007 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Mon, 19 Feb 2007 15:15:15 -0500 Subject: rpms/bcfg2/devel .cvsignore, 1.2, 1.3 bcfg2.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200702192015.l1JKFFI4028978@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/bcfg2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28943 Modified Files: .cvsignore bcfg2.spec sources Log Message: Update to 0.9.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bcfg2/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Feb 2007 20:02:23 -0000 1.2 +++ .cvsignore 19 Feb 2007 20:14:43 -0000 1.3 @@ -1 +1 @@ -bcfg2-0.9.1d.tar.gz +bcfg2-0.9.2.tar.gz Index: bcfg2.spec =================================================================== RCS file: /cvs/extras/rpms/bcfg2/devel/bcfg2.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- bcfg2.spec 8 Feb 2007 20:02:23 -0000 1.2 +++ bcfg2.spec 19 Feb 2007 20:14:43 -0000 1.3 @@ -1,16 +1,14 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%define subversion d - Name: bcfg2 -Version: 0.9.1 -Release: 1%{?subversion:.%{subversion}}%{?dist} +Version: 0.9.2 +Release: 1%{?dist} Summary: Configuration management system Group: Applications/System License: BSD URL: http://trac.mcs.anl.gov/projects/bcfg2 -Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-%{version}%{?subversion}.tar.gz +Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-%{version}.tar.gz Patch0: bcfg2-serverinitsubsys.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -66,7 +64,7 @@ Configuration management server %prep -%setup -q -n %{name}-%{version}%{?subversion} +%setup -q %patch0 -p0 -b .serverinitsubsys # fixup some paths @@ -197,6 +195,9 @@ %dir %{_var}/lib/bcfg2 %changelog +* Mon Feb 19 2007 Jeffrey C. Ollie - 0.9.2-1 +- Update to 0.9.2 + * Thu Feb 8 2007 Jeffrey C. Ollie - 0.9.1-1.d - Update to 0.9.1d Index: sources =================================================================== RCS file: /cvs/extras/rpms/bcfg2/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Feb 2007 20:02:23 -0000 1.2 +++ sources 19 Feb 2007 20:14:43 -0000 1.3 @@ -1 +1 @@ -7134b1947f258cda84182c8dfe080bda bcfg2-0.9.1d.tar.gz +ff8b06a815ac9f31308f95c4ccced3c8 bcfg2-0.9.2.tar.gz From fedora-extras-commits at redhat.com Mon Feb 19 20:18:19 2007 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Mon, 19 Feb 2007 15:18:19 -0500 Subject: rpms/bcfg2/FC-6 .cvsignore, 1.2, 1.3 bcfg2.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200702192018.l1JKIJSa029054@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/bcfg2/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29029 Modified Files: .cvsignore bcfg2.spec sources Log Message: Update to 0.9.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bcfg2/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Feb 2007 20:02:23 -0000 1.2 +++ .cvsignore 19 Feb 2007 20:17:46 -0000 1.3 @@ -1 +1 @@ -bcfg2-0.9.1d.tar.gz +bcfg2-0.9.2.tar.gz Index: bcfg2.spec =================================================================== RCS file: /cvs/extras/rpms/bcfg2/FC-6/bcfg2.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- bcfg2.spec 8 Feb 2007 20:02:23 -0000 1.2 +++ bcfg2.spec 19 Feb 2007 20:17:46 -0000 1.3 @@ -1,16 +1,14 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%define subversion d - Name: bcfg2 -Version: 0.9.1 -Release: 1%{?subversion:.%{subversion}}%{?dist} +Version: 0.9.2 +Release: 1%{?dist} Summary: Configuration management system Group: Applications/System License: BSD URL: http://trac.mcs.anl.gov/projects/bcfg2 -Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-%{version}%{?subversion}.tar.gz +Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-%{version}.tar.gz Patch0: bcfg2-serverinitsubsys.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -66,7 +64,7 @@ Configuration management server %prep -%setup -q -n %{name}-%{version}%{?subversion} +%setup -q %patch0 -p0 -b .serverinitsubsys # fixup some paths @@ -197,6 +195,9 @@ %dir %{_var}/lib/bcfg2 %changelog +* Mon Feb 19 2007 Jeffrey C. Ollie - 0.9.2-1 +- Update to 0.9.2 + * Thu Feb 8 2007 Jeffrey C. Ollie - 0.9.1-1.d - Update to 0.9.1d Index: sources =================================================================== RCS file: /cvs/extras/rpms/bcfg2/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Feb 2007 20:02:23 -0000 1.2 +++ sources 19 Feb 2007 20:17:46 -0000 1.3 @@ -1 +1 @@ -7134b1947f258cda84182c8dfe080bda bcfg2-0.9.1d.tar.gz +ff8b06a815ac9f31308f95c4ccced3c8 bcfg2-0.9.2.tar.gz From fedora-extras-commits at redhat.com Mon Feb 19 20:31:33 2007 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Mon, 19 Feb 2007 15:31:33 -0500 Subject: rpms/dircproxy/EL-5 dircproxy-1.2.0-beta.tar.bz,1.1,NONE Message-ID: <200702192031.l1JKVXUC029268@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/dircproxy/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29261 Removed Files: dircproxy-1.2.0-beta.tar.bz Log Message: that shouldn't be in here... --- dircproxy-1.2.0-beta.tar.bz DELETED --- From fedora-extras-commits at redhat.com Mon Feb 19 20:45:24 2007 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Mon, 19 Feb 2007 15:45:24 -0500 Subject: fedora-security/audit fe5,1.159,1.160 fe6,1.73,1.74 Message-ID: <200702192045.l1JKjOVF029780@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29727/audit Modified Files: fe5 fe6 Log Message: CVE-2006-5276 (snort) #229265 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.159 retrieving revision 1.160 diff -u -r1.159 -r1.160 --- fe5 19 Feb 2007 19:26:53 -0000 1.159 +++ fe5 19 Feb 2007 20:45:22 -0000 1.160 @@ -83,6 +83,7 @@ CVE-2006-5454 patch (bugzilla, fixed 2.22-7) #212355 CVE-2006-5453 patch (bugzilla, fixed 2.22-7) #212355 CVE-2006-5295 version (clamav, fixed 0.88.5) #210973 +CVE-2006-5276 VULNERABLE (snort) #229265 CVE-2006-5129 version (moodle, fixed 1.6.3) #206516 CVE-2006-5111 version (libksba, fixed 0.9.14) CVE-2006-4976 ** (php-adodb) #208299 Index: fe6 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe6,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- fe6 19 Feb 2007 19:26:53 -0000 1.73 +++ fe6 19 Feb 2007 20:45:22 -0000 1.74 @@ -85,6 +85,7 @@ CVE-2006-5454 patch (bugzilla, fixed 2.22-7) #212355 CVE-2006-5453 patch (bugzilla, fixed 2.22-7) #212355 CVE-2006-5295 version (clamav, fixed 0.88.5) #210973 +CVE-2006-5276 VULNERABLE (snort) #229265 CVE-2006-5129 version (moodle, fixed 1.6.3) #206516 CVE-2006-5111 version (libksba, fixed 0.9.14) CVE-2006-4976 ** (php-adodb) #208299 From fedora-extras-commits at redhat.com Mon Feb 19 20:56:06 2007 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Mon, 19 Feb 2007 15:56:06 -0500 Subject: rpms/eblook - New directory Message-ID: <200702192056.l1JKu6xC029955@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/eblook In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/bin/tmpcvsl29929/rpms/eblook Log Message: Directory /cvs/extras/rpms/eblook added to the repository From fedora-extras-commits at redhat.com Mon Feb 19 20:56:13 2007 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Mon, 19 Feb 2007 15:56:13 -0500 Subject: rpms/eblook/devel - New directory Message-ID: <200702192056.l1JKuDgc029968@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/eblook/devel In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/bin/tmpcvsl29929/rpms/eblook/devel Log Message: Directory /cvs/extras/rpms/eblook/devel added to the repository From fedora-extras-commits at redhat.com Mon Feb 19 20:56:21 2007 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Mon, 19 Feb 2007 15:56:21 -0500 Subject: rpms/eblook Makefile,NONE,1.1 import.log,NONE,1.1 pkg.acl,NONE,1.1 Message-ID: <200702192056.l1JKuLrI029994@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/eblook In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/bin/tmpcvsl29929/rpms/eblook Added Files: Makefile import.log pkg.acl Log Message: Setup of module eblook --- NEW FILE Makefile --- # Top level Makefile for module eblook all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Mon Feb 19 20:56:28 2007 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Mon, 19 Feb 2007 15:56:28 -0500 Subject: rpms/eblook/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702192056.l1JKuS8H030043@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/eblook/devel In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/bin/tmpcvsl29929/rpms/eblook/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module eblook --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: eblook # $Id: Makefile,v 1.1 2007/02/19 20:56:26 wtogami Exp $ NAME := eblook SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Feb 19 20:59:47 2007 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Mon, 19 Feb 2007 15:59:47 -0500 Subject: rpms/amarokFS - New directory Message-ID: <200702192059.l1JKxljQ030335@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/amarokFS In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/bin/tmpcvsi30309/rpms/amarokFS Log Message: Directory /cvs/extras/rpms/amarokFS added to the repository From fedora-extras-commits at redhat.com Mon Feb 19 20:59:50 2007 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Mon, 19 Feb 2007 15:59:50 -0500 Subject: rpms/amarokFS/devel - New directory Message-ID: <200702192059.l1JKxoV6030346@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/amarokFS/devel In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/bin/tmpcvsi30309/rpms/amarokFS/devel Log Message: Directory /cvs/extras/rpms/amarokFS/devel added to the repository From fedora-extras-commits at redhat.com Mon Feb 19 21:00:00 2007 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Mon, 19 Feb 2007 16:00:00 -0500 Subject: rpms/amarokFS/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200702192100.l1JL00vm030391@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/amarokFS/devel In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/bin/tmpcvsi30309/rpms/amarokFS/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module amarokFS --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: amarokFS # $Id: Makefile,v 1.1 2007/02/19 20:59:58 wtogami Exp $ NAME := amarokFS SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Feb 19 20:59:58 2007 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Mon, 19 Feb 2007 15:59:58 -0500 Subject: rpms/amarokFS Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1 Message-ID: <200702192059.l1JKxwfB030374@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/amarokFS In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/bin/tmpcvsi30309/rpms/amarokFS Added Files: Makefile import.log pkg.acl Log Message: Setup of module amarokFS --- NEW FILE Makefile --- # Top level Makefile for module amarokFS all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl --- From fedora-extras-commits at redhat.com Mon Feb 19 21:16:36 2007 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Mon, 19 Feb 2007 16:16:36 -0500 Subject: rpms/smolt/FC-5 smolt.spec,1.11,1.12 sources,1.7,1.8 Message-ID: <200702192116.l1JLGag0001816@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/smolt/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1764/FC-5 Modified Files: smolt.spec sources Log Message: upstream released new version Index: smolt.spec =================================================================== RCS file: /cvs/extras/rpms/smolt/FC-5/smolt.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- smolt.spec 12 Feb 2007 23:22:06 -0000 1.11 +++ smolt.spec 19 Feb 2007 21:16:04 -0000 1.12 @@ -1,6 +1,6 @@ Name: smolt Summary: Fedora hardware profiler -Version: 0.8 +Version: 0.9 Release: 1%{?dist} License: GPL Group: Applications/Internet @@ -69,6 +69,7 @@ touch %{buildroot}/%{_sysconfdir}/sysconfig/hw-uuid ln -s %{_datadir}/%{name}/client/sendProfile.py %{buildroot}/%{_bindir}/smoltSendProfile +ln -s %{_datadir}/%{name}/client/deleteProfile.py %{buildroot}/%{_bindir}/smoltDeleteProfile %{__chmod} +x %{buildroot}/%{_datadir}/%{name}/client/sendProfile.py %clean @@ -84,7 +85,7 @@ %files %defattr(-,root,root,-) -%doc README GPL +%doc README GPL doc/* %dir %{_datadir}/%{name} %{_datadir}/%{name}/client %{_bindir}/%{name}* @@ -99,6 +100,9 @@ %{_datadir}/firstboot/modules/smolt.py* %changelog +* Mon Feb 19 2007 Mike McGrath 0.9-1 +- Upstream released new version + * Mon Feb 12 2007 Mike McGrath 0.8-1 - New version released, major changes in both server and client Index: sources =================================================================== RCS file: /cvs/extras/rpms/smolt/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 12 Feb 2007 23:22:06 -0000 1.7 +++ sources 19 Feb 2007 21:16:04 -0000 1.8 @@ -1 +1 @@ -76df28c0d21418665e12d275198af5d8 smolt-0.8.tar.gz +190a69f303c52ad6dbab553bd6f42f80 smolt-0.9.tar.gz From fedora-extras-commits at redhat.com Mon Feb 19 21:16:41 2007 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Mon, 19 Feb 2007 16:16:41 -0500 Subject: rpms/smolt/devel .cvsignore, 1.6, 1.7 smolt.spec, 1.11, 1.12 sources, 1.7, 1.8 Message-ID: <200702192116.l1JLGfEj001825@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/smolt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1764/devel Modified Files: .cvsignore smolt.spec sources Log Message: upstream released new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/smolt/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 12 Feb 2007 23:22:06 -0000 1.6 +++ .cvsignore 19 Feb 2007 21:16:09 -0000 1.7 @@ -1 +1 @@ -smolt-0.8.tar.gz +smolt-0.9.tar.gz Index: smolt.spec =================================================================== RCS file: /cvs/extras/rpms/smolt/devel/smolt.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- smolt.spec 12 Feb 2007 23:22:06 -0000 1.11 +++ smolt.spec 19 Feb 2007 21:16:09 -0000 1.12 @@ -1,6 +1,6 @@ Name: smolt Summary: Fedora hardware profiler -Version: 0.8 +Version: 0.9 Release: 1%{?dist} License: GPL Group: Applications/Internet @@ -69,6 +69,7 @@ touch %{buildroot}/%{_sysconfdir}/sysconfig/hw-uuid ln -s %{_datadir}/%{name}/client/sendProfile.py %{buildroot}/%{_bindir}/smoltSendProfile +ln -s %{_datadir}/%{name}/client/deleteProfile.py %{buildroot}/%{_bindir}/smoltDeleteProfile %{__chmod} +x %{buildroot}/%{_datadir}/%{name}/client/sendProfile.py %clean @@ -84,7 +85,7 @@ %files %defattr(-,root,root,-) -%doc README GPL +%doc README GPL doc/* %dir %{_datadir}/%{name} %{_datadir}/%{name}/client %{_bindir}/%{name}* @@ -99,6 +100,9 @@ %{_datadir}/firstboot/modules/smolt.py* %changelog +* Mon Feb 19 2007 Mike McGrath 0.9-1 +- Upstream released new version + * Mon Feb 12 2007 Mike McGrath 0.8-1 - New version released, major changes in both server and client Index: sources =================================================================== RCS file: /cvs/extras/rpms/smolt/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 12 Feb 2007 23:22:06 -0000 1.7 +++ sources 19 Feb 2007 21:16:09 -0000 1.8 @@ -1 +1 @@ -76df28c0d21418665e12d275198af5d8 smolt-0.8.tar.gz +190a69f303c52ad6dbab553bd6f42f80 smolt-0.9.tar.gz From fedora-extras-commits at redhat.com Mon Feb 19 21:16:39 2007 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Mon, 19 Feb 2007 16:16:39 -0500 Subject: rpms/smolt/FC-6 smolt.spec,1.11,1.12 sources,1.7,1.8 Message-ID: <200702192116.l1JLGdpT001820@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/smolt/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1764/FC-6 Modified Files: smolt.spec sources Log Message: upstream released new version Index: smolt.spec =================================================================== RCS file: /cvs/extras/rpms/smolt/FC-6/smolt.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- smolt.spec 12 Feb 2007 23:22:03 -0000 1.11 +++ smolt.spec 19 Feb 2007 21:16:06 -0000 1.12 @@ -1,6 +1,6 @@ Name: smolt Summary: Fedora hardware profiler -Version: 0.8 +Version: 0.9 Release: 1%{?dist} License: GPL Group: Applications/Internet @@ -69,6 +69,7 @@ touch %{buildroot}/%{_sysconfdir}/sysconfig/hw-uuid ln -s %{_datadir}/%{name}/client/sendProfile.py %{buildroot}/%{_bindir}/smoltSendProfile +ln -s %{_datadir}/%{name}/client/deleteProfile.py %{buildroot}/%{_bindir}/smoltDeleteProfile %{__chmod} +x %{buildroot}/%{_datadir}/%{name}/client/sendProfile.py %clean @@ -84,7 +85,7 @@ %files %defattr(-,root,root,-) -%doc README GPL +%doc README GPL doc/* %dir %{_datadir}/%{name} %{_datadir}/%{name}/client %{_bindir}/%{name}* @@ -99,6 +100,9 @@ %{_datadir}/firstboot/modules/smolt.py* %changelog +* Mon Feb 19 2007 Mike McGrath 0.9-1 +- Upstream released new version + * Mon Feb 12 2007 Mike McGrath 0.8-1 - New version released, major changes in both server and client Index: sources =================================================================== RCS file: /cvs/extras/rpms/smolt/FC-6/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 12 Feb 2007 23:22:03 -0000 1.7 +++ sources 19 Feb 2007 21:16:06 -0000 1.8 @@ -1 +1 @@ -76df28c0d21418665e12d275198af5d8 smolt-0.8.tar.gz +190a69f303c52ad6dbab553bd6f42f80 smolt-0.9.tar.gz From fedora-extras-commits at redhat.com Mon Feb 19 21:20:42 2007 From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp)) Date: Mon, 19 Feb 2007 16:20:42 -0500 Subject: rpms/amarokFS import.log,1.1,1.2 Message-ID: <200702192120.l1JLKgal002127@cvs-int.fedora.redhat.com> Author: faucamp Update of /cvs/extras/rpms/amarokFS In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2073 Modified Files: import.log Log Message: auto-import amarokFS-0.4.2-4 on branch devel from amarokFS-0.4.2-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/amarokFS/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 19 Feb 2007 20:59:56 -0000 1.1 +++ import.log 19 Feb 2007 21:20:10 -0000 1.2 @@ -0,0 +1 @@ +amarokFS-0_4_2-4:HEAD:amarokFS-0.4.2-4.src.rpm:1171920342 From fedora-extras-commits at redhat.com Mon Feb 19 21:20:45 2007 From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp)) Date: Mon, 19 Feb 2007 16:20:45 -0500 Subject: rpms/amarokFS/devel amarokFS-0.4.2-config_dialog_layout.patch, NONE, 1.1 amarokFS-0.4.2-fedora_paths.patch, NONE, 1.1 amarokFS-0.4.2-large_cover_images.patch, NONE, 1.1 amarokFS-0.4.2-start_amarok.patch, NONE, 1.1 amarokFS-0.4.2-theme_howto.patch, NONE, 1.1 amarokFS-0.4.2-theme_prev_button.patch, NONE, 1.1 amarokFS.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200702192120.l1JLKjBI002133@cvs-int.fedora.redhat.com> Author: faucamp Update of /cvs/extras/rpms/amarokFS/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2073/devel Modified Files: .cvsignore sources Added Files: amarokFS-0.4.2-config_dialog_layout.patch amarokFS-0.4.2-fedora_paths.patch amarokFS-0.4.2-large_cover_images.patch amarokFS-0.4.2-start_amarok.patch amarokFS-0.4.2-theme_howto.patch amarokFS-0.4.2-theme_prev_button.patch amarokFS.spec Log Message: auto-import amarokFS-0.4.2-4 on branch devel from amarokFS-0.4.2-4.src.rpm amarokFS-0.4.2-config_dialog_layout.patch: --- NEW FILE amarokFS-0.4.2-config_dialog_layout.patch --- diff -uNr amarokFS-qt3-0.4.2/amarokfs_config.cpp amarokFS-qt3-0.4.2-mod/amarokfs_config.cpp --- amarokFS-qt3-0.4.2/amarokfs_config.cpp 2007-02-09 17:25:17.000000000 +0200 +++ amarokFS-qt3-0.4.2-mod/amarokfs_config.cpp 2007-02-11 17:12:31.000000000 +0200 @@ -48,32 +48,46 @@ setCaption("amarokFS Config" ); + QVBoxLayout *configLayout = new QVBoxLayout( this, 11, 6, "configLayout" ); + + QHBoxLayout *themeLayout = new QHBoxLayout( 0, 0, 6, "themeLayout" ); textLabel1 = new QLabel( this, "textLabel1" ); textLabel1->setGeometry( QRect( 10, 10, 50, 20 ) ); textLabel1->setText( "Theme:" ); + themeLayout->addWidget(textLabel1); kURLRequester1 = new KURLRequester( this, "kURLRequester1" ); kURLRequester1->setGeometry( QRect( 60, 0, 311, 41 ) ); kURLRequester1->setFilter( "*.xml|xml Theme Files" ); - + themeLayout->addWidget( kURLRequester1 ); + configLayout->addLayout(themeLayout); + disScrSvr = new QCheckBox(this, "disScrSvr"); disScrSvr->setText("Disable screen saver"); disScrSvr->setGeometry( QRect(10, 40, 250, 20) ); - + configLayout->addWidget( disScrSvr ); + textLabel2 = new QLabel( this, "textLabel2" ); textLabel2->setGeometry( QRect( 10, 70, 371, 20 ) ); textLabel2->setText("New settings will be applied after restarting the application." ) ; - + configLayout->addWidget( textLabel2 ); + + QHBoxLayout *buttonLayout = new QHBoxLayout( 0, 0, 6, "buttonLayout" ); + QSpacerItem *buttonSpacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + buttonLayout->addItem( buttonSpacer ); + + okButton = new QPushButton( this, "ok" ); okButton->setGeometry( QRect( 211, 90, 80, 30 ) ); okButton->setText( "OK" ); + buttonLayout->addWidget( okButton ); cancelButton = new QPushButton( this, "cancel" ); cancelButton->setGeometry( QRect( 300, 90, 80, 30 ) ); cancelButton->setText( "Cancel" ); - - resize( QSize(390, 130).expandedTo(minimumSizeHint()) ); - - + buttonLayout->addWidget( cancelButton ); + configLayout->addLayout( buttonLayout ); + + kapp->config()->setGroup ("Theme"); themeKUrl = kapp->config()->readEntry ("KUrl", ""); //cout << themeKUrl << "\n"; amarokFS-0.4.2-fedora_paths.patch: --- NEW FILE amarokFS-0.4.2-fedora_paths.patch --- diff -uNr amarokFS-qt3-0.4.2/amarokFS-xml.pro amarokFS-qt3-0.4.2-mod/amarokFS-xml.pro --- amarokFS-qt3-0.4.2/amarokFS-xml.pro 2007-02-08 01:24:13.000000000 +0200 +++ amarokFS-qt3-0.4.2-mod/amarokFS-xml.pro 2007-02-13 15:45:05.000000000 +0200 @@ -4,12 +4,7 @@ CONFIG += qt warn_on release INCLUDEPATH += /usr/include/kde -INCLUDEPATH += /usr/local/include/kde INCLUDEPATH += /usr/include -INCLUDEPATH += /opt/kde3/include -INCLUDEPATH += /opt/kde/include -INCLUDEPATH += /usr/kde/3.5/include - HEADERS = amfs-xml.h \ cb.h \ @@ -23,36 +18,22 @@ amarokfs_config.cpp LIBS += -lkdecore -LIBS += -L/opt/kde3/lib -LIBS += -L/usr/local/kde3/lib -LIBS += -L/usr/lib/qt3 -LIBS += -L/opt/kde/lib -LIBS += -L/usr/kde/3.5/lib +LIBS += -L/usr/lib/kde3 LIBS += -lkio -images.path = /usr/local/share/amarokFS/images +images.path = /usr/share/amarokFS/images images.files = images/* -defaultTheme.path = /usr/local/share/amarokFS +defaultTheme.path = /usr/share/amarokFS defaultTheme.files = theme.xml -target.path = /usr/local/bin +target.path = /usr/bin icon.files = amarokFS.png -icon.path = /usr/share/icons/ - -desktop.files = amarokFS.desktop -desktop.path = /usr/share/applications/ +icon.path = /usr/share/icons/hicolor/128x128/apps -docs.files = README -docs.files += theme-howto.txt -docs.path = /usr/share/doc/amarokFS - - INSTALLS += target INSTALLS += images -INSTALLS += desktop INSTALLS += icon INSTALLS += defaultTheme -INSTALLS += docs diff -uNr amarokFS-qt3-0.4.2/amfs-xml.cpp amarokFS-qt3-0.4.2-mod/amfs-xml.cpp --- amarokFS-qt3-0.4.2/amfs-xml.cpp 2007-02-08 14:56:33.000000000 +0200 +++ amarokFS-qt3-0.4.2-mod/amfs-xml.cpp 2007-02-13 09:42:18.000000000 +0200 @@ -40,9 +40,9 @@ //cout << themeCustomPrepath << "\n"; //set the default path - QString themePath = "/usr/local/share/amarokFS/theme.xml"; + QString themePath = "/usr/share/amarokFS/theme.xml"; //default prepath for the images directory - QString themeImagesPrePath = "/usr/local/share/amarokFS/"; + QString themeImagesPrePath = "/usr/share/amarokFS/"; //if the custom theme file exists, use it, otherwise use the default theme if(QFile(themeCustomPath).exists()) { @@ -470,7 +470,7 @@ reflectionPixmap = cdReflected; QImage gradientImage; - gradientImage.load( "/usr/local/share/amarokFS/images/gradient.png"); + gradientImage.load( "/usr/share/amarokFS/images/gradient.png"); gradientImage = gradientImage.scale(reflectionPixmap.width(), 120); gradientPixmap = gradientImage; gradient->setPixmap(gradientPixmap); @@ -511,8 +511,8 @@ result.load(coverPathDCOPtagcover); } if (result.isNull()) { - if(transDef == TRUE) result.load("/usr/local/share/amarokFS/images/logoB.png"); - else result.load("/usr/local/share/amarokFS/images/logo.png"); + if(transDef == TRUE) result.load("/usr/share/amarokFS/images/logoB.png"); + else result.load("/usr/share/amarokFS/images/logo.png"); } return result; diff -uNr amarokFS-qt3-0.4.2/README amarokFS-qt3-0.4.2-mod/README --- amarokFS-qt3-0.4.2/README 2007-02-08 15:26:37.000000000 +0200 +++ amarokFS-qt3-0.4.2-mod/README 2007-02-13 09:43:06.000000000 +0200 @@ -10,14 +10,14 @@ If the compile proces fails, try running "qmake" first and then "make". For installation run "make install" (requires root priviliges) - Executable is installed into /usr/local/bin, - default theme + its images into /usr/local/share/amarokFS, - icon into /usr/share/icons + Executable is installed into /usr/bin, + default theme + its images into /usr/share/amarokFS, + icon into /usr/share/icons/hicolor/128x128/apps and the .desktop file into /usr/share/applications THEMES: The theme can be chosen by the button in the upper left corner (which hides automaticaly). - If no theme is selected (or the selected theme is not readable) the default theme is used (/usr/local/share/amarokFS/theme.xml). + If no theme is selected (or the selected theme is not readable) the default theme is used (/usr/share/amarokFS/theme.xml). If you want to write your own skins please read the instructions in theme-howto.txt. amarokFS-0.4.2-large_cover_images.patch: --- NEW FILE amarokFS-0.4.2-large_cover_images.patch --- diff -uNr amarokFS-qt3-0.4.2/amfs-xml.cpp amarokFS-qt3-0.4.2-mod/amfs-xml.cpp --- amarokFS-qt3-0.4.2/amfs-xml.cpp 2007-02-11 17:19:12.000000000 +0200 +++ amarokFS-qt3-0.4.2-mod/amfs-xml.cpp 2007-02-11 17:53:23.000000000 +0200 @@ -13,6 +13,7 @@ #include #include #include +#include using namespace std; @@ -493,7 +494,7 @@ //path from dcop (only 100x100px image) QString coverPathDCOP = getDCOPDataText("coverImage()"); //$HOME/.kde/share/apps/amarok/albumcovers/large/.... - some covers are stored here - QString coverPathDCOPlarge = coverPathDCOP.replace("cache/100@", "large/"); + QString coverPathDCOPlarge = coverPathDCOP.replace(QRegExp("cache/[\\d]+@"), "large/"); //$HOME/.kde/share/apps/amarok/albumcovers/tagcover/.... - and some are stored here QString coverPathDCOPtagcover = coverPathDCOP.replace("large/", "tagcover/"); amarokFS-0.4.2-start_amarok.patch: --- NEW FILE amarokFS-0.4.2-start_amarok.patch --- diff -uNr amarokFS-qt3-0.4.2/amfs-xml.cpp amarokFS-qt3-0.4.2-mod/amfs-xml.cpp --- amarokFS-qt3-0.4.2/amfs-xml.cpp 2007-02-11 18:57:18.000000000 +0200 +++ amarokFS-qt3-0.4.2-mod/amfs-xml.cpp 2007-02-11 22:06:06.000000000 +0200 @@ -14,6 +14,7 @@ #include #include #include +#include using namespace std; @@ -21,7 +22,7 @@ AmfsXML::AmfsXML( QWidget* parent, const char* name, WFlags fl ) : QWidget( parent, name, fl ) { - + startedAmarok = false; progressBar = (QProgressBar *) 0; cdcover = (QLabel *) 0; gradient = (QLabel *) 0; @@ -339,6 +340,20 @@ connect( setupButton, SIGNAL(clicked()), this, SLOT(launchConfig()) ); + //start Amarok (if necessary) + if (!dcopClient->isApplicationRegistered("amarok")) { + QProcess *amarokProc = new QProcess(QString("amarok")); + if (!amarokProc->launch(QString::null)) { + qDebug("error starting Amarok."); + } else { + while (!dcopClient->isApplicationRegistered("amarok")) + qApp->processEvents(); + usleep(100); + startedAmarok = true; + } + delete amarokProc; + } + setMouseTracking(TRUE); nowPlaying = ""; @@ -362,6 +377,11 @@ { //restore the screen saver if it was disabled if(isSetDisScrSvr) restoreScreenSaver(); + //stop Amarok (if it was started by AmarokFS) + if (startedAmarok) { + if (!dcopClient->send("amarok", "MainApplication-Interface", "quit()", (QByteArray) 0)) + qDebug("there was some error using DCOP."); + } ce->accept(); return; } diff -uNr amarokFS-qt3-0.4.2/amfs-xml.h amarokFS-qt3-0.4.2-mod/amfs-xml.h --- amarokFS-qt3-0.4.2/amfs-xml.h 2007-02-11 18:57:18.000000000 +0200 +++ amarokFS-qt3-0.4.2-mod/amfs-xml.h 2007-02-11 21:27:00.000000000 +0200 @@ -39,6 +39,8 @@ AKControlButton *cb; QLabel *b; QPushButton* pushButton1; + //stores whether Amarok was started by AmarokFS (true) or by the user + bool startedAmarok; private: QString getDCOPDataText(QCString func); amarokFS-0.4.2-theme_howto.patch: --- NEW FILE amarokFS-0.4.2-theme_howto.patch --- diff -uNr amarokFS-qt3-0.4.2/theme-howto.txt amarokFS-qt3-0.4.2-mod/theme-howto.txt --- amarokFS-qt3-0.4.2/theme-howto.txt 2007-02-11 18:57:38.000000000 +0200 +++ amarokFS-qt3-0.4.2-mod/theme-howto.txt 2007-02-11 18:58:09.000000000 +0200 @@ -20,7 +20,7 @@ d) "clicked" defines the path to the image to be displayed you press the button e) "command" defines the dcop-function to be called. To see available functions run "kdcop", open amarok/player. Only function without any arguments can be called. -3) The "trackLabel" Element defines a text-label. Its contet changes with every track change. It has folowing subelements: +3) The "labelTrack" Element defines a text-label. Its contet changes with every track change. It has folowing subelements: a) "x" and "y" define the position b) "w" and "h" define width and height c) "command" defines the dcop-function to be called to get the text value. To see available functions run "kdcop", open amarok/player. Only function without any arguments and returning a QString can be called. @@ -30,9 +30,9 @@ g) "align" defines horizontal alignment, values are: 0 for auto, 1 for left, 2 for right, 4 for center and 5 for justify; h) "valign" defines vertical alignment, values are: 16 for top, 32 for bottom, 64 for center -4) The "trackInstant" Element defines a text-label similar to trackLabel. The only difference is that it changes every second. It has the same subelements as "trackLabel". +4) The "labelInstant" Element defines a text-label similar to trackLabel. The only difference is that it changes every second. It has the same subelements as "labelTrack". -5) The "trackStatic" Element defines a text-label similar to trackLabel. The only difference is that it never changes. It has the same subelements as "trackLabel" except: +5) The "labelStatic" Element defines a text-label similar to trackLabel. The only difference is that it never changes. It has the same subelements as "labelTrack" except: a) "text" determines the content (and "command" is ignored) 4) The "progressbar" element - only one can be used, subelements: amarokFS-0.4.2-theme_prev_button.patch: --- NEW FILE amarokFS-0.4.2-theme_prev_button.patch --- diff -uNr amarokFS-qt3-0.4.2/theme.xml amarokFS-qt3-0.4.2-mod/theme.xml --- amarokFS-qt3-0.4.2/theme.xml 2007-02-08 00:09:48.000000000 +0200 +++ amarokFS-qt3-0.4.2-mod/theme.xml 2007-02-19 18:12:22.000000000 +0200 @@ -1,7 +1,7 @@